aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs9
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs11
-rw-r--r--bin/OpenSim.ini4
-rw-r--r--bin/inventoryStore.dbbin10240 -> 10240 bytes
6 files changed, 19 insertions, 14 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
index 49f6712..3319783 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
@@ -58,6 +58,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
58 /// <returns>Free AppDomain</returns> 58 /// <returns>Free AppDomain</returns>
59 private AppDomainStructure GetFreeAppDomain() 59 private AppDomainStructure GetFreeAppDomain()
60 { 60 {
61 Console.WriteLine("Finding free AppDomain");
61 FreeAppDomains(); // Outsite lock, has its own GetLock 62 FreeAppDomains(); // Outsite lock, has its own GetLock
62 lock (GetLock) 63 lock (GetLock)
63 { 64 {
@@ -141,8 +142,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
141 // Find next available AppDomain to put it in 142 // Find next available AppDomain to put it in
142 AppDomainStructure FreeAppDomain = GetFreeAppDomain(); 143 AppDomainStructure FreeAppDomain = GetFreeAppDomain();
143 144
144 if (FreeAppDomain == null) Console.WriteLine("FreeAppDomain == null"); 145 //if (FreeAppDomain == null) Console.WriteLine("FreeAppDomain == null");
145 if (FreeAppDomain.CurrentAppDomain == null) Console.WriteLine("FreeAppDomain.CurrentAppDomain == null"); 146 //if (FreeAppDomain.CurrentAppDomain == null) Console.WriteLine("FreeAppDomain.CurrentAppDomain == null");
147 Console.WriteLine("Loading into AppDomain: " + FileName);
146 LSL_BaseClass mbrt = (LSL_BaseClass)FreeAppDomain.CurrentAppDomain.CreateInstanceFromAndUnwrap(FileName, "SecondLife.Script"); 148 LSL_BaseClass mbrt = (LSL_BaseClass)FreeAppDomain.CurrentAppDomain.CreateInstanceFromAndUnwrap(FileName, "SecondLife.Script");
147 //Type mytype = mbrt.GetType(); 149 //Type mytype = mbrt.GetType();
148 Console.WriteLine("ScriptEngine AppDomainManager: is proxy={0}", RemotingServices.IsTransparentProxy(mbrt)); 150 Console.WriteLine("ScriptEngine AppDomainManager: is proxy={0}", RemotingServices.IsTransparentProxy(mbrt));
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
index 4343ea1..a20a95a 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
51 // TODO: ADD SERVER HOOK TO LOAD A SCRIPT THROUGH myScriptEngine.ScriptManager 51 // TODO: ADD SERVER HOOK TO LOAD A SCRIPT THROUGH myScriptEngine.ScriptManager
52 52
53 // Hook up a test event to our test form 53 // Hook up a test event to our test form
54 //myScriptEngine.Log.Verbose("ScriptEngine", "EventManager Hooking up to server events"); 54 myScriptEngine.Log.Verbose("ScriptEngine", "Hooking up to server events");
55 myScriptEngine.World.EventManager.OnObjectGrab += new OpenSim.Region.Environment.Scenes.EventManager.ObjectGrabDelegate(touch_start); 55 myScriptEngine.World.EventManager.OnObjectGrab += new OpenSim.Region.Environment.Scenes.EventManager.ObjectGrabDelegate(touch_start);
56 myScriptEngine.World.EventManager.OnRezScript += new OpenSim.Region.Environment.Scenes.EventManager.NewRezScript(OnRezScript); 56 myScriptEngine.World.EventManager.OnRezScript += new OpenSim.Region.Environment.Scenes.EventManager.NewRezScript(OnRezScript);
57 myScriptEngine.World.EventManager.OnRemoveScript += new OpenSim.Region.Environment.Scenes.EventManager.RemoveScript(OnRemoveScript); 57 myScriptEngine.World.EventManager.OnRemoveScript += new OpenSim.Region.Environment.Scenes.EventManager.RemoveScript(OnRemoveScript);
@@ -62,6 +62,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
62 { 62 {
63 // Add to queue for all scripts in ObjectID object 63 // Add to queue for all scripts in ObjectID object
64 //myScriptEngine.m_logger.Verbose("ScriptEngine", "EventManager Event: touch_start"); 64 //myScriptEngine.m_logger.Verbose("ScriptEngine", "EventManager Event: touch_start");
65 Console.WriteLine("touch_start localID: " + localID);
65 myScriptEngine.myEventQueueManager.AddToObjectQueue(localID, "touch_start", new object[] { (int)1 }); 66 myScriptEngine.myEventQueueManager.AddToObjectQueue(localID, "touch_start", new object[] { (int)1 });
66 } 67 }
67 public void OnRezScript(uint localID, LLUUID itemID, string script) 68 public void OnRezScript(uint localID, LLUUID itemID, string script)
@@ -75,11 +76,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
75 // new OpenSim.Region.Environment.Scenes.Scripting.NullScriptHost() 76 // new OpenSim.Region.Environment.Scenes.Scripting.NullScriptHost()
76 //); 77 //);
77 Console.WriteLine("OnRezScript localID: " + localID + " LLUID: " + itemID.ToString() + " Size: " + script.Length); 78 Console.WriteLine("OnRezScript localID: " + localID + " LLUID: " + itemID.ToString() + " Size: " + script.Length);
78 myScriptEngine.myScriptManager.StartScript( 79 myScriptEngine.myScriptManager.StartScript(localID, itemID, script);
79 localID,
80 itemID,
81 script
82 );
83 80
84 } 81 }
85 public void OnRemoveScript(uint localID, LLUUID itemID) 82 public void OnRemoveScript(uint localID, LLUUID itemID)
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
index 23cd4e8..a436bff 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
@@ -241,7 +241,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
241 241
242 // Do we have any scripts in this object at all? If not, return 242 // Do we have any scripts in this object at all? If not, return
243 if (myScriptEngine.myScriptManager.Scripts.ContainsKey(localID) == false) 243 if (myScriptEngine.myScriptManager.Scripts.ContainsKey(localID) == false)
244 {
245 Console.WriteLine("Event \"" + FunctionName + "\" for localID: " + localID + ". No scripts found on this localID.");
244 return; 246 return;
247 }
245 248
246 foreach (LLUUID itemID in myScriptEngine.myScriptManager.GetScriptKeys(localID)) 249 foreach (LLUUID itemID in myScriptEngine.myScriptManager.GetScriptKeys(localID))
247 { 250 {
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index b7a4aca..efd5a7f 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -169,11 +169,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
169 //OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO.LSL_BaseClass Script = LoadAndInitAssembly(FreeAppDomain, FileName); 169 //OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO.LSL_BaseClass Script = LoadAndInitAssembly(FreeAppDomain, FileName);
170 170
171 //OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.LSL_BaseClass Script = LoadAndInitAssembly(FreeAppDomain, FileName, localID); 171 //OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.LSL_BaseClass Script = LoadAndInitAssembly(FreeAppDomain, FileName, localID);
172 long before; 172
173 before = GC.GetTotalMemory(true); 173 //long before;
174 //before = GC.GetTotalMemory(true);
174 LSL_BaseClass CompiledScript = m_scriptEngine.myAppDomainManager.LoadScript(FileName); 175 LSL_BaseClass CompiledScript = m_scriptEngine.myAppDomainManager.LoadScript(FileName);
175 Console.WriteLine("Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before); 176 //Console.WriteLine("Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before);
176 before = GC.GetTotalMemory(true); 177 //before = GC.GetTotalMemory(true);
178
179
177 //Script = m_scriptEngine.myAppDomainManager.LoadScript(FileName); 180 //Script = m_scriptEngine.myAppDomainManager.LoadScript(FileName);
178 //Console.WriteLine("Script occupies {0} bytes", GC.GetTotalMemory(true) - before); 181 //Console.WriteLine("Script occupies {0} bytes", GC.GetTotalMemory(true) - before);
179 //before = GC.GetTotalMemory(true); 182 //before = GC.GetTotalMemory(true);
diff --git a/bin/OpenSim.ini b/bin/OpenSim.ini
index 2be8507..6932d49 100644
--- a/bin/OpenSim.ini
+++ b/bin/OpenSim.ini
@@ -4,8 +4,8 @@ physics = basicphysics
4; Prim Storage 4; Prim Storage
5; if you would like to use sqlite uncomment the following line (and 5; if you would like to use sqlite uncomment the following line (and
6; comment the NullStorage line) 6; comment the NullStorage line)
7; storage_plugin = "OpenSim.DataStore.MonoSqlite.dll" 7storage_plugin = "OpenSim.DataStore.MonoSqlite.dll"
8storage_plugin = "OpenSim.DataStore.NullStorage.dll" 8;storage_plugin = "OpenSim.DataStore.NullStorage.dll"
9startup_console_commands_file = "startup_commands.txt" 9startup_console_commands_file = "startup_commands.txt"
10serverside_object_permissions = false 10serverside_object_permissions = false
11 11
diff --git a/bin/inventoryStore.db b/bin/inventoryStore.db
index 070db2b..d283ea1 100644
--- a/bin/inventoryStore.db
+++ b/bin/inventoryStore.db
Binary files differ