diff options
Diffstat (limited to '')
-rwxr-xr-x | bin/Mono.Addins.CecilReflector.dll | bin | 226816 -> 290816 bytes | |||
-rwxr-xr-x | bin/Mono.Addins.Setup.dll | bin | 130560 -> 135168 bytes | |||
-rwxr-xr-x | bin/Mono.Addins.dll | bin | 235008 -> 233472 bytes | |||
-rwxr-xr-x | bin/OpenSim.exe.config | 6 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 4 | ||||
-rw-r--r-- | bin/Robust.HG.ini.example | 25 | ||||
-rw-r--r-- | bin/Robust.ini.example | 26 |
7 files changed, 35 insertions, 26 deletions
diff --git a/bin/Mono.Addins.CecilReflector.dll b/bin/Mono.Addins.CecilReflector.dll index fb95e00..9ca4631 100755 --- a/bin/Mono.Addins.CecilReflector.dll +++ b/bin/Mono.Addins.CecilReflector.dll | |||
Binary files differ | |||
diff --git a/bin/Mono.Addins.Setup.dll b/bin/Mono.Addins.Setup.dll index 502ad18..75773aa 100755 --- a/bin/Mono.Addins.Setup.dll +++ b/bin/Mono.Addins.Setup.dll | |||
Binary files differ | |||
diff --git a/bin/Mono.Addins.dll b/bin/Mono.Addins.dll index 1bc4c55..326ed1d 100755 --- a/bin/Mono.Addins.dll +++ b/bin/Mono.Addins.dll | |||
Binary files differ | |||
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 @@ | |||
32 | <appender-ref ref="LogFileAppender" /> | 32 | <appender-ref ref="LogFileAppender" /> |
33 | </root> | 33 | </root> |
34 | 34 | ||
35 | <!-- Independently control logging level for XEngine --> | ||
35 | <logger name="OpenSim.Region.ScriptEngine.XEngine"> | 36 | <logger name="OpenSim.Region.ScriptEngine.XEngine"> |
36 | <level value="INFO"/> | 37 | <level value="INFO"/> |
37 | </logger> | 38 | </logger> |
38 | 39 | ||
40 | <!-- Independently control logging level for per region module loading --> | ||
41 | <logger name="OpenSim.ApplicationPlugins.RegionModulesController.RegionModulesControllerPlugin"> | ||
42 | <level value="INFO"/> | ||
43 | </logger> | ||
44 | |||
39 | </log4net> | 45 | </log4net> |
40 | </configuration> | 46 | </configuration> |
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index d83896e..9bfab4a 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -1364,6 +1364,10 @@ | |||
1364 | ; If a script overruns it's event limit, kill the script? | 1364 | ; If a script overruns it's event limit, kill the script? |
1365 | KillTimedOutScripts = false | 1365 | KillTimedOutScripts = false |
1366 | 1366 | ||
1367 | ; Amount of time in milliseconds we will wait for an event to completely normally when a script stop is requested | ||
1368 | ; before aborting the thread (such as when an object containing scripts is taken into inventory). | ||
1369 | WaitForEventCompletionOnScriptStop = 1000; | ||
1370 | |||
1367 | ; Sets the multiplier for the scripting delays | 1371 | ; Sets the multiplier for the scripting delays |
1368 | ScriptDelayFactor = 1.0 | 1372 | ScriptDelayFactor = 1.0 |
1369 | 1373 | ||
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 @@ | |||
22 | ; * | 22 | ; * |
23 | [Startup] | 23 | [Startup] |
24 | 24 | ||
25 | ; Plugin Registry Location | ||
26 | ; Set path to directory for plugin registry. Information | ||
27 | ; about the registered repositories and installed plugins | ||
28 | ; will be stored here | ||
29 | ; The Robust.exe process must hvae R/W access to the location | ||
30 | RegistryLocation = "." | ||
31 | |||
32 | ; Modular configurations | ||
33 | ; Set path to directory for modular ini files... | ||
34 | ; The Robust.exe process must hvae R/W access to the location | ||
35 | ConfigDirectory = "/home/opensim/etc/Configs" | ||
36 | |||
25 | [ServiceList] | 37 | [ServiceList] |
26 | 38 | ||
27 | AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector" | 39 | AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector" |
@@ -53,19 +65,6 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset | |||
53 | ;; Additions for other add-on modules. For example: | 65 | ;; Additions for other add-on modules. For example: |
54 | ;; WifiServerConnector = "8002/Diva.Wifi.dll:WifiServerConnector" | 66 | ;; WifiServerConnector = "8002/Diva.Wifi.dll:WifiServerConnector" |
55 | 67 | ||
56 | |||
57 | ; Plugin Registry Location | ||
58 | ; Set path to directory for plugin registry. Information | ||
59 | ; about the registered repositories and installed plugins | ||
60 | ; will be stored here | ||
61 | ; The Robust.exe process must hvae R/W access to the location | ||
62 | RegistryLocation = "." | ||
63 | |||
64 | ; Modular configurations | ||
65 | ; Set path to directory for modular ini files... | ||
66 | ; The Robust.exe process must hvae R/W access to the location | ||
67 | ConfigDirectory = "/home/opensim/etc/Configs" | ||
68 | |||
69 | ; * This is common for all services, it's the network setup for the entire | 68 | ; * This is common for all services, it's the network setup for the entire |
70 | ; * server instance, if none is specified above | 69 | ; * server instance, if none is specified above |
71 | ; * | 70 | ; * |
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 @@ | |||
14 | ; * | 14 | ; * |
15 | [Startup] | 15 | [Startup] |
16 | 16 | ||
17 | ; Plugin Registry Location | ||
18 | ; Set path to directory for plugin registry. Information | ||
19 | ; about the registered repositories and installed plugins | ||
20 | ; will be stored here | ||
21 | ; The Robust.exe process must hvae R/W access to the location | ||
22 | RegistryLocation = "." | ||
23 | |||
24 | |||
25 | ; Modular configurations | ||
26 | ; Set path to directory for modular ini files... | ||
27 | ; The Robust.exe process must hvae R/W access to the location | ||
28 | ConfigDirectory = "/home/opensim/etc/Configs" | ||
29 | |||
17 | [ServiceList] | 30 | [ServiceList] |
18 | AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector" | 31 | AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector" |
19 | InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector" | 32 | InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector" |
@@ -31,19 +44,6 @@ FriendsServiceConnector = "8003/OpenSim.Server.Handlers.dll:FriendsServiceConnec | |||
31 | MapAddServiceConnector = "8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector" | 44 | MapAddServiceConnector = "8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector" |
32 | MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector" | 45 | MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector" |
33 | 46 | ||
34 | ; Plugin Registry Location | ||
35 | ; Set path to directory for plugin registry. Information | ||
36 | ; about the registered repositories and installed plugins | ||
37 | ; will be stored here | ||
38 | ; The Robust.exe process must hvae R/W access to the location | ||
39 | RegistryLocation = "." | ||
40 | |||
41 | |||
42 | ; Modular configurations | ||
43 | ; Set path to directory for modular ini files... | ||
44 | ; The Robust.exe process must hvae R/W access to the location | ||
45 | ConfigDirectory = "/home/opensim/etc/Configs" | ||
46 | |||
47 | ; * This is common for all services, it's the network setup for the entire | 47 | ; * This is common for all services, it's the network setup for the entire |
48 | ; * server instance, if none is specified above | 48 | ; * server instance, if none is specified above |
49 | ; * | 49 | ; * |