diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 145c058a0e..ecd2d6f5e2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -1317,7 +1317,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 @@ -1356,13 +1368,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 064df35d6c..c08ad3b3f4 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 70d489eabc..e3ea556e5e 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); diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 0c21c66b6c..9cfac98eeb 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -397,9 +397,7 @@ ; sized packets and faster sending of data, but more delay in ; updating interest lists ; - ;PrimTerseUpdatesPerPacket = 25 - ;AvatarTerseUpdatesPerPacket = 10 - ;PrimFullUpdatesPerPacket = 100 + ;PrimUpdatesPerCallback = 100 ; TextureSendLimit determines how many packets will be put on ; the outgoing queue each cycle. Like the settings above, this