diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
3 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index a9c5d10..0692fdb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7977,7 +7977,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7977 | res.Add(new LSL_Integer((int)me.ControlPermissions)); | 7977 | res.Add(new LSL_Integer((int)me.ControlPermissions)); |
7978 | break; | 7978 | break; |
7979 | } | 7979 | } |
7980 | } | 7980 | } |
7981 | 7981 | ||
7982 | return res; | 7982 | return res; |
7983 | } | 7983 | } |
@@ -7993,7 +7993,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7993 | if (face < 0 || face > m_host.GetNumberOfSides() - 1) | 7993 | if (face < 0 || face > m_host.GetNumberOfSides() - 1) |
7994 | return ScriptBaseClass.LSL_STATUS_OK; | 7994 | return ScriptBaseClass.LSL_STATUS_OK; |
7995 | 7995 | ||
7996 | return SetPrimMediaParams(face, rules); | 7996 | return SetPrimMediaParams(face, rules); |
7997 | } | 7997 | } |
7998 | 7998 | ||
7999 | private LSL_Integer SetPrimMediaParams(int face, LSL_List rules) | 7999 | private LSL_Integer SetPrimMediaParams(int face, LSL_List rules) |
@@ -8082,7 +8082,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8082 | me.ControlPermissions = (MediaPermission)(byte)(int)rules.GetLSLIntegerItem(i++); | 8082 | me.ControlPermissions = (MediaPermission)(byte)(int)rules.GetLSLIntegerItem(i++); |
8083 | break; | 8083 | break; |
8084 | } | 8084 | } |
8085 | } | 8085 | } |
8086 | 8086 | ||
8087 | module.SetMediaEntry(m_host, face, me); | 8087 | module.SetMediaEntry(m_host, face, me); |
8088 | 8088 | ||
@@ -8102,7 +8102,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8102 | 8102 | ||
8103 | IMoapModule module = m_ScriptEngine.World.RequestModuleInterface<IMoapModule>(); | 8103 | IMoapModule module = m_ScriptEngine.World.RequestModuleInterface<IMoapModule>(); |
8104 | if (null == module) | 8104 | if (null == module) |
8105 | throw new Exception("Media on a prim functions not available"); | 8105 | throw new Exception("Media on a prim functions not available"); |
8106 | 8106 | ||
8107 | module.ClearMediaEntry(m_host, face); | 8107 | module.ClearMediaEntry(m_host, face); |
8108 | 8108 | ||
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++); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs index 2b67e84..fefbb35 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | |||
@@ -416,7 +416,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
416 | List<SensedEntity> sensedEntities = new List<SensedEntity>(); | 416 | List<SensedEntity> sensedEntities = new List<SensedEntity>(); |
417 | 417 | ||
418 | // If nobody about quit fast | 418 | // If nobody about quit fast |
419 | if(m_CmdManager.m_ScriptEngine.World.GetRootAgentCount() == 0) | 419 | if (m_CmdManager.m_ScriptEngine.World.GetRootAgentCount() == 0) |
420 | return sensedEntities; | 420 | return sensedEntities; |
421 | 421 | ||
422 | SceneObjectPart SensePoint = ts.host; | 422 | SceneObjectPart SensePoint = ts.host; |
@@ -485,7 +485,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
485 | { | 485 | { |
486 | ScenePresence sp; | 486 | ScenePresence sp; |
487 | // Try direct lookup by UUID | 487 | // Try direct lookup by UUID |
488 | if(!m_CmdManager.m_ScriptEngine.World.TryGetScenePresence(ts.keyID, out sp)) | 488 | if (!m_CmdManager.m_ScriptEngine.World.TryGetScenePresence(ts.keyID, out sp)) |
489 | return sensedEntities; | 489 | return sensedEntities; |
490 | senseEntity(sp); | 490 | senseEntity(sp); |
491 | } | 491 | } |