aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorJeff Ames2007-11-08 03:11:10 +0000
committerJeff Ames2007-11-08 03:11:10 +0000
commit0b4e15bc3586422d273bd8845962a2db681230e2 (patch)
treef3394ee384d7b20fc8c1f0eee4ebda3c10203a1a /OpenSim/Grid
parent* Added Rotational Velocity reporting for Client Interpolation to Terse Updates (diff)
downloadopensim-SC_OLD-0b4e15bc3586422d273bd8845962a2db681230e2.zip
opensim-SC_OLD-0b4e15bc3586422d273bd8845962a2db681230e2.tar.gz
opensim-SC_OLD-0b4e15bc3586422d273bd8845962a2db681230e2.tar.bz2
opensim-SC_OLD-0b4e15bc3586422d273bd8845962a2db681230e2.tar.xz
converted hard-coded chat type values to ChatTypeEnum
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs10
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/EventQueueManager.cs3
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/ScriptManager.cs3
3 files changed, 7 insertions, 9 deletions
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 7bc3ce4..64921d7 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
@@ -270,24 +270,20 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
270 270
271 public void llWhisper(int channelID, string text) 271 public void llWhisper(int channelID, string text)
272 { 272 {
273 //type for whisper is 0
274 World.SimChat(Helpers.StringToField(text), 273 World.SimChat(Helpers.StringToField(text),
275 0, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID); 274 ChatTypeEnum.Whisper, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID);
276 } 275 }
277 276
278 public void llSay(int channelID, string text) 277 public void llSay(int channelID, string text)
279 { 278 {
280 //type for say is 1
281
282 World.SimChat(Helpers.StringToField(text), 279 World.SimChat(Helpers.StringToField(text),
283 1, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID); 280 ChatTypeEnum.Say, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID);
284 } 281 }
285 282
286 public void llShout(int channelID, string text) 283 public void llShout(int channelID, string text)
287 { 284 {
288 //type for shout is 2
289 World.SimChat(Helpers.StringToField(text), 285 World.SimChat(Helpers.StringToField(text),
290 2, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID); 286 ChatTypeEnum.Shout, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID);
291 } 287 }
292 288
293 public int llListen(int channelID, string name, string ID, string msg) 289 public int llListen(int channelID, string name, string ID, string msg)
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/EventQueueManager.cs
index 31d090f..91d4558 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/EventQueueManager.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/EventQueueManager.cs
@@ -31,6 +31,7 @@ using System.Collections;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using System.Threading; 32using System.Threading;
33using libsecondlife; 33using libsecondlife;
34using OpenSim.Framework;
34using OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSL; 35using OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSL;
35using OpenSim.Region.Environment.Scenes.Scripting; 36using OpenSim.Region.Environment.Scenes.Scripting;
36 37
@@ -205,7 +206,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine
205 IScriptHost m_host = m_ScriptEngine.World.GetSceneObjectPart(QIS.localID); 206 IScriptHost m_host = m_ScriptEngine.World.GetSceneObjectPart(QIS.localID);
206 //if (m_host != null) 207 //if (m_host != null)
207 //{ 208 //{
208 m_ScriptEngine.World.SimChat(Helpers.StringToField(text), 1, 0, 209 m_ScriptEngine.World.SimChat(Helpers.StringToField(text), ChatTypeEnum.Say, 0,
209 m_host.AbsolutePosition, m_host.Name, m_host.UUID); 210 m_host.AbsolutePosition, m_host.Name, m_host.UUID);
210 } 211 }
211 catch 212 catch
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/ScriptManager.cs
index 2149bf0..85e9a9c 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -33,6 +33,7 @@ using System.Reflection;
33using System.Runtime.Serialization.Formatters.Binary; 33using System.Runtime.Serialization.Formatters.Binary;
34using System.Threading; 34using System.Threading;
35using libsecondlife; 35using libsecondlife;
36using OpenSim.Framework;
36using OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler; 37using OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler;
37using OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSL; 38using OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSL;
38using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Environment.Scenes;
@@ -318,7 +319,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine
318 string text = "Error compiling script:\r\n" + e.Message.ToString(); 319 string text = "Error compiling script:\r\n" + e.Message.ToString();
319 if (text.Length > 1500) 320 if (text.Length > 1500)
320 text = text.Substring(0, 1500); 321 text = text.Substring(0, 1500);
321 World.SimChat(Helpers.StringToField(text), 1, 0, m_host.AbsolutePosition, m_host.Name, m_host.UUID); 322 World.SimChat(Helpers.StringToField(text), ChatTypeEnum.Say, 0, m_host.AbsolutePosition, m_host.Name, m_host.UUID);
322 } 323 }
323 catch (Exception e2) 324 catch (Exception e2)
324 { 325 {