diff options
author | Melanie | 2013-04-22 22:38:58 +0100 |
---|---|---|
committer | Melanie | 2013-04-22 22:38:58 +0100 |
commit | 8b57ee4fd166cdceb14764ae9ad9cc593c385990 (patch) | |
tree | 4483a7bf412a03aae7c6a6ad6e5f135c1f6e27c5 /bin/config-include | |
parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
parent | Clean up unused config and config comments. (diff) | |
download | opensim-SC-8b57ee4fd166cdceb14764ae9ad9cc593c385990.zip opensim-SC-8b57ee4fd166cdceb14764ae9ad9cc593c385990.tar.gz opensim-SC-8b57ee4fd166cdceb14764ae9ad9cc593c385990.tar.bz2 opensim-SC-8b57ee4fd166cdceb14764ae9ad9cc593c385990.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'bin/config-include')
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 14 | ||||
-rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index f80044e..2547244 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -85,7 +85,7 @@ | |||
85 | Region_Welcome_Area = "DefaultRegion, FallbackRegion" | 85 | Region_Welcome_Area = "DefaultRegion, FallbackRegion" |
86 | 86 | ||
87 | ; === HG ONLY === | 87 | ; === HG ONLY === |
88 | ;; If you have this set under [Startup], no need to set it here, leave it commented | 88 | ;; If you have this set under [Hypergrid], no need to set it here, leave it commented |
89 | ; GatekeeperURI="http://127.0.0.1:9000" | 89 | ; GatekeeperURI="http://127.0.0.1:9000" |
90 | 90 | ||
91 | [LibraryModule] | 91 | [LibraryModule] |
@@ -94,7 +94,7 @@ | |||
94 | 94 | ||
95 | [LoginService] | 95 | [LoginService] |
96 | WelcomeMessage = "Welcome, Avatar!" | 96 | WelcomeMessage = "Welcome, Avatar!" |
97 | ;; If you have Gatekeeper set under [Startup], no need to set it here, leave it commented | 97 | ;; If you have Gatekeeper set under [Hypergrid], no need to set it here, leave it commented |
98 | ; GatekeeperURI = "http://127.0.0.1:9000" | 98 | ; GatekeeperURI = "http://127.0.0.1:9000" |
99 | 99 | ||
100 | SRV_HomeURI = "http://127.0.0.1:9000" | 100 | SRV_HomeURI = "http://127.0.0.1:9000" |
@@ -240,7 +240,7 @@ | |||
240 | ;; HG configurations | 240 | ;; HG configurations |
241 | ;; | 241 | ;; |
242 | [GatekeeperService] | 242 | [GatekeeperService] |
243 | ;; If you have GatekeeperURI set under [Startup], no need to set it here, leave it commented | 243 | ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented |
244 | ; ExternalName = "http://127.0.0.1:9000" | 244 | ; ExternalName = "http://127.0.0.1:9000" |
245 | 245 | ||
246 | ; Does this grid allow incoming links to any region in it? | 246 | ; Does this grid allow incoming links to any region in it? |
@@ -297,11 +297,11 @@ | |||
297 | ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002" | 297 | ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002" |
298 | 298 | ||
299 | [HGInventoryService] | 299 | [HGInventoryService] |
300 | ;; If you have this set under [Startup], no need to set it here, leave it commented | 300 | ;; If you have this set under [Hypergrid], no need to set it here, leave it commented |
301 | ; HomeURI = "http://127.0.0.1:9000" | 301 | ; HomeURI = "http://127.0.0.1:9000" |
302 | 302 | ||
303 | [HGAssetService] | 303 | [HGAssetService] |
304 | ;; If you have this set under [Startup], no need to set it here, leave it commented | 304 | ;; If you have this set under [Hypergrid], no need to set it here, leave it commented |
305 | ; HomeURI = "http://127.0.0.1:9000" | 305 | ; HomeURI = "http://127.0.0.1:9000" |
306 | 306 | ||
307 | ;; The asset types that this grid can export to / import from other grids. | 307 | ;; The asset types that this grid can export to / import from other grids. |
@@ -318,7 +318,7 @@ | |||
318 | 318 | ||
319 | 319 | ||
320 | [HGInventoryAccessModule] | 320 | [HGInventoryAccessModule] |
321 | ;; If you have these set under [Startup], no need to set it here, leave it commented | 321 | ;; If you have these set under [Hypergrid], no need to set it here, leave it commented |
322 | ; HomeURI = "http://127.0.0.1:9000" | 322 | ; HomeURI = "http://127.0.0.1:9000" |
323 | ; GatekeeperURI = "http://127.0.0.1:9000" | 323 | ; GatekeeperURI = "http://127.0.0.1:9000" |
324 | 324 | ||
@@ -337,7 +337,7 @@ | |||
337 | 337 | ||
338 | [Messaging] | 338 | [Messaging] |
339 | ; === HG ONLY === | 339 | ; === HG ONLY === |
340 | ;; If you have this set under [Startup], no need to set it here, leave it commented | 340 | ;; If you have this set under [Hypergrid], no need to set it here, leave it commented |
341 | ; GatekeeperURI = "http://127.0.0.1:9000" | 341 | ; GatekeeperURI = "http://127.0.0.1:9000" |
342 | 342 | ||
343 | 343 | ||
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 195e780..ba92030 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
@@ -55,8 +55,6 @@ | |||
55 | HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector" | 55 | HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector" |
56 | 56 | ||
57 | [InventoryService] | 57 | [InventoryService] |
58 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService" | ||
59 | |||
60 | ; For HGInventoryBroker | 58 | ; For HGInventoryBroker |
61 | LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" | 59 | LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" |
62 | 60 | ||
@@ -147,6 +145,9 @@ | |||
147 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" | 145 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" |
148 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 146 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
149 | 147 | ||
148 | ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 to show a default "Ruth" avatar rather than a cloud. | ||
149 | CreateDefaultAvatarEntries = true | ||
150 | |||
150 | 151 | ||
151 | ;; The interface that local users get when they are in other grids | 152 | ;; The interface that local users get when they are in other grids |
152 | ;; This greatly restricts the inventory operations while in other grids | 153 | ;; This greatly restricts the inventory operations while in other grids |