aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMic Bowman2011-08-19 14:49:16 -0700
committerMic Bowman2011-08-19 14:49:16 -0700
commit384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f (patch)
tree5e557eac5d4d3d4ad95b9e3e70a2a661e5745ec3 /bin
parentBulletSim: add runtime setting of physics parameters. Update default values. (diff)
parentGet rid of HttpServer.dll to avoid confusion since we use HttpServer_OpenSim.... (diff)
downloadopensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.zip
opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.gz
opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.bz2
opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.xz
Merge branch 'master' into bulletsim
Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'bin')
-rwxr-xr-xbin/HttpServer.dllbin102400 -> 0 bytes
-rw-r--r--bin/OpenSim.ini.example5
-rw-r--r--bin/OpenSimDefaults.ini3
-rw-r--r--bin/Robust.HG.ini.example2
-rw-r--r--bin/Robust.ini.example2
-rw-r--r--bin/config-include/GridCommon.ini.example1
-rw-r--r--bin/config-include/StandaloneCommon.ini.example13
7 files changed, 19 insertions, 7 deletions
diff --git a/bin/HttpServer.dll b/bin/HttpServer.dll
deleted file mode 100755
index 717ceed..0000000
--- a/bin/HttpServer.dll
+++ /dev/null
Binary files differ
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index bcfaf76..c36d2a4 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -151,6 +151,7 @@
151 ;; OpenDynamicsEngine is by some distance the most developed physics engine 151 ;; OpenDynamicsEngine is by some distance the most developed physics engine
152 ;; basicphysics effectively does not model physics at all, making all 152 ;; basicphysics effectively does not model physics at all, making all
153 ;; objects phantom 153 ;; objects phantom
154 ;; The Bullet plugins do not work properly right now. A better Bullet plugin is on the way.
154 ;; Default is OpenDynamicsEngine 155 ;; Default is OpenDynamicsEngine
155 ; physics = OpenDynamicsEngine 156 ; physics = OpenDynamicsEngine
156 ; physics = basicphysics 157 ; physics = basicphysics
@@ -318,8 +319,8 @@
318 ; meant to override the MapImage and search server url given at login, and varying 319 ; meant to override the MapImage and search server url given at login, and varying
319 ; on a sim-basis. 320 ; on a sim-basis.
320 ; Viewers that don't understand it, will ignore it 321 ; Viewers that don't understand it, will ignore it
321 ;MapImageServerURI = "http://127.0.0.1:9000/ 322 ;MapImageServerURI = "http://127.0.0.1:9000/"
322 ;SearchServerURI = "http://127.0.0.1:9000/ 323 ;SearchServerURI = "http://127.0.0.1:9000/"
323 324
324 325
325[Chat] 326[Chat]
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 2877541..e38c0ea 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -217,6 +217,9 @@
217 ;WorldMapModule = "WorldMap" 217 ;WorldMapModule = "WorldMap"
218 ;MapImageModule = "MapImageModule" 218 ;MapImageModule = "MapImageModule"
219 219
220 ; World map blacklist timeout in seconds
221 ;BlacklistTimeout = 600
222
220 ; Set to false to not generate any maptiles 223 ; Set to false to not generate any maptiles
221 ;GenerateMaptiles = true 224 ;GenerateMaptiles = true
222 225
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index ea271b8..b760abd 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -203,6 +203,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
203 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" 203 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
204 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" 204 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
205 205
206 ;Currency = ""
207
206 WelcomeMessage = "Welcome, Avatar!" 208 WelcomeMessage = "Welcome, Avatar!"
207 AllowRemoteSetLoginLevel = "false" 209 AllowRemoteSetLoginLevel = "false"
208 210
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 14f79aa..a36d255 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -188,6 +188,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
188 LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" 188 LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService"
189 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" 189 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
190 190
191 ;Currency = ""
192
191 WelcomeMessage = "Welcome, Avatar!" 193 WelcomeMessage = "Welcome, Avatar!"
192 AllowRemoteSetLoginLevel = "false" 194 AllowRemoteSetLoginLevel = "false"
193 195
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 4e34059..c5598c0 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -122,6 +122,7 @@
122[Modules] 122[Modules]
123 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. 123 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
124 ;; Copy the config .example file into your own .ini file and change configs there 124 ;; Copy the config .example file into your own .ini file and change configs there
125 ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained.
125 126
126 AssetCaching = "FlotsamAssetCache" 127 AssetCaching = "FlotsamAssetCache"
127 Include-FlotsamCache = "config-include/FlotsamCache.ini" 128 Include-FlotsamCache = "config-include/FlotsamCache.ini"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index ee0523f..431dce1 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -45,14 +45,15 @@
45[Modules] 45[Modules]
46 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. 46 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
47 ;; Copy the config .example file into your own .ini file and change configs there 47 ;; Copy the config .example file into your own .ini file and change configs there
48 ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained.
48 49
49 ;AssetCaching = "GlynnTuckerAssetCache" 50 AssetCaching = "FlotsamAssetCache"
51 Include-FlotsamCache = "config-include/FlotsamCache.ini"
50 52
51 ;AssetCaching = "FlotsamAssetCache" 53 ;AssetCaching = "GlynnTuckerAssetCache"
52 ;Include-FlotsamCache = "config-include/FlotsamCache.ini"
53 54
54 AssetCaching = "CenomeMemoryAssetCache" 55 ; AssetCaching = "CenomeMemoryAssetCache"
55 Include-CenomeCache = "config-include/CenomeCache.ini" 56 ; Include-CenomeCache = "config-include/CenomeCache.ini"
56 57
57 ;; Authorization is not on by default, as it depends on external php 58 ;; Authorization is not on by default, as it depends on external php
58 ;AuthorizationServices = "LocalAuthorizationServicesConnector" 59 ;AuthorizationServices = "LocalAuthorizationServicesConnector"
@@ -99,6 +100,8 @@
99 ;; For Viewer 2 100 ;; For Viewer 2
100 MapTileURL = "http://127.0.0.1:9000/" 101 MapTileURL = "http://127.0.0.1:9000/"
101 102
103 ;Currency = ""
104
102 ;; Regular expressions for controlling which client versions are accepted/denied. 105 ;; Regular expressions for controlling which client versions are accepted/denied.
103 ;; An empty string means nothing is checked. 106 ;; An empty string means nothing is checked.
104 ;; 107 ;;