* Better debug message on login problems.

* Moved GridInfoService config to OpenSim.Server.ini

3 files changed, 93 insertions, 46 deletions

diff --git a/bin/OpenSim.Server.HG.ini.example b/bin/OpenSim.Server.HG.ini.example
index 97c2e06..5e3f9a7 100644
--- a/bin/OpenSim.Server.HG.ini.example
+++ b/bin/OpenSim.Server.HG.ini.example
@@ -133,6 +133,52 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     InventoryServerURI = "http://127.0.0.1:8002"
     AssetServerURI = "http://127.0.0.1:8002"
 
+[GridInfoService]
+    ; These settings are used to return information on a get_grid_info call.
+    ; Client launcher scripts and third-party clients make use of this to
+    ; autoconfigure the client and to provide a nice user experience. If you
+    ; want to facilitate that, you should configure the settings here according
+    ; to your grid or standalone setup.
+    ;
+    ; See http://opensimulator.org/wiki/GridInfo
+
+    ; login uri: for grid this is the login server URI
+    login = http://127.0.0.1:9000/
+
+    ; long grid name: the long name of your grid
+    gridname = "the lost continent of hippo"
+
+    ; short grid name: the short name of your grid
+    gridnick = "hippogrid"
+
+    ; login page: optional: if it exists it will be used to tell the client to use
+    ;                       this as splash page
+    ; currently unused
+    ;welcome = http://127.0.0.1/welcome
+
+    ; helper uri: optional: if it exists if will be used to tell the client to use
+    ;                       this for all economy related things
+    ; currently unused
+    ;economy = http://127.0.0.1:9000/
+
+    ; web page of grid: optional: page providing further information about your grid
+    ; currently unused
+    ;about = http://127.0.0.1/about/
+
+    ; account creation: optional: page providing further information about obtaining
+    ;                             a user account on your grid
+    ; currently unused
+    ;register = http://127.0.0.1/register
+
+    ; help: optional: page providing further assistance for users of your grid
+    ; currently unused
+    ;help = http://127.0.0.1/help
+
+    ; password help: optional: page providing password assistance for users of your grid
+    ; currently unused
+    ;password = http://127.0.0.1/password
+
+
 [GatekeeperService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
     ;; for the service
@@ -160,3 +206,4 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
 [HGInventoryService]
     ; For the InventoryServiceInConnector
     LocalServiceModule    = "OpenSim.Services.InventoryService.dll:HGInventoryService"
+
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index e822e83..9bedac6 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -127,3 +127,49 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
 
     WelcomeMessage = "Welcome, Avatar!"
+
+
+[GridInfoService]
+    ; These settings are used to return information on a get_grid_info call.
+    ; Client launcher scripts and third-party clients make use of this to
+    ; autoconfigure the client and to provide a nice user experience. If you
+    ; want to facilitate that, you should configure the settings here according
+    ; to your grid or standalone setup.
+    ;
+    ; See http://opensimulator.org/wiki/GridInfo
+
+    ; login uri: for grid this is the login server URI
+    login = http://127.0.0.1:9000/
+
+    ; long grid name: the long name of your grid
+    gridname = "the lost continent of hippo"
+
+    ; short grid name: the short name of your grid
+    gridnick = "hippogrid"
+
+    ; login page: optional: if it exists it will be used to tell the client to use
+    ;                       this as splash page
+    ; currently unused
+    ;welcome = http://127.0.0.1/welcome
+
+    ; helper uri: optional: if it exists if will be used to tell the client to use
+    ;                       this for all economy related things
+    ; currently unused
+    ;economy = http://127.0.0.1:9000/
+
+    ; web page of grid: optional: page providing further information about your grid
+    ; currently unused
+    ;about = http://127.0.0.1/about/
+
+    ; account creation: optional: page providing further information about obtaining
+    ;                             a user account on your grid
+    ; currently unused
+    ;register = http://127.0.0.1/register
+
+    ; help: optional: page providing further assistance for users of your grid
+    ; currently unused
+    ;help = http://127.0.0.1/help
+
+    ; password help: optional: page providing password assistance for users of your grid
+    ; currently unused
+    ;password = http://127.0.0.1/password
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 020632f..309ce88 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -979,52 +979,6 @@
     ; DisableUndergroundMovement = true
 
 
-[GridInfoService]
-    ; These settings are used to return information on a get_grid_info call.
-    ; Client launcher scripts and third-party clients make use of this to
-    ; autoconfigure the client and to provide a nice user experience. If you
-    ; want to facilitate that, you should configure the settings here according
-    ; to your grid or standalone setup.
-    ;
-    ; See http://opensimulator.org/wiki/GridInfo
-
-    ; login uri: for grid this is the user server URI
-    login = http://127.0.0.1:9000/
-
-    ; long grid name: the long name of your grid
-    gridname = "the lost continent of hippo"
-
-    ; short grid name: the short name of your grid
-    gridnick = "hippogrid"
-
-    ; login page: optional: if it exists it will be used to tell the client to use
-    ;                       this as splash page
-    ; currently unused
-    ;welcome = http://127.0.0.1/welcome
-
-    ; helper uri: optional: if it exists if will be used to tell the client to use
-    ;                       this for all economy related things
-    ; currently unused
-    ;economy = http://127.0.0.1:9000/
-
-    ; web page of grid: optional: page providing further information about your grid
-    ; currently unused
-    ;about = http://127.0.0.1/about/
-
-    ; account creation: optional: page providing further information about obtaining
-    ;                             a user account on your grid
-    ; currently unused
-    ;register = http://127.0.0.1/register
-
-    ; help: optional: page providing further assistance for users of your grid
-    ; currently unused
-    ;help = http://127.0.0.1/help
-
-    ; password help: optional: page providing password assistance for users of your grid
-    ; currently unused
-    ;password = http://127.0.0.1/password
-
-
 [OpenGridProtocol]
     ;These are the settings for the Open Grid Protocol..  the Agent Domain, Region Domain,   you know..
     ;On/true or Off/false