diff options
| author | Melanie | 2010-04-19 07:00:40 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-19 07:00:40 +0100 |
| commit | 98cb4f74b265dfb8ca3eb8c8d3ad604249398df1 (patch) | |
| tree | 1339d3707430a20662bdcd3eb4e9ef86abc6a4fd /OpenSim/Framework/PrimitiveBaseShape.cs | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | All scripts are now created suspended and are only unsuspended when the object (diff) | |
| download | opensim-SC-98cb4f74b265dfb8ca3eb8c8d3ad604249398df1.zip opensim-SC-98cb4f74b265dfb8ca3eb8c8d3ad604249398df1.tar.gz opensim-SC-98cb4f74b265dfb8ca3eb8c8d3ad604249398df1.tar.bz2 opensim-SC-98cb4f74b265dfb8ca3eb8c8d3ad604249398df1.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 9c2a4f9..1208b97 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
| @@ -188,6 +188,10 @@ namespace OpenSim.Framework | |||
| 188 | m_textureEntry = DEFAULT_TEXTURE; | 188 | m_textureEntry = DEFAULT_TEXTURE; |
| 189 | } | 189 | } |
| 190 | 190 | ||
| 191 | /// <summary> | ||
| 192 | /// Construct a PrimitiveBaseShape object from a OpenMetaverse.Primitive object | ||
| 193 | /// </summary> | ||
| 194 | /// <param name="prim"></param> | ||
| 191 | public PrimitiveBaseShape(Primitive prim) | 195 | public PrimitiveBaseShape(Primitive prim) |
| 192 | { | 196 | { |
| 193 | PCode = (byte)prim.PrimData.PCode; | 197 | PCode = (byte)prim.PrimData.PCode; |