From 4779f7d7d5ce0e284d9ed15104389f8479b11545 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 19 Feb 2013 17:14:55 -0800
Subject: Deleted all AssemblyFileVersion directives

---
 OpenSim/Region/DataSnapshot/Properties/AssemblyInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/DataSnapshot')

diff --git a/OpenSim/Region/DataSnapshot/Properties/AssemblyInfo.cs b/OpenSim/Region/DataSnapshot/Properties/AssemblyInfo.cs
index 0f083c7..0e7df07 100644
--- a/OpenSim/Region/DataSnapshot/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/DataSnapshot/Properties/AssemblyInfo.cs
@@ -30,4 +30,4 @@ using System.Runtime.InteropServices;
 //      Revision
 //
 [assembly: AssemblyVersion("0.7.6.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+
-- 
cgit v1.1


From e515cdddec435e97e9ed4722de08ee410e94a7e6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 21 Feb 2013 17:26:19 -0800
Subject: Simplification of HG configs: HomeURI and GatekeeperURI now are
 defined as default under [Startup]. They can then be overwritten in the other
 sections (but probably shouldn't). I kept the existing code for backwards
 compatibility, so this should not cause any breaks from people's current
 configurations. But people should move to have these 2 vars under [Startup]
 -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now
 end with "URI" for consistency.

---
 OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/DataSnapshot')

diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 5e62f23..13d9d31 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -113,9 +113,16 @@ namespace OpenSim.Region.DataSnapshot
                     try
                     {
                         m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled);
-                        IConfig conf = config.Configs["GridService"];
-                        if (conf != null)
-                            m_gridinfo.Add("gatekeeperURL", conf.GetString("Gatekeeper", String.Empty));
+                        string gatekeeper = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", "GridService");
+                        // Legacy. Remove soon!
+                        if (string.IsNullOrEmpty(gatekeeper))
+                        {
+                            IConfig conf = config.Configs["GridService"];
+                            if (conf != null)
+                                gatekeeper = conf.GetString("Gatekeeper", gatekeeper);
+                        }
+                        if (!string.IsNullOrEmpty(gatekeeper))
+                            m_gridinfo.Add("gatekeeperURL", gatekeeper);
 
                         m_gridinfo.Add(
                             "name", config.Configs["DataSnapshot"].GetString("gridname", "the lost continent of hippo"));
-- 
cgit v1.1