aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Instance
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-27 22:53:58 +0000
committerMelanie Thielker2008-08-27 22:53:58 +0000
commit5525a3ecb424ce6180198b5f4e440d6d5f065346 (patch)
tree01526d143e42a05d97b5375e9cfbdc9280c7b243 /OpenSim/Region/ScriptEngine/Shared/Instance
parentRefactor XScriptInstance to IScriptInstance and move into Shared/. Now (diff)
downloadopensim-SC_OLD-5525a3ecb424ce6180198b5f4e440d6d5f065346.zip
opensim-SC_OLD-5525a3ecb424ce6180198b5f4e440d6d5f065346.tar.gz
opensim-SC_OLD-5525a3ecb424ce6180198b5f4e440d6d5f065346.tar.bz2
opensim-SC_OLD-5525a3ecb424ce6180198b5f4e440d6d5f065346.tar.xz
Thank you, salahazar, for a patch that corrects the behavior of
llDetectedLink(). Also a small refactor to remove an interface member from IScriptEngine.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 30c0274..ff50396 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -72,6 +72,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
72 private int m_StartParam = 0; 72 private int m_StartParam = 0;
73 private string m_CurrentEvent = String.Empty; 73 private string m_CurrentEvent = String.Empty;
74 private bool m_InSelfDelete = false; 74 private bool m_InSelfDelete = false;
75 private int m_MaxScriptQueue;
75 76
76 private Dictionary<string,IScriptApi> m_Apis = new Dictionary<string,IScriptApi>(); 77 private Dictionary<string,IScriptApi> m_Apis = new Dictionary<string,IScriptApi>();
77 78
@@ -153,7 +154,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
153 public ScriptInstance(IScriptEngine engine, uint localID, 154 public ScriptInstance(IScriptEngine engine, uint localID,
154 LLUUID objectID, LLUUID itemID, LLUUID assetID, string assembly, 155 LLUUID objectID, LLUUID itemID, LLUUID assetID, string assembly,
155 AppDomain dom, string primName, string scriptName, 156 AppDomain dom, string primName, string scriptName,
156 int startParam, bool postOnRez, StateSource stateSource) 157 int startParam, bool postOnRez, StateSource stateSource,
158 int maxScriptQueue)
157 { 159 {
158 m_Engine = engine; 160 m_Engine = engine;
159 161
@@ -165,6 +167,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
165 m_ScriptName = scriptName; 167 m_ScriptName = scriptName;
166 m_Assembly = assembly; 168 m_Assembly = assembly;
167 m_StartParam = startParam; 169 m_StartParam = startParam;
170 m_MaxScriptQueue = maxScriptQueue;
168 171
169 ApiManager am = new ApiManager(); 172 ApiManager am = new ApiManager();
170 173
@@ -411,7 +414,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
411 414
412 lock (m_EventQueue) 415 lock (m_EventQueue)
413 { 416 {
414 if (m_EventQueue.Count >= m_Engine.MaxScriptQueue) 417 if (m_EventQueue.Count >= m_MaxScriptQueue)
415 return; 418 return;
416 419
417 m_EventQueue.Enqueue(data); 420 m_EventQueue.Enqueue(data);