diff options
author | John Hurliman | 2010-09-12 14:21:51 -0700 |
---|---|---|
committer | John Hurliman | 2010-09-12 14:21:51 -0700 |
commit | c03b24cbfdc449cf326cf0f560395753339169dc (patch) | |
tree | d62a666839d3c638b5c9799c70be971a2d6d6c18 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |
parent | * Added ISimulationDataService and IEstateDataService (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-c03b24cbfdc449cf326cf0f560395753339169dc.zip opensim-SC_OLD-c03b24cbfdc449cf326cf0f560395753339169dc.tar.gz opensim-SC_OLD-c03b24cbfdc449cf326cf0f560395753339169dc.tar.bz2 opensim-SC_OLD-c03b24cbfdc449cf326cf0f560395753339169dc.tar.xz |
Merged
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index a529a94..477c52d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -1190,7 +1190,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1190 | 1190 | ||
1191 | World.LandChannel.Join(startx,starty,endx,endy,m_host.OwnerID); | 1191 | World.LandChannel.Join(startx,starty,endx,endy,m_host.OwnerID); |
1192 | } | 1192 | } |
1193 | 1193 | ||
1194 | public void osParcelSubdivide(LSL_Vector pos1, LSL_Vector pos2) | 1194 | public void osParcelSubdivide(LSL_Vector pos1, LSL_Vector pos2) |
1195 | { | 1195 | { |
1196 | CheckThreatLevel(ThreatLevel.High, "osParcelSubdivide"); | 1196 | CheckThreatLevel(ThreatLevel.High, "osParcelSubdivide"); |
@@ -1213,7 +1213,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1213 | // can modify it | 1213 | // can modify it |
1214 | 1214 | ||
1215 | ILandObject startLandObject = World.LandChannel.GetLandObject((int)pos.x, (int)pos.y); | 1215 | ILandObject startLandObject = World.LandChannel.GetLandObject((int)pos.x, (int)pos.y); |
1216 | if (startLandObject == null) | 1216 | if (startLandObject == null) |
1217 | { | 1217 | { |
1218 | OSSLShoutError("There is no land at that location"); | 1218 | OSSLShoutError("There is no land at that location"); |
1219 | return; | 1219 | return; |
@@ -1230,7 +1230,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1230 | UUID uuid; | 1230 | UUID uuid; |
1231 | 1231 | ||
1232 | // Process the rules, not sure what the impact would be of changing owner or group | 1232 | // Process the rules, not sure what the impact would be of changing owner or group |
1233 | for (int idx = 0; idx < rules.Length; ) | 1233 | for (int idx = 0; idx < rules.Length;) |
1234 | { | 1234 | { |
1235 | int code = rules.GetLSLIntegerItem(idx++); | 1235 | int code = rules.GetLSLIntegerItem(idx++); |
1236 | string arg = rules.GetLSLStringItem(idx++); | 1236 | string arg = rules.GetLSLStringItem(idx++); |