aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorUbitUmarov2015-10-02 17:44:19 +0100
committerUbitUmarov2015-10-02 17:44:19 +0100
commit1af6ac4bfcd07dc6ce39cf95206c2813c9c7d3bb (patch)
tree33f3ce84a806be9e32ca9cc945546cdf9ccbf1ef /OpenSim/Region/ScriptEngine
parent do not send DisableSimulator on teleport if agent is already returning (diff)
downloadopensim-SC_OLD-1af6ac4bfcd07dc6ce39cf95206c2813c9c7d3bb.zip
opensim-SC_OLD-1af6ac4bfcd07dc6ce39cf95206c2813c9c7d3bb.tar.gz
opensim-SC_OLD-1af6ac4bfcd07dc6ce39cf95206c2813c9c7d3bb.tar.bz2
opensim-SC_OLD-1af6ac4bfcd07dc6ce39cf95206c2813c9c7d3bb.tar.xz
remove unused method parameter master also removed
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index fe0d3a4..ffc6f03 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1281,6 +1281,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1281 1281
1282 m_host.AddScriptLPS(1); 1282 m_host.AddScriptLPS(1);
1283 1283
1284 if (channel == ScriptBaseClass.DEBUG_CHANNEL)
1285 {
1286 return;
1287 }
1288
1284 UUID TargetID; 1289 UUID TargetID;
1285 UUID.TryParse(target, out TargetID); 1290 UUID.TryParse(target, out TargetID);
1286 1291
@@ -1289,7 +1294,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1289 1294
1290 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); 1295 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
1291 if (wComm != null) 1296 if (wComm != null)
1292 wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg, out error); 1297 wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg);
1293 } 1298 }
1294 1299
1295 public LSL_Integer llListen(int channelID, string name, string ID, string msg) 1300 public LSL_Integer llListen(int channelID, string name, string ID, string msg)