Merge branch 'master' of /home/opensim/var/repo/opensim
commit
cdac29549e
|
@ -104,6 +104,12 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
|
||||||
; Region_Welcome_Area = "DefaultRegion, FallbackRegion"
|
; Region_Welcome_Area = "DefaultRegion, FallbackRegion"
|
||||||
; (replace spaces with underscore)
|
; (replace spaces with underscore)
|
||||||
|
|
||||||
|
;; Allow Hyperlinks to be created at the console
|
||||||
|
HypergridLinker = true
|
||||||
|
|
||||||
|
Gatekeeper = "http://127.0.0.1:8002"
|
||||||
|
|
||||||
|
|
||||||
; * This is the configuration for the freeswitch server in grid mode
|
; * This is the configuration for the freeswitch server in grid mode
|
||||||
[FreeswitchService]
|
[FreeswitchService]
|
||||||
LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
|
LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
|
||||||
|
@ -182,11 +188,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
|
||||||
InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
|
InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
|
||||||
AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
|
AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
|
||||||
|
|
||||||
;; Allow Hyperlinks to be created at the console
|
|
||||||
HypergridLinker = true
|
|
||||||
|
|
||||||
Gatekeeper = "http://127.0.0.1:8002"
|
|
||||||
|
|
||||||
;; This switch creates the minimum set of body parts and avatar entries for a viewer 2
|
;; 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 for a newly created user.
|
;; to show a default "Ruth" avatar rather than a cloud for a newly created user.
|
||||||
;; Default is false
|
;; Default is false
|
||||||
|
|
Loading…
Reference in New Issue