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.

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 9661387..6812e6d 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 e570f99..a553136 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 7ff38c9..4c2308e 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);