From 3a6b27befbc6119929b7e5dc67456195720c3093 Mon Sep 17 00:00:00 2001
From: diva <diva@metaverseink.com>
Date: Mon, 29 Dec 2008 22:44:04 +0000
Subject: [PATCH] Changing the default Comms module to be RESTComms, in case
 none is specified in OpenSim.ini. RESTComms is a super-set of LocalComms.
 Calls to local regions do no use REST, they use internal function calls.

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

diff --git a/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs
index 96613879a3..6812e6d019 100644
--- a/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs
+++ b/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.Local
                 IConfig startupConfig = config.Configs["Communications"];
 
                 if ((startupConfig == null) ||
-                    (startupConfig != null) && (startupConfig.GetString("InterregionComms", "LocalComms") == "LocalComms"))
+                    (startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "LocalComms"))
                     m_enabled = true;
             }
 
diff --git a/OpenSim/Region/Environment/Modules/Communications/REST/HGInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/REST/HGInterregionComms.cs
index e570f999e5..a5531369d8 100644
--- a/OpenSim/Region/Environment/Modules/Communications/REST/HGInterregionComms.cs
+++ b/OpenSim/Region/Environment/Modules/Communications/REST/HGInterregionComms.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
             {
                 initialized = true;
                 IConfig startupConfig = config.Configs["Communications"];
-                if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "LocalComms") == "HGRESTComms"))
+                if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "HGRESTComms"))
                 {
                     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 7ff38c93f4..4c2308e21a 100644
--- a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
+++ b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
             {
                 initialized = true;
                 IConfig startupConfig = config.Configs["Communications"];
-                if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "LocalComms") == "RESTComms"))
+                if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "RESTComms"))
                 {
                     m_enabled = true;
                     InitOnce(scene);