OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster

avinationmerge
Melanie 2013-04-22 22:38:58 +01:00
parent 671a97ef76 6ddc39a676
commit 8b57ee4fd1
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bin/config-include/StandaloneCommon.ini.example
View File

@ -85,7 +85,7 @@
Region_Welcome_Area = "DefaultRegion, FallbackRegion"
; === HG ONLY ===
;; If you have this set under [Startup], no need to set it here, leave it commented
;; If you have this set under [Hypergrid], no need to set it here, leave it commented
; GatekeeperURI="http://127.0.0.1:9000"
[LibraryModule]
@ -94,7 +94,7 @@
[LoginService]
WelcomeMessage = "Welcome, Avatar!"
;; If you have Gatekeeper set under [Startup], no need to set it here, leave it commented
;; If you have Gatekeeper set under [Hypergrid], no need to set it here, leave it commented
; GatekeeperURI = "http://127.0.0.1:9000"
SRV_HomeURI = "http://127.0.0.1:9000"
@ -240,7 +240,7 @@
;; HG configurations
;;
[GatekeeperService]
;; If you have GatekeeperURI set under [Startup], no need to set it here, leave it commented
;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
; ExternalName = "http://127.0.0.1:9000"
; Does this grid allow incoming links to any region in it?
@ -297,11 +297,11 @@
; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
[HGInventoryService]
;; If you have this set under [Startup], no need to set it here, leave it commented
;; If you have this set under [Hypergrid], no need to set it here, leave it commented
; HomeURI = "http://127.0.0.1:9000"
[HGAssetService]
;; If you have this set under [Startup], no need to set it here, leave it commented
;; If you have this set under [Hypergrid], no need to set it here, leave it commented
; HomeURI = "http://127.0.0.1:9000"
;; The asset types that this grid can export to / import from other grids.
@ -318,7 +318,7 @@
[HGInventoryAccessModule]
;; If you have these set under [Startup], no need to set it here, leave it commented
;; If you have these set under [Hypergrid], no need to set it here, leave it commented
; HomeURI = "http://127.0.0.1:9000"
; GatekeeperURI = "http://127.0.0.1:9000"
@ -337,7 +337,7 @@
[Messaging]
; === HG ONLY ===
;; If you have this set under [Startup], no need to set it here, leave it commented
;; If you have this set under [Hypergrid], no need to set it here, leave it commented
; GatekeeperURI = "http://127.0.0.1:9000"

5
bin/config-include/StandaloneHypergrid.ini
View File

@ -55,8 +55,6 @@
HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
[InventoryService]
LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
; For HGInventoryBroker
LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
@ -147,6 +145,9 @@
FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
;; 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.
CreateDefaultAvatarEntries = true
;; The interface that local users get when they are in other grids
;; This greatly restricts the inventory operations while in other grids