From 1af6ac4bfcd07dc6ce39cf95206c2813c9c7d3bb Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 2 Oct 2015 17:44:19 +0100
Subject: remove unused method parameter master also removed
---
OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | 4 +---
OpenSim/Region/Framework/Interfaces/IWorldComm.cs | 2 +-
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 7 ++++++-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 93a4f09..1a53a8b 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -368,10 +368,8 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
///
/// Message.
///
- public bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg, out string error)
+ public bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg)
{
- error = null;
-
if (channel == DEBUG_CHANNEL)
return true;
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
index 20e0199..c01c56d 100644
--- a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Region.Framework.Interfaces
///
/// Message.
///
- bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg, out string error);
+ bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg);
///
/// Are there any listen events ready to be dispatched?
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
m_host.AddScriptLPS(1);
+ if (channel == ScriptBaseClass.DEBUG_CHANNEL)
+ {
+ return;
+ }
+
UUID TargetID;
UUID.TryParse(target, out TargetID);
@@ -1289,7 +1294,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface();
if (wComm != null)
- wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg, out error);
+ wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg);
}
public LSL_Integer llListen(int channelID, string name, string ID, string msg)
--
cgit v1.1