aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-02-01 22:33:15 +0000
committerJustin Clark-Casey (justincc)2010-02-01 22:33:15 +0000
commit08721be3740624fb10a205bcf1ddcfd58bff7f87 (patch)
treeebb2220ea51a1157e46119526ebf6f89d75c57f2
parentmove hollow sphere faces bug back up to LSL_Api.cs (diff)
downloadopensim-SC_OLD-08721be3740624fb10a205bcf1ddcfd58bff7f87.zip
opensim-SC_OLD-08721be3740624fb10a205bcf1ddcfd58bff7f87.tar.gz
opensim-SC_OLD-08721be3740624fb10a205bcf1ddcfd58bff7f87.tar.bz2
opensim-SC_OLD-08721be3740624fb10a205bcf1ddcfd58bff7f87.tar.xz
minor: rename GetScriptPrimType() to GetPrimType()
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 4f9beb7..ef9005f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3029,7 +3029,7 @@ 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 = GetPrimType();
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)
@@ -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 GetPrimType()
3089 { 3089 {
3090 if (Shape.SculptEntry) 3090 if (Shape.SculptEntry)
3091 return PrimType.SCULPT; 3091 return PrimType.SCULPT;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 3dc7613..a1db77e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4248,7 +4248,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4248 { 4248 {
4249 int sides = part.GetNumberOfSides(); 4249 int sides = part.GetNumberOfSides();
4250 4250
4251 if (part.GetScriptPrimType() == PrimType.SPHERE && part.Shape.ProfileHollow > 0) 4251 if (part.GetPrimType() == PrimType.SPHERE && part.Shape.ProfileHollow > 0)
4252 { 4252 {
4253 // Make up for a bug where LSL shows 4 sides rather than 2 4253 // Make up for a bug where LSL shows 4 sides rather than 2
4254 sides += 2; 4254 sides += 2;
@@ -7311,7 +7311,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7311 case (int)ScriptBaseClass.PRIM_TYPE: 7311 case (int)ScriptBaseClass.PRIM_TYPE:
7312 // implementing box 7312 // implementing box
7313 PrimitiveBaseShape Shape = part.Shape; 7313 PrimitiveBaseShape Shape = part.Shape;
7314 int primType = (int)part.GetScriptPrimType(); 7314 int primType = (int)part.GetPrimType();
7315 res.Add(new LSL_Integer(primType)); 7315 res.Add(new LSL_Integer(primType));
7316 double topshearx = (double)(sbyte)Shape.PathShearX / 100.0; // Fix negative values for PathShearX 7316 double topshearx = (double)(sbyte)Shape.PathShearX / 100.0; // Fix negative values for PathShearX
7317 double topsheary = (double)(sbyte)Shape.PathShearY / 100.0; // and PathShearY. 7317 double topsheary = (double)(sbyte)Shape.PathShearY / 100.0; // and PathShearY.