diff options
author | Dr Scofield | 2008-05-26 15:37:31 +0000 |
---|---|---|
committer | Dr Scofield | 2008-05-26 15:37:31 +0000 |
commit | 1bb1d5d9b06887380eec0696102eb859f04810e6 (patch) | |
tree | fecd69763a3daeba464a1bcbc1349828dd9445b3 /OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs | |
parent | Adding OnChatBroadcast event logic to EventManager providing (diff) | |
download | opensim-SC_OLD-1bb1d5d9b06887380eec0696102eb859f04810e6.zip opensim-SC_OLD-1bb1d5d9b06887380eec0696102eb859f04810e6.tar.gz opensim-SC_OLD-1bb1d5d9b06887380eec0696102eb859f04810e6.tar.bz2 opensim-SC_OLD-1bb1d5d9b06887380eec0696102eb859f04810e6.tar.xz |
This cleans up a merge mess from the earlier checkin and implements llOwnerSay()
via the newly created Scene.SimBroadcast() call.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs index 2c33b57..07db853 100644 --- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs | |||
@@ -285,6 +285,11 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
285 | m_LSL_Functions.llShout(channelID, text); | 285 | m_LSL_Functions.llShout(channelID, text); |
286 | } | 286 | } |
287 | 287 | ||
288 | public void llOwnerSay(string msg) | ||
289 | { | ||
290 | m_LSL_Functions.llOwnerSay(msg); | ||
291 | } | ||
292 | |||
288 | public void llRegionSay(int channelID, string text) | 293 | public void llRegionSay(int channelID, string text) |
289 | { | 294 | { |
290 | m_LSL_Functions.llRegionSay(channelID, text); | 295 | m_LSL_Functions.llRegionSay(channelID, text); |
@@ -1673,11 +1678,6 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1673 | return m_LSL_Functions.llGetInventoryCreator(item); | 1678 | return m_LSL_Functions.llGetInventoryCreator(item); |
1674 | } | 1679 | } |
1675 | 1680 | ||
1676 | public void llOwnerSay(string msg) | ||
1677 | { | ||
1678 | m_LSL_Functions.llOwnerSay(msg); | ||
1679 | } | ||
1680 | |||
1681 | public void llRequestSimulatorData(string simulator, int data) | 1681 | public void llRequestSimulatorData(string simulator, int data) |
1682 | { | 1682 | { |
1683 | m_LSL_Functions.llRequestSimulatorData(simulator, data); | 1683 | m_LSL_Functions.llRequestSimulatorData(simulator, data); |