From 08721be3740624fb10a205bcf1ddcfd58bff7f87 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 1 Feb 2010 22:33:15 +0000
Subject: minor: rename GetScriptPrimType() to GetPrimType()

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs               | 4 ++--
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim')

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
             bool hasDimple;
             bool hasProfileCut;
 
-            PrimType primType = GetScriptPrimType();
+            PrimType primType = GetPrimType();
             HasCutHollowDimpleProfileCut(primType, Shape, out hasCut, out hasHollow, out hasDimple, out hasProfileCut);
 
             switch (primType)
@@ -3085,7 +3085,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="primShape"></param>
         /// <returns></returns>
-        public PrimType GetScriptPrimType()
+        public PrimType GetPrimType()
         {
             if (Shape.SculptEntry)
                 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
         {
             int sides = part.GetNumberOfSides();
 
-            if (part.GetScriptPrimType() == PrimType.SPHERE && part.Shape.ProfileHollow > 0)
+            if (part.GetPrimType() == PrimType.SPHERE && part.Shape.ProfileHollow > 0)
             {
                 // Make up for a bug where LSL shows 4 sides rather than 2
                 sides += 2;
@@ -7311,7 +7311,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     case (int)ScriptBaseClass.PRIM_TYPE:
                         // implementing box
                         PrimitiveBaseShape Shape = part.Shape;
-                        int primType = (int)part.GetScriptPrimType();
+                        int primType = (int)part.GetPrimType();
                         res.Add(new LSL_Integer(primType));
                         double topshearx = (double)(sbyte)Shape.PathShearX / 100.0; // Fix negative values for PathShearX
                         double topsheary = (double)(sbyte)Shape.PathShearY / 100.0; // and PathShearY.
-- 
cgit v1.1