aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-25 14:20:31 +0000
committerMelanie Thielker2008-09-25 14:20:31 +0000
commitf6650d33cc7824329bce84e87e1d1cb5ec592e0b (patch)
tree1d0e1b37a881ca13d640b3b716c12c8a3c30693f /OpenSim
parent* Adds some Wind (diff)
downloadopensim-SC_OLD-f6650d33cc7824329bce84e87e1d1cb5ec592e0b.zip
opensim-SC_OLD-f6650d33cc7824329bce84e87e1d1cb5ec592e0b.tar.gz
opensim-SC_OLD-f6650d33cc7824329bce84e87e1d1cb5ec592e0b.tar.bz2
opensim-SC_OLD-f6650d33cc7824329bce84e87e1d1cb5ec592e0b.tar.xz
Fixes an exception that is seen on regions running XEngine, where DNE
tries to stop a script that is not run by it
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs11
1 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 9a9eba7..624b20b 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -169,18 +169,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
169 169
170 public override void _StopScript(uint localID, UUID itemID) 170 public override void _StopScript(uint localID, UUID itemID)
171 { 171 {
172 // Stop script
173//#if DEBUG
174// m_scriptEngine.Log.Debug("[" + m_scriptEngine.ScriptEngineName + "]: Stop script localID: " + localID + " LLUID: " + itemID.ToString());
175//#endif
176
177 // Stop long command on script
178 AsyncCommandManager.RemoveScript(m_scriptEngine, localID, itemID);
179
180 IScript LSLBC = GetScript(localID, itemID); 172 IScript LSLBC = GetScript(localID, itemID);
181 if (LSLBC == null) 173 if (LSLBC == null)
182 return; 174 return;
183 175
176 // Stop long command on script
177 AsyncCommandManager.RemoveScript(m_scriptEngine, localID, itemID);
178
184 // TEMP: First serialize it 179 // TEMP: First serialize it
185 //GetSerializedScript(localID, itemID); 180 //GetSerializedScript(localID, itemID);
186 181