diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common')
3 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index c904b1d..4bdb0ba 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | |||
@@ -1110,6 +1110,8 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1110 | } | 1110 | } |
1111 | } | 1111 | } |
1112 | 1112 | ||
1113 | |||
1114 | |||
1113 | static public implicit operator String(LSLString s) | 1115 | static public implicit operator String(LSLString s) |
1114 | { | 1116 | { |
1115 | return s.m_string; | 1117 | return s.m_string; |
@@ -1272,6 +1274,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1272 | i.value++; | 1274 | i.value++; |
1273 | return i; | 1275 | return i; |
1274 | } | 1276 | } |
1277 | |||
1275 | 1278 | ||
1276 | public static LSLInteger operator --(LSLInteger i) | 1279 | public static LSLInteger operator --(LSLInteger i) |
1277 | { | 1280 | { |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs index ecf2a45..214f7c9 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs | |||
@@ -145,7 +145,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
145 | 145 | ||
146 | public void money(uint localID, LLUUID agentID, int amount) | 146 | public void money(uint localID, LLUUID agentID, int amount) |
147 | { | 147 | { |
148 | myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "money", EventQueueManager.llDetectNull, new object[] { agentID.ToString(), new LSL_Types.LSLInteger(amount) }); | 148 | myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "money", EventQueueManager.llDetectNull, new object[] { new LSL_Types.LSLString(agentID.ToString()), new LSL_Types.LSLInteger(amount) }); |
149 | } | 149 | } |
150 | 150 | ||
151 | // TODO: Replace placeholders below | 151 | // TODO: Replace placeholders below |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs index ed11337..b08a0fa 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs | |||
@@ -326,12 +326,12 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
326 | m_ScriptEngine.World.GetSceneObjectPart(QIS.localID); | 326 | m_ScriptEngine.World.GetSceneObjectPart(QIS.localID); |
327 | //if (m_host != null) | 327 | //if (m_host != null) |
328 | //{ | 328 | //{ |
329 | m_ScriptEngine.World.SimChat(Helpers.StringToField(text.Substring(0,999)), | 329 | m_ScriptEngine.World.SimChat(Helpers.StringToField(text), |
330 | ChatTypeEnum.DebugChannel, 2147483647, | 330 | ChatTypeEnum.DebugChannel, 2147483647, |
331 | m_host.AbsolutePosition, | 331 | m_host.AbsolutePosition, |
332 | m_host.Name, m_host.UUID); | 332 | m_host.Name, m_host.UUID); |
333 | } | 333 | } |
334 | catch | 334 | catch (Exception f) |
335 | { | 335 | { |
336 | //} | 336 | //} |
337 | //else | 337 | //else |