2 files changed, 12 insertions, 10 deletions

diff --git a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
index 965a54e..35f86c5 100644
--- a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
+++ b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
@@ -170,14 +170,6 @@ namespace OpenSim.Server.Handlers.Grid
         public string JsonGetGridInfoMethod(string request, string path, string param,
                                             IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
-            string HomeURI = String.Empty;
-            IConfig cfg = m_Config.Configs["LoginService"];
-
-            if (null != cfg)
-            {
-                HomeURI = cfg.GetString("SRV_HomeURI", HomeURI);
-            }
-
             OSDMap map = new OSDMap();
 
             foreach (string k in _info.Keys)
@@ -185,9 +177,19 @@ namespace OpenSim.Server.Handlers.Grid
                 map[k] = OSD.FromString(_info[k].ToString());
             }
 
+            string HomeURI = Util.GetConfigVarWithDefaultSection(m_Config, "HomeURI", string.Empty);
+
             if (!String.IsNullOrEmpty(HomeURI))
+                map["home"] = OSD.FromString(HomeURI); 
+            else // Legacy. Remove soon!
             {
-                map["home"] = OSD.FromString(HomeURI);
+                IConfig cfg = m_Config.Configs["LoginService"];
+
+                if (null != cfg)
+                    HomeURI = cfg.GetString("SRV_HomeURI", HomeURI);
+
+                if (!String.IsNullOrEmpty(HomeURI))
+                    map["home"] = OSD.FromString(HomeURI);
             }
 
             return OSDParser.SerializeJsonString(map).ToString();
diff --git a/OpenSim/Server/Handlers/Properties/AssemblyInfo.cs b/OpenSim/Server/Handlers/Properties/AssemblyInfo.cs
index d72d36a..3295ffd 100644
--- a/OpenSim/Server/Handlers/Properties/AssemblyInfo.cs
+++ b/OpenSim/Server/Handlers/Properties/AssemblyInfo.cs
@@ -30,4 +30,4 @@ using System.Runtime.InteropServices;
 //      Revision
 //
 [assembly: AssemblyVersion("0.7.6.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+