From 5732ce91846855d8699792f25f51f3fa5a556ffd Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 9 Dec 2012 15:28:56 -0800 Subject: Replaced Mono.Addins dlls with ones compiled in Windows 64-bit. --- bin/Mono.Addins.CecilReflector.dll | Bin 226816 -> 218112 bytes bin/Mono.Addins.Setup.dll | Bin 130560 -> 123904 bytes bin/Mono.Addins.dll | Bin 235008 -> 221184 bytes 3 files changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/Mono.Addins.CecilReflector.dll b/bin/Mono.Addins.CecilReflector.dll index fb95e00..96a6877 100755 Binary files a/bin/Mono.Addins.CecilReflector.dll and b/bin/Mono.Addins.CecilReflector.dll differ diff --git a/bin/Mono.Addins.Setup.dll b/bin/Mono.Addins.Setup.dll index 502ad18..84699b5 100755 Binary files a/bin/Mono.Addins.Setup.dll and b/bin/Mono.Addins.Setup.dll differ diff --git a/bin/Mono.Addins.dll b/bin/Mono.Addins.dll index 1bc4c55..951dee7 100755 Binary files a/bin/Mono.Addins.dll and b/bin/Mono.Addins.dll differ -- cgit v1.1 From d7c4f169285a402abfcf522c3982b044a6c311ec Mon Sep 17 00:00:00 2001 From: BlueWall Date: Tue, 11 Dec 2012 21:54:27 -0500 Subject: Replace Mono.Addins libraries Mono.Addins.Setup uses Ionic.Zip for compression. Libraries Compiled on Win32 --- bin/Mono.Addins.CecilReflector.dll | Bin 218112 -> 294912 bytes bin/Mono.Addins.Setup.dll | Bin 123904 -> 135168 bytes bin/Mono.Addins.dll | Bin 221184 -> 233472 bytes 3 files changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/Mono.Addins.CecilReflector.dll b/bin/Mono.Addins.CecilReflector.dll index 96a6877..94ba30a 100755 Binary files a/bin/Mono.Addins.CecilReflector.dll and b/bin/Mono.Addins.CecilReflector.dll differ diff --git a/bin/Mono.Addins.Setup.dll b/bin/Mono.Addins.Setup.dll index 84699b5..6f0fe51 100755 Binary files a/bin/Mono.Addins.Setup.dll and b/bin/Mono.Addins.Setup.dll differ diff --git a/bin/Mono.Addins.dll b/bin/Mono.Addins.dll index 951dee7..aa8a0d0 100755 Binary files a/bin/Mono.Addins.dll and b/bin/Mono.Addins.dll differ -- cgit v1.1 From 7be13d16c833271586e39485f604ad20bdba8435 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Wed, 12 Dec 2012 17:11:30 -0500 Subject: Move setting to correct locations in ini --- bin/Robust.HG.ini.example | 25 ++++++++++++------------- bin/Robust.ini.example | 26 +++++++++++++------------- 2 files changed, 25 insertions(+), 26 deletions(-) (limited to 'bin') diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 55b6f90..c7d4b7f 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -22,6 +22,18 @@ ; * [Startup] +; Plugin Registry Location +; Set path to directory for plugin registry. Information +; about the registered repositories and installed plugins +; will be stored here +; The Robust.exe process must hvae R/W access to the location +RegistryLocation = "." + +; Modular configurations +; Set path to directory for modular ini files... +; The Robust.exe process must hvae R/W access to the location +ConfigDirectory = "/home/opensim/etc/Configs" + [ServiceList] AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector" @@ -53,19 +65,6 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset ;; Additions for other add-on modules. For example: ;; WifiServerConnector = "8002/Diva.Wifi.dll:WifiServerConnector" - -; Plugin Registry Location -; Set path to directory for plugin registry. Information -; about the registered repositories and installed plugins -; will be stored here -; The Robust.exe process must hvae R/W access to the location -RegistryLocation = "." - -; Modular configurations -; Set path to directory for modular ini files... -; The Robust.exe process must hvae R/W access to the location -ConfigDirectory = "/home/opensim/etc/Configs" - ; * This is common for all services, it's the network setup for the entire ; * server instance, if none is specified above ; * diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 8ec6d75..bc5cbcc 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -14,6 +14,19 @@ ; * [Startup] +; Plugin Registry Location +; Set path to directory for plugin registry. Information +; about the registered repositories and installed plugins +; will be stored here +; The Robust.exe process must hvae R/W access to the location +RegistryLocation = "." + + +; Modular configurations +; Set path to directory for modular ini files... +; The Robust.exe process must hvae R/W access to the location +ConfigDirectory = "/home/opensim/etc/Configs" + [ServiceList] AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector" InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector" @@ -31,19 +44,6 @@ FriendsServiceConnector = "8003/OpenSim.Server.Handlers.dll:FriendsServiceConnec MapAddServiceConnector = "8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector" MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector" -; Plugin Registry Location -; Set path to directory for plugin registry. Information -; about the registered repositories and installed plugins -; will be stored here -; The Robust.exe process must hvae R/W access to the location -RegistryLocation = "." - - -; Modular configurations -; Set path to directory for modular ini files... -; The Robust.exe process must hvae R/W access to the location -ConfigDirectory = "/home/opensim/etc/Configs" - ; * This is common for all services, it's the network setup for the entire ; * server instance, if none is specified above ; * -- cgit v1.1 From 203b492fcebb3715e2b5549412d5c0de43e1b8f3 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Thu, 13 Dec 2012 00:05:34 -0500 Subject: Update mono addins Push a small fix for the mono addins --- bin/Mono.Addins.CecilReflector.dll | Bin 294912 -> 290816 bytes bin/Mono.Addins.Setup.dll | Bin 135168 -> 135168 bytes bin/Mono.Addins.dll | Bin 233472 -> 233472 bytes 3 files changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/Mono.Addins.CecilReflector.dll b/bin/Mono.Addins.CecilReflector.dll index 94ba30a..9ca4631 100755 Binary files a/bin/Mono.Addins.CecilReflector.dll and b/bin/Mono.Addins.CecilReflector.dll differ diff --git a/bin/Mono.Addins.Setup.dll b/bin/Mono.Addins.Setup.dll index 6f0fe51..75773aa 100755 Binary files a/bin/Mono.Addins.Setup.dll and b/bin/Mono.Addins.Setup.dll differ diff --git a/bin/Mono.Addins.dll b/bin/Mono.Addins.dll index aa8a0d0..326ed1d 100755 Binary files a/bin/Mono.Addins.dll and b/bin/Mono.Addins.dll differ -- cgit v1.1 From 523213060b315c677bf3142b5d2925460a49c9ed Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 13 Dec 2012 21:02:55 +0000 Subject: Add WaitForEventCompletionOnScriptStop [XEngine] config param to OpenSimDefaults.ini to allow change of the wait time for an event to complete on script removal before aborting its thread Default is 1000, as has previously been the case. This parameter exists for further debug work concerning mono 2.10 crashes that may be related to locks not being removed on Thread.Abort --- bin/OpenSimDefaults.ini | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index e9bdabc..284adfe 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -1368,6 +1368,10 @@ ; If a script overruns it's event limit, kill the script? KillTimedOutScripts = false + ; Amount of time in milliseconds we will wait for an event to completely normally when a script stop is requested + ; before aborting the thread (such as when an object containing scripts is taken into inventory). + WaitForEventCompletionOnScriptStop = 1000; + ; Sets the multiplier for the scripting delays ScriptDelayFactor = 1.0 -- cgit v1.1 From 4a67b936188270b4d6035838d4898e601f2281ac Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Thu, 13 Dec 2012 09:18:19 -0800 Subject: Independently control logging for per region module loading. I just got sick of, when debugging, the zillions of log lines verifying that each module is being added to each region. --- bin/OpenSim.exe.config | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'bin') diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config index e3107ab..8a891f4 100755 --- a/bin/OpenSim.exe.config +++ b/bin/OpenSim.exe.config @@ -32,9 +32,15 @@ + + + + + + -- cgit v1.1