Parcourir la source

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.

diva il y a 15 ans
Parent
commit
3a6b27befb

+ 1 - 1
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;
             }
 

+ 1 - 1
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);

+ 1 - 1
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);