Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

3 files changed, 23 insertions, 5 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 691b67f..3b13d06 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1310,7 +1310,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void osParcelSetDetails(LSL_Vector pos, LSL_List rules)
         {
-            CheckThreatLevel(ThreatLevel.High, "osParcelSetDetails");
+            const string functionName = "osParcelSetDetails";
+            CheckThreatLevel(ThreatLevel.High, functionName);
+            OSSLDeprecated(functionName, "osSetParcelDetails");
+            SetParcelDetails(pos, rules, functionName);
+        }
+        public void osSetParcelDetails(LSL_Vector pos, LSL_List rules)
+        {
+            const string functionName = "osSetParcelDetails";
+            CheckThreatLevel(ThreatLevel.High, functionName);
+            SetParcelDetails(pos, rules, functionName);
+        }
+        private void SetParcelDetails(LSL_Vector pos, LSL_List rules, string functionName)
+        {
             m_host.AddScriptLPS(1);
 
             // Get a reference to the land data and make sure the owner of the script
@@ -1349,13 +1361,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                       break;
 
                     case 2:
-                      CheckThreatLevel(ThreatLevel.VeryHigh, "osParcelSetDetails");
+                      CheckThreatLevel(ThreatLevel.VeryHigh, functionName);
                       if (UUID.TryParse(arg , out uuid))
                           newLand.OwnerID = uuid;
                       break;
 
                     case 3:
-                      CheckThreatLevel(ThreatLevel.VeryHigh, "osParcelSetDetails");
+                      CheckThreatLevel(ThreatLevel.VeryHigh, functionName);
                       if (UUID.TryParse(arg , out uuid))
                           newLand.GroupID = uuid;
                       break;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index da81a51..63007c6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -135,7 +135,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         // Parcel commands
         void osParcelJoin(vector pos1, vector pos2);
         void osParcelSubdivide(vector pos1, vector pos2);
-        void osParcelSetDetails(vector pos, LSL_List rules);
+        void osSetParcelDetails(vector pos, LSL_List rules);
+        void osParcelSetDetails(vector pos, LSL_List rules); // Deprecated
 
         string osGetScriptEngineName();
         string osGetSimulatorVersion();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 70d489e..e3ea556 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -126,7 +126,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             m_OSSL_Functions.osParcelSubdivide(pos1, pos2);
         }
-        
+
+        public void osSetParcelDetails(vector pos, LSL_List rules)
+        {
+            m_OSSL_Functions.osSetParcelDetails(pos, rules);
+        }
+        // Deprecated
         public void osParcelSetDetails(vector pos, LSL_List rules)
         {
             m_OSSL_Functions.osParcelSetDetails(pos,rules);