From b25f9f322cdbcde7fd8c043137bf07992e5ef318 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Tue, 15 Jan 2008 02:09:55 +0000 Subject: * Mother of all commits: * Cleaned up copyright notices in AssemblyInfo.cs's * Added Copyright headers to a bunch of files missing them * Replaced several common string instances with a static constant to prevent reallocation of the same strings thousands of times. "" -> String.Empty is the first such candidate. --- OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs | 2 +- .../Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs | 2 +- .../Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs | 2 +- OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase') diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs index 6df8343..0a8f7ea 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs @@ -148,7 +148,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase // Handled by long commands public void timer(uint localID, LLUUID itemID) { - //myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, ""); + //myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, String.Empty); } public void listen(uint localID, LLUUID itemID) diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs index 8081e2c..af91027 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs @@ -323,7 +323,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase // Do we have any scripts in this object at all? If not, return if (m_ScriptEngine.m_ScriptManager.Scripts.ContainsKey(localID) == false) { - //Console.WriteLine("Event \"" + FunctionName + "\" for localID: " + localID + ". No scripts found on this localID."); + //Console.WriteLine("Event \String.Empty + FunctionName + "\" for localID: " + localID + ". No scripts found on this localID."); return; } diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs index 635c32a..7271d72 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs @@ -259,7 +259,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase //Deliver data to prim's remote_data handler object[] resobj = new object[] { - 2, rInfo.GetChannelKey().ToString(), rInfo.GetMessageID().ToString(), "", + 2, rInfo.GetChannelKey().ToString(), rInfo.GetMessageID().ToString(), String.Empty, rInfo.GetIntValue(), rInfo.GetStrVal() }; diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs index 8f74620..784e849 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs @@ -161,7 +161,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase catch (ThreadAbortException tae) { string a = tae.ToString(); - a = ""; + a = String.Empty; // Expected } } -- cgit v1.1