From eaf8066700bc48259d509282fd6362ca697b49ad Mon Sep 17 00:00:00 2001
From: diva <diva@metaverseink.com>
Date: Tue, 30 Dec 2008 01:21:13 +0000
Subject: [PATCH] Making the default choice for InterregionComms work, and
 removing an unnecessary console debug message.

---
 .../Modules/Communications/Local/LocalInterregionComms.cs | 8 +++++---
 .../Modules/Communications/REST/HGInterregionComms.cs     | 1 +
 .../Modules/Communications/REST/RESTInterregionComms.cs   | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs
index dc2e3de9cd..781bf1c786 100644
--- a/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs
+++ b/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs
@@ -64,9 +64,11 @@ namespace OpenSim.Region.Environment.Modules.Communications.Local
             {
                 IConfig startupConfig = config.Configs["Communications"];
 
-                if ((startupConfig == null) ||
-                    (startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "LocalComms"))
+                if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "LocalComms"))
+                {
+                    m_log.Debug("[LOCAL COMMS]: Enabling InterregionComms LocalComms module");
                     m_enabled = true;
+                }
             }
 
             if (!m_enabled)
@@ -131,7 +133,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.Local
                     }
                 }
             }
-            m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate");
+            //m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate");
             return false;
         }
 
diff --git a/OpenSim/Region/Environment/Modules/Communications/REST/HGInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/REST/HGInterregionComms.cs
index a94ca8b18f..1599d7566f 100644
--- a/OpenSim/Region/Environment/Modules/Communications/REST/HGInterregionComms.cs
+++ b/OpenSim/Region/Environment/Modules/Communications/REST/HGInterregionComms.cs
@@ -55,6 +55,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
                 IConfig startupConfig = config.Configs["Communications"];
                 if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "HGRESTComms"))
                 {
+                    m_log.Debug("[HGREST COMMS]: Enabling InterregionComms HGRESTComms module");
                     m_enabled = true;
                     InitOnce(scene);
                 }
diff --git a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
index 022f635a92..77aad6b030 100644
--- a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
+++ b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
@@ -68,8 +68,10 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
             {
                 initialized = true;
                 IConfig startupConfig = config.Configs["Communications"];
-                if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "RESTComms"))
+                if ((startupConfig == null) || 
+                    (startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "RESTComms"))
                 {
+                    m_log.Debug("[REST COMMS]: Enabling InterregionComms RESTComms module");
                     m_enabled = true;
                     InitOnce(scene);
                 }