Merge branch 'master' into careminster

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

1 files changed, 0 insertions, 17 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 9de3862..e3b605b 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -316,23 +316,6 @@
     ;; - "Imprudence 1.3.1" has access
     ; BannedViewerList = 
 
-    ;# {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"
-
-
 [Map]
     ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
     ;; Map tile options.