aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/ScriptEngine
diff options
context:
space:
mode:
authorDr Scofield2008-05-26 15:37:31 +0000
committerDr Scofield2008-05-26 15:37:31 +0000
commit1bb1d5d9b06887380eec0696102eb859f04810e6 (patch)
treefecd69763a3daeba464a1bcbc1349828dd9445b3 /OpenSim/Grid/ScriptEngine
parentAdding OnChatBroadcast event logic to EventManager providing (diff)
downloadopensim-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 'OpenSim/Grid/ScriptEngine')
-rw-r--r--OpenSim/Grid/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs1
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs10
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs22
3 files changed, 19 insertions, 14 deletions
diff --git a/OpenSim/Grid/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Grid/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
index 3411465..422af46 100644
--- a/OpenSim/Grid/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
+++ b/OpenSim/Grid/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
@@ -57,7 +57,6 @@ namespace OpenSim.Grid.ScriptEngine.Common
57 LSL_Types.Vector3 llRot2Up(LSL_Types.Quaternion r); 57 LSL_Types.Vector3 llRot2Up(LSL_Types.Quaternion r);
58 LSL_Types.Quaternion llRotBetween(LSL_Types.Vector3 start, LSL_Types.Vector3 end); 58 LSL_Types.Quaternion llRotBetween(LSL_Types.Vector3 start, LSL_Types.Vector3 end);
59 void llWhisper(int channelID, string text); 59 void llWhisper(int channelID, string text);
60 //void llSay(int channelID, string text);
61 void llSay(int channelID, string text); 60 void llSay(int channelID, string text);
62 void llShout(int channelID, string text); 61 void llShout(int channelID, string text);
63 int llListen(int channelID, string name, string ID, string msg); 62 int llListen(int channelID, string name, string ID, string msg);
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
index 60f4d42..1db1446 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
@@ -243,6 +243,11 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSL
243 m_LSL_Functions.llShout(channelID, text); 243 m_LSL_Functions.llShout(channelID, text);
244 } 244 }
245 245
246 public void llOwnerSay(string msg)
247 {
248 m_LSL_Functions.llOwnerSay(msg);
249 }
250
246 public int llListen(int channelID, string name, string ID, string msg) 251 public int llListen(int channelID, string name, string ID, string msg)
247 { 252 {
248 return m_LSL_Functions.llListen(channelID, name, ID, msg); 253 return m_LSL_Functions.llListen(channelID, name, ID, msg);
@@ -1617,11 +1622,6 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSL
1617 return m_LSL_Functions.llGetInventoryCreator(item); 1622 return m_LSL_Functions.llGetInventoryCreator(item);
1618 } 1623 }
1619 1624
1620 public void llOwnerSay(string msg)
1621 {
1622 m_LSL_Functions.llOwnerSay(msg);
1623 }
1624
1625 public void llRequestSimulatorData(string simulator, int data) 1625 public void llRequestSimulatorData(string simulator, int data)
1626 { 1626 {
1627 m_LSL_Functions.llRequestSimulatorData(simulator, data); 1627 m_LSL_Functions.llRequestSimulatorData(simulator, data);
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index 64d3493..b06a457 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -272,19 +272,30 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
272 public void llWhisper(int channelID, string text) 272 public void llWhisper(int channelID, string text)
273 { 273 {
274 World.SimChat(Helpers.StringToField(text), 274 World.SimChat(Helpers.StringToField(text),
275 ChatTypeEnum.Whisper, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID); 275 ChatTypeEnum.Whisper, channelID, m_host.AbsolutePosition,
276 m_host.Name, m_host.UUID, false);
276 } 277 }
277 278
278 public void llSay(int channelID, string text) 279 public void llSay(int channelID, string text)
279 { 280 {
280 World.SimChat(Helpers.StringToField(text), 281 World.SimChat(Helpers.StringToField(text),
281 ChatTypeEnum.Say, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID); 282 ChatTypeEnum.Say, channelID, m_host.AbsolutePosition,
283 m_host.Name, m_host.UUID, false);
282 } 284 }
283 285
284 public void llShout(int channelID, string text) 286 public void llShout(int channelID, string text)
285 { 287 {
286 World.SimChat(Helpers.StringToField(text), 288 World.SimChat(Helpers.StringToField(text),
287 ChatTypeEnum.Shout, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID); 289 ChatTypeEnum.Shout, channelID, m_host.AbsolutePosition,
290 m_host.Name, m_host.UUID, false);
291 }
292
293 public void llOwnerSay(string msg)
294 {
295 m_log.DebugFormat("llOwnerSay(\"{0}\")", msg);
296 World.SimChatBroadcast(Helpers.StringToField(text),
297 ChatTypeEnum.Owner, 0, m_host.AbsolutePosition,
298 m_host.Name, m_host.UUID, false);
288 } 299 }
289 300
290 public int llListen(int channelID, string name, string ID, string msg) 301 public int llListen(int channelID, string name, string ID, string msg)
@@ -2032,11 +2043,6 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
2032 return ""; 2043 return "";
2033 } 2044 }
2034 2045
2035 public void llOwnerSay(string msg)
2036 {
2037 NotImplemented("llOwnerSay");
2038 }
2039
2040 public void llRequestSimulatorData(string simulator, int data) 2046 public void llRequestSimulatorData(string simulator, int data)
2041 { 2047 {
2042 NotImplemented("llRequestSimulatorData"); 2048 NotImplemented("llRequestSimulatorData");