diff options
author | BlueWall | 2012-09-07 11:43:22 -0400 |
---|---|---|
committer | BlueWall | 2012-09-07 11:43:22 -0400 |
commit | 0199abd6256351cb7bf823ef05822583568545ed (patch) | |
tree | ae1e01617ddbdf4c7b45753a791ae0528f6943a2 /bin | |
parent | Revert "Move addin information to RegionCombinerModule.addin.xml" (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-0199abd6256351cb7bf823ef05822583568545ed.zip opensim-SC_OLD-0199abd6256351cb7bf823ef05822583568545ed.tar.gz opensim-SC_OLD-0199abd6256351cb7bf823ef05822583568545ed.tar.bz2 opensim-SC_OLD-0199abd6256351cb7bf823ef05822583568545ed.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
-rw-r--r-- | bin/Robust.HG.ini.example | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index f5e6bc6..fad399d 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -104,6 +104,12 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
104 | ; Region_Welcome_Area = "DefaultRegion, FallbackRegion" | 104 | ; Region_Welcome_Area = "DefaultRegion, FallbackRegion" |
105 | ; (replace spaces with underscore) | 105 | ; (replace spaces with underscore) |
106 | 106 | ||
107 | ;; Allow Hyperlinks to be created at the console | ||
108 | HypergridLinker = true | ||
109 | |||
110 | Gatekeeper = "http://127.0.0.1:8002" | ||
111 | |||
112 | |||
107 | ; * This is the configuration for the freeswitch server in grid mode | 113 | ; * This is the configuration for the freeswitch server in grid mode |
108 | [FreeswitchService] | 114 | [FreeswitchService] |
109 | LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" | 115 | LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" |
@@ -182,11 +188,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
182 | InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" | 188 | InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" |
183 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" | 189 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" |
184 | 190 | ||
185 | ;; Allow Hyperlinks to be created at the console | ||
186 | HypergridLinker = true | ||
187 | |||
188 | Gatekeeper = "http://127.0.0.1:8002" | ||
189 | |||
190 | ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 | 191 | ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 |
191 | ;; to show a default "Ruth" avatar rather than a cloud for a newly created user. | 192 | ;; to show a default "Ruth" avatar rather than a cloud for a newly created user. |
192 | ;; Default is false | 193 | ;; Default is false |