aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-02-01 22:08:00 +0000
committerJustin Clark-Casey (justincc)2010-02-01 22:08:00 +0000
commitecc068fbe0b8a95563281c3aaf8e7392e5ef49e9 (patch)
tree2d8158799882ed27120187f9d45798ec0177fcd7 /OpenSim/Region/Framework
parentCopy prim face color setting code from LSL_Api down into SOP so that non-LSL ... (diff)
downloadopensim-SC_OLD-ecc068fbe0b8a95563281c3aaf8e7392e5ef49e9.zip
opensim-SC_OLD-ecc068fbe0b8a95563281c3aaf8e7392e5ef49e9.tar.gz
opensim-SC_OLD-ecc068fbe0b8a95563281c3aaf8e7392e5ef49e9.tar.bz2
opensim-SC_OLD-ecc068fbe0b8a95563281c3aaf8e7392e5ef49e9.tar.xz
remove now duplicated shape code from LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 8b5c348..33c3fcf 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3029,8 +3029,8 @@ namespace OpenSim.Region.Framework.Scenes
3029 bool hasDimple; 3029 bool hasDimple;
3030 bool hasProfileCut; 3030 bool hasProfileCut;
3031 3031
3032 PrimType primType = getScriptPrimType(); 3032 PrimType primType = GetScriptPrimType();
3033 hasCutHollowDimpleProfileCut(primType, Shape, out hasCut, out hasHollow, out hasDimple, out hasProfileCut); 3033 HasCutHollowDimpleProfileCut(primType, Shape, out hasCut, out hasHollow, out hasDimple, out hasProfileCut);
3034 3034
3035 switch (primType) 3035 switch (primType)
3036 { 3036 {
@@ -3085,7 +3085,7 @@ namespace OpenSim.Region.Framework.Scenes
3085 /// </summary> 3085 /// </summary>
3086 /// <param name="primShape"></param> 3086 /// <param name="primShape"></param>
3087 /// <returns></returns> 3087 /// <returns></returns>
3088 public PrimType getScriptPrimType() 3088 public PrimType GetScriptPrimType()
3089 { 3089 {
3090 if (Shape.SculptEntry) 3090 if (Shape.SculptEntry)
3091 return PrimType.SCULPT; 3091 return PrimType.SCULPT;
@@ -3129,7 +3129,7 @@ namespace OpenSim.Region.Framework.Scenes
3129 /// <param name="hasHollow"></param> 3129 /// <param name="hasHollow"></param>
3130 /// <param name="hasDimple"></param> 3130 /// <param name="hasDimple"></param>
3131 /// <param name="hasProfileCut"></param> 3131 /// <param name="hasProfileCut"></param>
3132 protected static void hasCutHollowDimpleProfileCut(PrimType primType, PrimitiveBaseShape shape, out bool hasCut, out bool hasHollow, 3132 protected static void HasCutHollowDimpleProfileCut(PrimType primType, PrimitiveBaseShape shape, out bool hasCut, out bool hasHollow,
3133 out bool hasDimple, out bool hasProfileCut) 3133 out bool hasDimple, out bool hasProfileCut)
3134 { 3134 {
3135 if (primType == PrimType.BOX 3135 if (primType == PrimType.BOX