aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2010-06-30 21:35:05 +0100
committerMelanie2010-06-30 21:35:05 +0100
commit46a531d8652ea935aaa10694df73e4b9a26ae829 (patch)
treeb1f54ccc7d44744d1c6f37fd93071b8eff2eaba4 /bin
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-46a531d8652ea935aaa10694df73e4b9a26ae829.zip
opensim-SC_OLD-46a531d8652ea935aaa10694df73e4b9a26ae829.tar.gz
opensim-SC_OLD-46a531d8652ea935aaa10694df73e4b9a26ae829.tar.bz2
opensim-SC_OLD-46a531d8652ea935aaa10694df73e4b9a26ae829.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin')
-rw-r--r--bin/Robust.32BitLaunch.exebin5632 -> 5632 bytes
-rw-r--r--bin/Robust.HG.ini.example4
-rw-r--r--bin/config-include/StandaloneCommon.ini.example5
3 files changed, 9 insertions, 0 deletions
diff --git a/bin/Robust.32BitLaunch.exe b/bin/Robust.32BitLaunch.exe
index 14a6db3..747d02f 100644
--- a/bin/Robust.32BitLaunch.exe
+++ b/bin/Robust.32BitLaunch.exe
Binary files differ
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 39228eb..6b0029f 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -198,6 +198,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
198 ; CHANGE THIS 198 ; CHANGE THIS
199 ExternalName = "http://127.0.0.1:8002" 199 ExternalName = "http://127.0.0.1:8002"
200 200
201 ; Does this grid allow incoming links to any region in it?
202 ; If false, HG TPs happen only to the Default regions specified in [GridService] section
203 AllowTeleportsToAnyRegion = true
204
201[UserAgentService] 205[UserAgentService]
202 LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" 206 LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
203 ;; for the service 207 ;; for the service
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index bfa6725..de8677f 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -68,3 +68,8 @@
68 68
69[GatekeeperService] 69[GatekeeperService]
70 ExternalName = "http://127.0.0.1:9000" 70 ExternalName = "http://127.0.0.1:9000"
71
72 ; Does this grid allow incoming links to any region in it?
73 ; If false, HG TPs happen only to the Default regions specified in [GridService] section
74 AllowTeleportsToAnyRegion = true
75