diff options
| author | John Hurliman | 2010-04-14 11:06:07 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-04-14 11:06:07 -0700 |
| commit | 985faf415106a068bf59ccb2bc0bacfc8d705e90 (patch) | |
| tree | f3e460cce48fff6082579610238140c290c7ab4d /OpenSim/Framework | |
| parent | Applying a patch from lkalif to fix a small bug in the previous patch (diff) | |
| parent | * Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine. (diff) | |
| download | opensim-SC_OLD-985faf415106a068bf59ccb2bc0bacfc8d705e90.zip opensim-SC_OLD-985faf415106a068bf59ccb2bc0bacfc8d705e90.tar.gz opensim-SC_OLD-985faf415106a068bf59ccb2bc0bacfc8d705e90.tar.bz2 opensim-SC_OLD-985faf415106a068bf59ccb2bc0bacfc8d705e90.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 6 |
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 | { |