[cig-commits] r4919 - in long/3D/Gale/trunk/src/Underworld: . InputFiles/Viewports

[walter at geodynamics.org]

Author: walter
Date: 2006-10-11 13:53:05 -0700 (Wed, 11 Oct 2006)
New Revision: 4919

Modified:
   long/3D/Gale/trunk/src/Underworld/
   long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/StressXXVP.xml
   long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/StressYYVP.xml
Log:
 r579 at earth:  boo | 2006-10-11 13:52:05 -0700
  r541 at earth (orig r318):  JulianGiordani | 2006-08-24 23:10:56 -0700
  
  Making sure the XML parser doesn't complain about multiple definitions of border object
  
  
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:578
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:317
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:579
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:318

Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/StressXXVP.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/StressXXVP.xml	2006-10-11 20:53:02 UTC (rev 4918)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/StressXXVP.xml	2006-10-11 20:53:05 UTC (rev 4919)
@@ -22,7 +22,7 @@
 			<param name="FieldVariable">StressXXField</param>
 			<param name="ColourMap">stressXXColourMap</param>
 		</struct>
-		<struct name="border1">
+		<struct name="borderXX">
 			<param name="Type">lucFieldVariableBorder</param>
 			<param name="FieldVariable">StressXXField</param>
 		</struct>
@@ -36,7 +36,7 @@
 			<param name="Camera">camera</param>
 			<list name="DrawingObject">
 				<param>stressXXMap</param>
-				<param>border</param>
+				<param>borderXX</param>
 				<param>stressXXColourBar</param>
 			</list>
 		</struct>

Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/StressYYVP.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/StressYYVP.xml	2006-10-11 20:53:02 UTC (rev 4918)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/Viewports/StressYYVP.xml	2006-10-11 20:53:05 UTC (rev 4919)
@@ -22,7 +22,7 @@
 			<param name="FieldVariable">StressYYField</param>
 			<param name="ColourMap">stressYYColourMap</param>
 		</struct>
-		<struct name="border">
+		<struct name="borderYY">
 			<param name="Type">lucFieldVariableBorder</param>
 			<param name="FieldVariable">StressYYField</param>
 		</struct>
@@ -36,7 +36,7 @@
 			<param name="Camera">camerastressYY</param>
 			<list name="DrawingObject">
 				<param>stressYYMap</param>
-				<param>border</param>
+				<param>borderYY</param>
 				<param>stressYYColourBar</param>
 			</list>
 		</struct>