diff options
author | Marck | 2010-12-11 11:41:45 +0100 |
---|---|---|
committer | Marck | 2010-12-11 11:41:45 +0100 |
commit | 69538d14d4bfb9cc27705e7776845faeea123e5d (patch) | |
tree | 2476763057d703cbdb6f0ba9f43cf63179495ba6 /OpenSim/Region | |
parent | Revert "Another stab at mantis #5256" (diff) | |
download | opensim-SC_OLD-69538d14d4bfb9cc27705e7776845faeea123e5d.zip opensim-SC_OLD-69538d14d4bfb9cc27705e7776845faeea123e5d.tar.gz opensim-SC_OLD-69538d14d4bfb9cc27705e7776845faeea123e5d.tar.bz2 opensim-SC_OLD-69538d14d4bfb9cc27705e7776845faeea123e5d.tar.xz |
More OSSL function name normalization, this time for osParcelSetDetails.
Diffstat (limited to 'OpenSim/Region')
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 | |||
1310 | 1310 | ||
1311 | public void osParcelSetDetails(LSL_Vector pos, LSL_List rules) | 1311 | public void osParcelSetDetails(LSL_Vector pos, LSL_List rules) |
1312 | { | 1312 | { |
1313 | CheckThreatLevel(ThreatLevel.High, "osParcelSetDetails"); | 1313 | const string functionName = "osParcelSetDetails"; |
1314 | CheckThreatLevel(ThreatLevel.High, functionName); | ||
1315 | OSSLDeprecated(functionName, "osSetParcelDetails"); | ||
1316 | SetParcelDetails(pos, rules, functionName); | ||
1317 | } | ||
1318 | public void osSetParcelDetails(LSL_Vector pos, LSL_List rules) | ||
1319 | { | ||
1320 | const string functionName = "osSetParcelDetails"; | ||
1321 | CheckThreatLevel(ThreatLevel.High, functionName); | ||
1322 | SetParcelDetails(pos, rules, functionName); | ||
1323 | } | ||
1324 | private void SetParcelDetails(LSL_Vector pos, LSL_List rules, string functionName) | ||
1325 | { | ||
1314 | m_host.AddScriptLPS(1); | 1326 | m_host.AddScriptLPS(1); |
1315 | 1327 | ||
1316 | // Get a reference to the land data and make sure the owner of the script | 1328 | // 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 | |||
1349 | break; | 1361 | break; |
1350 | 1362 | ||
1351 | case 2: | 1363 | case 2: |
1352 | CheckThreatLevel(ThreatLevel.VeryHigh, "osParcelSetDetails"); | 1364 | CheckThreatLevel(ThreatLevel.VeryHigh, functionName); |
1353 | if (UUID.TryParse(arg , out uuid)) | 1365 | if (UUID.TryParse(arg , out uuid)) |
1354 | newLand.OwnerID = uuid; | 1366 | newLand.OwnerID = uuid; |
1355 | break; | 1367 | break; |
1356 | 1368 | ||
1357 | case 3: | 1369 | case 3: |
1358 | CheckThreatLevel(ThreatLevel.VeryHigh, "osParcelSetDetails"); | 1370 | CheckThreatLevel(ThreatLevel.VeryHigh, functionName); |
1359 | if (UUID.TryParse(arg , out uuid)) | 1371 | if (UUID.TryParse(arg , out uuid)) |
1360 | newLand.GroupID = uuid; | 1372 | newLand.GroupID = uuid; |
1361 | break; | 1373 | 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 | |||
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); |