aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDiva Canto2010-04-14 10:36:03 -0700
committerDiva Canto2010-04-14 10:36:03 -0700
commitbdc03dbff958459d0e2fd96045a859455293bf37 (patch)
tree576ce349892b10976a3b56a0bd39efd631bd7e51 /OpenSim/Framework
parentApplying patch from lkalif to add support for inventory links to the SimianGr... (diff)
downloadopensim-SC_OLD-bdc03dbff958459d0e2fd96045a859455293bf37.zip
opensim-SC_OLD-bdc03dbff958459d0e2fd96045a859455293bf37.tar.gz
opensim-SC_OLD-bdc03dbff958459d0e2fd96045a859455293bf37.tar.bz2
opensim-SC_OLD-bdc03dbff958459d0e2fd96045a859455293bf37.tar.xz
* Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine.
* PrimitiveBaseShape wants to be be committed too -- EOF.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 9d29480..1208b97 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -188,9 +188,9 @@ namespace OpenSim.Framework
188 m_textureEntry = DEFAULT_TEXTURE; 188 m_textureEntry = DEFAULT_TEXTURE;
189 } 189 }
190 190
191 /// <summary> 191 /// <summary>
192 /// Construct a PrimitiveBaseShape object from a OpenMetaverse.Primitive object 192 /// Construct a PrimitiveBaseShape object from a OpenMetaverse.Primitive object
193 /// </summary> 193 /// </summary>
194 /// <param name="prim"></param> 194 /// <param name="prim"></param>
195 public PrimitiveBaseShape(Primitive prim) 195 public PrimitiveBaseShape(Primitive prim)
196 { 196 {