aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include
diff options
context:
space:
mode:
authorDiva Canto2013-02-21 17:26:19 -0800
committerDiva Canto2013-02-21 17:26:19 -0800
commite515cdddec435e97e9ed4722de08ee410e94a7e6 (patch)
tree0b090dc495ef464e037d4f134f059bce35504d2f /bin/config-include
parentBulletSim: add OutOfBounds logic and some position sanity checking (diff)
downloadopensim-SC_OLD-e515cdddec435e97e9ed4722de08ee410e94a7e6.zip
opensim-SC_OLD-e515cdddec435e97e9ed4722de08ee410e94a7e6.tar.gz
opensim-SC_OLD-e515cdddec435e97e9ed4722de08ee410e94a7e6.tar.bz2
opensim-SC_OLD-e515cdddec435e97e9ed4722de08ee410e94a7e6.tar.xz
Simplification of HG configs: HomeURI and GatekeeperURI now are defined as default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.
Diffstat (limited to 'bin/config-include')
-rw-r--r--bin/config-include/StandaloneCommon.ini.example25
1 files changed, 15 insertions, 10 deletions
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index ffa2d49..3129078 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -64,8 +64,8 @@
64 Region_Welcome_Area = "DefaultRegion, FallbackRegion" 64 Region_Welcome_Area = "DefaultRegion, FallbackRegion"
65 65
66 ; === HG ONLY === 66 ; === HG ONLY ===
67 ;; change this to the address of your simulator 67 ;; If you have this set under [Startup], no need to set it here, leave it commented
68 Gatekeeper="http://127.0.0.1:9000" 68 ; GatekeeperURI="http://127.0.0.1:9000"
69 69
70[LibraryModule] 70[LibraryModule]
71 ; Set this if you want to change the name of the OpenSim Library 71 ; Set this if you want to change the name of the OpenSim Library
@@ -73,7 +73,8 @@
73 73
74[LoginService] 74[LoginService]
75 WelcomeMessage = "Welcome, Avatar!" 75 WelcomeMessage = "Welcome, Avatar!"
76 GatekeeperURI = "http://127.0.0.1:9000" 76 ;; If you have Gatekeeper set under [Startup], no need to set it here, leave it commented
77 ; GatekeeperURI = "http://127.0.0.1:9000"
77 78
78 SRV_HomeURI = "http://127.0.0.1:9000" 79 SRV_HomeURI = "http://127.0.0.1:9000"
79 SRV_InventoryServerURI = "http://127.0.0.1:9000" 80 SRV_InventoryServerURI = "http://127.0.0.1:9000"
@@ -218,7 +219,8 @@
218;; HG configurations 219;; HG configurations
219;; 220;;
220[GatekeeperService] 221[GatekeeperService]
221 ExternalName = "http://127.0.0.1:9000" 222 ;; If you have GatekeeperURI set under [Startup], no need to set it here, leave it commented
223 ; ExternalName = "http://127.0.0.1:9000"
222 224
223 ; Does this grid allow incoming links to any region in it? 225 ; Does this grid allow incoming links to any region in it?
224 ; If false, HG TPs happen only to the Default regions specified in [GridService] section 226 ; If false, HG TPs happen only to the Default regions specified in [GridService] section
@@ -274,10 +276,12 @@
274 ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002" 276 ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
275 277
276[HGInventoryService] 278[HGInventoryService]
277 HomeURI = "http://127.0.0.1:9000" 279 ;; If you have this set under [Startup], no need to set it here, leave it commented
280 ; HomeURI = "http://127.0.0.1:9000"
278 281
279[HGAssetService] 282[HGAssetService]
280 HomeURI = "http://127.0.0.1:9000" 283 ;; If you have this set under [Startup], no need to set it here, leave it commented
284 ; HomeURI = "http://127.0.0.1:9000"
281 285
282 ;; The asset types that this grid can export to / import from other grids. 286 ;; The asset types that this grid can export to / import from other grids.
283 ;; Comma separated. 287 ;; Comma separated.
@@ -293,8 +297,9 @@
293 297
294 298
295[HGInventoryAccessModule] 299[HGInventoryAccessModule]
296 HomeURI = "http://127.0.0.1:9000" 300 ;; If you have these set under [Startup], no need to set it here, leave it commented
297 Gatekeeper = "http://127.0.0.1:9000" 301 ; HomeURI = "http://127.0.0.1:9000"
302 ; GatekeeperURI = "http://127.0.0.1:9000"
298 303
299 ;; If you want to protect your assets from being copied by foreign visitors 304 ;; If you want to protect your assets from being copied by foreign visitors
300 ;; uncomment the next line. You may want to do this on sims that have licensed content. 305 ;; uncomment the next line. You may want to do this on sims that have licensed content.
@@ -311,8 +316,8 @@
311 316
312[Messaging] 317[Messaging]
313 ; === HG ONLY === 318 ; === HG ONLY ===
314 ;; change this to the address of your simulator 319 ;; If you have this set under [Startup], no need to set it here, leave it commented
315 Gatekeeper = "http://127.0.0.1:9000" 320 ; GatekeeperURI = "http://127.0.0.1:9000"
316 321
317 322
318[EntityTransfer] 323[EntityTransfer]