Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneManager.cs

1 files changed, 20 insertions, 0 deletions

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index e53fcca..d12ea5b 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -26,6 +26,26 @@
     ;StorageProvider = "OpenSim.Data.MSSQL.dll"
     ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
 
+[Hypergrid]
+        ; Uncomment the variables in this section only if you are in
+        ; Hypergrid configuration. Otherwise, ignore.
+
+    ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
+        ;; If this is a standalone world, this is the address of this instance.
+        ;; If this is a grided simulator, this is the address of the external robust server that
+        ;; runs the UserAgentsService.
+        ;; For example http://myworld.com:9000 or http://myworld.com:8002
+        ;; This is a default that can be overwritten in some sections.
+        ; HomeURI = "http://127.0.0.1:9000"
+
+    ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
+        ;; If this is a standalone world, this is the address of this instance.
+        ;; If this is a grided simulator, this is the address of the external robust server
+        ;; that runs the Gatekeeper service.
+        ;; For example http://myworld.com:9000 or http://myworld.com:8002
+        ;; This is a default that can be overwritten in some sections.
+        ; GatekeeperURI = "http://127.0.0.1:9000"
+
 [Modules]
     ;; Choose one cache module and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and adapt that.