diff options
author | Justin Clark-Casey (justincc) | 2010-12-14 23:36:34 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-12-14 23:36:34 +0000 |
commit | 81bccd6d132956e2de9e5ad473f87931df76cde8 (patch) | |
tree | cbad88a1bad4b95dd91ad4d02b6762504e17ed2e /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |
parent | Add mock group services connector and use this in tests (diff) | |
download | opensim-SC_OLD-81bccd6d132956e2de9e5ad473f87931df76cde8.zip opensim-SC_OLD-81bccd6d132956e2de9e5ad473f87931df76cde8.tar.gz opensim-SC_OLD-81bccd6d132956e2de9e5ad473f87931df76cde8.tar.bz2 opensim-SC_OLD-81bccd6d132956e2de9e5ad473f87931df76cde8.tar.xz |
Start implementing a test for 'share with group' object functionality. Not yet complete.
While implementing this, a bug was fixed in scene setup helpers where module RegionLoaded() was called immediately after AddRegion() instead of waiting for all AddRegions() to complete.
Also, XmlRpcGroupsModule non-message functionality will now work without a message transfer module (as indicated in the comments but with a contradictory implementation)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index ccf5289..4aab87f 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
@@ -163,9 +163,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
163 | if (m_msgTransferModule == null) | 163 | if (m_msgTransferModule == null) |
164 | { | 164 | { |
165 | m_groupsEnabled = false; | 165 | m_groupsEnabled = false; |
166 | m_log.Error("[GROUPS]: Could not get MessageTransferModule"); | 166 | m_log.Warn("[GROUPS]: Could not get MessageTransferModule"); |
167 | Close(); | ||
168 | return; | ||
169 | } | 167 | } |
170 | } | 168 | } |
171 | 169 | ||
@@ -1299,7 +1297,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1299 | if (m_debugEnabled) m_log.InfoFormat("[GROUPS]: MsgTo ({0}) is local, delivering directly", localClient.Name); | 1297 | if (m_debugEnabled) m_log.InfoFormat("[GROUPS]: MsgTo ({0}) is local, delivering directly", localClient.Name); |
1300 | localClient.SendInstantMessage(msg); | 1298 | localClient.SendInstantMessage(msg); |
1301 | } | 1299 | } |
1302 | else | 1300 | else if (m_msgTransferModule != null) |
1303 | { | 1301 | { |
1304 | if (m_debugEnabled) m_log.InfoFormat("[GROUPS]: MsgTo ({0}) is not local, delivering via TransferModule", msgTo); | 1302 | if (m_debugEnabled) m_log.InfoFormat("[GROUPS]: MsgTo ({0}) is not local, delivering via TransferModule", msgTo); |
1305 | m_msgTransferModule.SendInstantMessage(msg, delegate(bool success) { if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: Message Sent: {0}", success?"Succeeded":"Failed"); }); | 1303 | m_msgTransferModule.SendInstantMessage(msg, delegate(bool success) { if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: Message Sent: {0}", success?"Succeeded":"Failed"); }); |