diff options
| author | Justin Clark-Casey (justincc) | 2012-04-23 22:54:11 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-04-23 22:54:11 +0100 |
| commit | b798b32b1940ea8b23f13deb13ec8dfdfb076fd9 (patch) | |
| tree | 0748c3146d4ca551f3e3667d157ae449e6a02b5e /OpenSim/Region/ScriptEngine/Shared | |
| parent | Replace common code to fetch self inventory item (as opposed to uuid) with Ge... (diff) | |
| parent | Mantis 5977 Corrections to llRegionSayTo (diff) | |
| download | opensim-SC_OLD-b798b32b1940ea8b23f13deb13ec8dfdfb076fd9.zip opensim-SC_OLD-b798b32b1940ea8b23f13deb13ec8dfdfb076fd9.tar.gz opensim-SC_OLD-b798b32b1940ea8b23f13deb13ec8dfdfb076fd9.tar.bz2 opensim-SC_OLD-b798b32b1940ea8b23f13deb13ec8dfdfb076fd9.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index a353b25..9cb97f9 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -839,13 +839,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 839 | 839 | ||
| 840 | m_host.AddScriptLPS(1); | 840 | m_host.AddScriptLPS(1); |
| 841 | 841 | ||
| 842 | if (channel == ScriptBaseClass.DEBUG_CHANNEL) | ||
| 843 | { | ||
| 844 | return; | ||
| 845 | } | ||
| 846 | |||
| 842 | UUID TargetID; | 847 | UUID TargetID; |
| 843 | UUID.TryParse(target, out TargetID); | 848 | UUID.TryParse(target, out TargetID); |
| 844 | 849 | ||
| 845 | IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); | 850 | IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); |
| 846 | if (wComm != null) | 851 | if (wComm != null) |
| 847 | if (!wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg, out error)) | 852 | wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg); |
| 848 | LSLError(error); | ||
| 849 | } | 853 | } |
| 850 | 854 | ||
| 851 | public LSL_Integer llListen(int channelID, string name, string ID, string msg) | 855 | public LSL_Integer llListen(int channelID, string name, string ID, string msg) |