diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
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 145c058..ecd2d6f 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 | |||
1317 | 1317 | ||
1318 | public void osParcelSetDetails(LSL_Vector pos, LSL_List rules) | 1318 | public void osParcelSetDetails(LSL_Vector pos, LSL_List rules) |
1319 | { | 1319 | { |
1320 | CheckThreatLevel(ThreatLevel.High, "osParcelSetDetails"); | 1320 | const string functionName = "osParcelSetDetails"; |
1321 | CheckThreatLevel(ThreatLevel.High, functionName); | ||
1322 | OSSLDeprecated(functionName, "osSetParcelDetails"); | ||
1323 | SetParcelDetails(pos, rules, functionName); | ||
1324 | } | ||
1325 | public void osSetParcelDetails(LSL_Vector pos, LSL_List rules) | ||
1326 | { | ||
1327 | const string functionName = "osSetParcelDetails"; | ||
1328 | CheckThreatLevel(ThreatLevel.High, functionName); | ||
1329 | SetParcelDetails(pos, rules, functionName); | ||
1330 | } | ||
1331 | private void SetParcelDetails(LSL_Vector pos, LSL_List rules, string functionName) | ||
1332 | { | ||
1321 | m_host.AddScriptLPS(1); | 1333 | m_host.AddScriptLPS(1); |
1322 | 1334 | ||
1323 | // Get a reference to the land data and make sure the owner of the script | 1335 | // 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 | |||
1356 | break; | 1368 | break; |
1357 | 1369 | ||
1358 | case 2: | 1370 | case 2: |
1359 | CheckThreatLevel(ThreatLevel.VeryHigh, "osParcelSetDetails"); | 1371 | CheckThreatLevel(ThreatLevel.VeryHigh, functionName); |
1360 | if (UUID.TryParse(arg , out uuid)) | 1372 | if (UUID.TryParse(arg , out uuid)) |
1361 | newLand.OwnerID = uuid; | 1373 | newLand.OwnerID = uuid; |
1362 | break; | 1374 | break; |
1363 | 1375 | ||
1364 | case 3: | 1376 | case 3: |
1365 | CheckThreatLevel(ThreatLevel.VeryHigh, "osParcelSetDetails"); | 1377 | CheckThreatLevel(ThreatLevel.VeryHigh, functionName); |
1366 | if (UUID.TryParse(arg , out uuid)) | 1378 | if (UUID.TryParse(arg , out uuid)) |
1367 | newLand.GroupID = uuid; | 1379 | newLand.GroupID = uuid; |
1368 | break; | 1380 | break; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 064df35..c08ad3b 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 | |||
135 | // Parcel commands | 135 | // Parcel commands |
136 | void osParcelJoin(vector pos1, vector pos2); | 136 | void osParcelJoin(vector pos1, vector pos2); |
137 | void osParcelSubdivide(vector pos1, vector pos2); | 137 | void osParcelSubdivide(vector pos1, vector pos2); |
138 | void osParcelSetDetails(vector pos, LSL_List rules); | 138 | void osSetParcelDetails(vector pos, LSL_List rules); |
139 | void osParcelSetDetails(vector pos, LSL_List rules); // Deprecated | ||
139 | 140 | ||
140 | string osGetScriptEngineName(); | 141 | string osGetScriptEngineName(); |
141 | string osGetSimulatorVersion(); | 142 | 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 | |||
126 | { | 126 | { |
127 | m_OSSL_Functions.osParcelSubdivide(pos1, pos2); | 127 | m_OSSL_Functions.osParcelSubdivide(pos1, pos2); |
128 | } | 128 | } |
129 | 129 | ||
130 | public void osSetParcelDetails(vector pos, LSL_List rules) | ||
131 | { | ||
132 | m_OSSL_Functions.osSetParcelDetails(pos, rules); | ||
133 | } | ||
134 | // Deprecated | ||
130 | public void osParcelSetDetails(vector pos, LSL_List rules) | 135 | public void osParcelSetDetails(vector pos, LSL_List rules) |
131 | { | 136 | { |
132 | m_OSSL_Functions.osParcelSetDetails(pos,rules); | 137 | m_OSSL_Functions.osParcelSetDetails(pos,rules); |