aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
diff options
context:
space:
mode:
authorSean Dague2007-09-17 12:52:03 +0000
committerSean Dague2007-09-17 12:52:03 +0000
commitb8d9737a47696952bedec33dface8f18df47341f (patch)
tree9279f45510f8a9285ac5b9c9165ab6c741009eac /OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
parentI think this is the last bits for a consistant pristine (diff)
downloadopensim-SC_OLD-b8d9737a47696952bedec33dface8f18df47341f.zip
opensim-SC_OLD-b8d9737a47696952bedec33dface8f18df47341f.tar.gz
opensim-SC_OLD-b8d9737a47696952bedec33dface8f18df47341f.tar.bz2
opensim-SC_OLD-b8d9737a47696952bedec33dface8f18df47341f.tar.xz
fixing me some line endings
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 20300c0..e1989c4 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -246,12 +246,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
246 ls.localID = localID; 246 ls.localID = localID;
247 ls.itemID = itemID; 247 ls.itemID = itemID;
248 unloadQueue.Enqueue(ls); 248 unloadQueue.Enqueue(ls);
249 } 249 }
250 public void ResetScript(uint localID, LLUUID itemID) 250 public void ResetScript(uint localID, LLUUID itemID)
251 { 251 {
252 string script = GetScript(localID, itemID).SourceCode; 252 string script = GetScript(localID, itemID).SourceCode;
253 StopScript(localID, itemID); 253 StopScript(localID, itemID);
254 StartScript(localID, itemID, script); 254 StartScript(localID, itemID, script);
255 } 255 }
256 256
257 private void _StartScript(uint localID, LLUUID itemID, string Script) 257 private void _StartScript(uint localID, LLUUID itemID, string Script)
@@ -288,8 +288,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
288 CompiledScript = m_scriptEngine.m_AppDomainManager.LoadScript(ScriptSource); 288 CompiledScript = m_scriptEngine.m_AppDomainManager.LoadScript(ScriptSource);
289#if DEBUG 289#if DEBUG
290 Console.WriteLine("Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before); 290 Console.WriteLine("Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before);
291#endif 291#endif
292 292
293 CompiledScript.SourceCode = ScriptSource; 293 CompiledScript.SourceCode = ScriptSource;
294 // Add it to our script memstruct 294 // Add it to our script memstruct
295 SetScript(localID, itemID, CompiledScript); 295 SetScript(localID, itemID, CompiledScript);