OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Changed implicit string conversion to LSL_Types.LSLString in money event of the key of the payer to an Explicit one. 

* Fixes Mantis: #1045
0.6.0-stable
Teravus Ovares 2008-05-11 12:01:12 +00:00
parent 0c831a0c2e
commit efc680f45b
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
View File

@ -1110,6 +1110,8 @@ namespace OpenSim.Region.ScriptEngine.Common
} }
} }
static public implicit operator String(LSLString s) static public implicit operator String(LSLString s)
{ {
return s.m_string; return s.m_string;
@ -1272,6 +1274,7 @@ namespace OpenSim.Region.ScriptEngine.Common
i.value++; i.value++;
return i; return i;
} }
public static LSLInteger operator --(LSLInteger i) public static LSLInteger operator --(LSLInteger i)
{ {

2
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
View File

@ -145,7 +145,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
public void money(uint localID, LLUUID agentID, int amount) public void money(uint localID, LLUUID agentID, int amount)
{ {
myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "money", EventQueueManager.llDetectNull, new object[] { agentID.ToString(), new LSL_Types.LSLInteger(amount) }); myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "money", EventQueueManager.llDetectNull, new object[] { new LSL_Types.LSLString(agentID.ToString()), new LSL_Types.LSLInteger(amount) });
} }
// TODO: Replace placeholders below // TODO: Replace placeholders below

4
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
View File

@ -326,12 +326,12 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
m_ScriptEngine.World.GetSceneObjectPart(QIS.localID); m_ScriptEngine.World.GetSceneObjectPart(QIS.localID);
//if (m_host != null) //if (m_host != null)
//{ //{
m_ScriptEngine.World.SimChat(Helpers.StringToField(text.Substring(0,999)), m_ScriptEngine.World.SimChat(Helpers.StringToField(text),
ChatTypeEnum.DebugChannel, 2147483647, ChatTypeEnum.DebugChannel, 2147483647,
m_host.AbsolutePosition, m_host.AbsolutePosition,
m_host.Name, m_host.UUID); m_host.Name, m_host.UUID);
} }
catch catch (Exception f)
{ {
//} //}
//else //else