diff options
author | Justin Clark-Casey (justincc) | 2014-12-15 20:38:26 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-12-15 20:38:26 +0000 |
commit | 147d401b28d6a0193122ec6518e9aaf9d22da816 (patch) | |
tree | 502ecb1d8dddd03c6de88b9c35ae7887a445a28b /OpenSim | |
parent | Restore OpenMetaverse.dll to the one compiled under Windows again from commit... (diff) | |
download | opensim-SC_OLD-147d401b28d6a0193122ec6518e9aaf9d22da816.zip opensim-SC_OLD-147d401b28d6a0193122ec6518e9aaf9d22da816.tar.gz opensim-SC_OLD-147d401b28d6a0193122ec6518e9aaf9d22da816.tar.bz2 opensim-SC_OLD-147d401b28d6a0193122ec6518e9aaf9d22da816.tar.xz |
Remove XEngine.m_uniqueScripts
This provides no obvious benefit as far as I can tell but has a definite cost in keep script strings in memory for the entire simulator session.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 71ed989..906c6ee 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -101,7 +101,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
101 | private bool m_InitialStartup = true; | 101 | private bool m_InitialStartup = true; |
102 | private int m_ScriptFailCount; // Number of script fails since compile queue was last empty | 102 | private int m_ScriptFailCount; // Number of script fails since compile queue was last empty |
103 | private string m_ScriptErrorMessage; | 103 | private string m_ScriptErrorMessage; |
104 | private Dictionary<string, string> m_uniqueScripts = new Dictionary<string, string>(); | ||
105 | private bool m_AppDomainLoading; | 104 | private bool m_AppDomainLoading; |
106 | private Dictionary<UUID,ArrayList> m_ScriptErrors = | 105 | private Dictionary<UUID,ArrayList> m_ScriptErrors = |
107 | new Dictionary<UUID,ArrayList>(); | 106 | new Dictionary<UUID,ArrayList>(); |
@@ -570,7 +569,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
570 | } | 569 | } |
571 | 570 | ||
572 | sb.AppendFormat("Scripts loaded : {0}\n", scriptsLoaded); | 571 | sb.AppendFormat("Scripts loaded : {0}\n", scriptsLoaded); |
573 | sb.AppendFormat("Unique scripts : {0}\n", m_uniqueScripts.Count); | ||
574 | sb.AppendFormat("Scripts waiting for load : {0}\n", m_CompileQueue.Count); | 572 | sb.AppendFormat("Scripts waiting for load : {0}\n", m_CompileQueue.Count); |
575 | sb.AppendFormat("Max threads : {0}\n", m_ThreadPool.MaxThreads); | 573 | sb.AppendFormat("Max threads : {0}\n", m_ThreadPool.MaxThreads); |
576 | sb.AppendFormat("Min threads : {0}\n", m_ThreadPool.MinThreads); | 574 | sb.AppendFormat("Min threads : {0}\n", m_ThreadPool.MinThreads); |
@@ -987,12 +985,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
987 | if (engine != ScriptEngineName) | 985 | if (engine != ScriptEngineName) |
988 | return; | 986 | return; |
989 | 987 | ||
990 | // If we've seen this exact script text before, use that reference instead | ||
991 | if (m_uniqueScripts.ContainsKey(script)) | ||
992 | script = m_uniqueScripts[script]; | ||
993 | else | ||
994 | m_uniqueScripts[script] = script; | ||
995 | |||
996 | Object[] parms = new Object[]{localID, itemID, script, startParam, postOnRez, (StateSource)stateSource}; | 988 | Object[] parms = new Object[]{localID, itemID, script, startParam, postOnRez, (StateSource)stateSource}; |
997 | 989 | ||
998 | if (stateSource == (int)StateSource.ScriptedRez) | 990 | if (stateSource == (int)StateSource.ScriptedRez) |