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.

author: diva 2008-12-29 22:44:04 +0000
committer: diva 2008-12-29 22:44:04 +0000
commit: 3a6b27befbc6119929b7e5dc67456195720c3093 (patch)
tree: 489def867dae8cdc7da5014953aec72ed79bea37 /OpenSim/Region/Environment/Modules
parent: Final part for implementing SendChildAgentDataUpdate with modules. This is th... (diff)
download: opensim-SC_OLD-3a6b27befbc6119929b7e5dc67456195720c3093.zip
opensim-SC_OLD-3a6b27befbc6119929b7e5dc67456195720c3093.tar.gz
opensim-SC_OLD-3a6b27befbc6119929b7e5dc67456195720c3093.tar.bz2
opensim-SC_OLD-3a6b27befbc6119929b7e5dc67456195720c3093.tar.xz
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);
author	diva	2008-12-29 22:44:04 +0000
committer	diva	2008-12-29 22:44:04 +0000
commit	3a6b27befbc6119929b7e5dc67456195720c3093 (patch)
tree	489def867dae8cdc7da5014953aec72ed79bea37 /OpenSim/Region/Environment/Modules
parent	Final part for implementing SendChildAgentDataUpdate with modules. This is th... (diff)
download	opensim-SC_OLD-3a6b27befbc6119929b7e5dc67456195720c3093.zip opensim-SC_OLD-3a6b27befbc6119929b7e5dc67456195720c3093.tar.gz opensim-SC_OLD-3a6b27befbc6119929b7e5dc67456195720c3093.tar.bz2 opensim-SC_OLD-3a6b27befbc6119929b7e5dc67456195720c3093.tar.xz

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
65	IConfig startupConfig = config.Configs["Communications"];	65	IConfig startupConfig = config.Configs["Communications"];
66		66
67	if ((startupConfig == null) \|\|	67	if ((startupConfig == null) \|\|
68	(startupConfig != null) && (startupConfig.GetString("InterregionComms", "LocalComms") == "LocalComms"))	68	(startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "LocalComms"))
69	m_enabled = true;	69	m_enabled = true;
70	}	70	}
71		71


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
53	{	53	{
54	initialized = true;	54	initialized = true;
55	IConfig startupConfig = config.Configs["Communications"];	55	IConfig startupConfig = config.Configs["Communications"];
56	if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "LocalComms") == "HGRESTComms"))	56	if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "HGRESTComms"))
57	{	57	{
58	m_enabled = true;	58	m_enabled = true;
59	InitOnce(scene);	59	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
68	{	68	{
69	initialized = true;	69	initialized = true;
70	IConfig startupConfig = config.Configs["Communications"];	70	IConfig startupConfig = config.Configs["Communications"];
71	if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "LocalComms") == "RESTComms"))	71	if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "RESTComms"))
72	{	72	{
73	m_enabled = true;	73	m_enabled = true;
74	InitOnce(scene);	74	InitOnce(scene);