aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-04-01 22:45:01 +0100
committerJustin Clark-Casey (justincc)2010-04-01 22:45:01 +0100
commit938905df1e04ca5ff2f09bb29b955ba7386daea4 (patch)
treeb514015775aade222cd9c1fe32009aaee0bae508 /OpenSim/Region/OptionalModules/Avatar
parentexpose methods that allow region modules to send messages to groups (diff)
downloadopensim-SC_OLD-938905df1e04ca5ff2f09bb29b955ba7386daea4.zip
opensim-SC_OLD-938905df1e04ca5ff2f09bb29b955ba7386daea4.tar.gz
opensim-SC_OLD-938905df1e04ca5ff2f09bb29b955ba7386daea4.tar.bz2
opensim-SC_OLD-938905df1e04ca5ff2f09bb29b955ba7386daea4.tar.xz
oops, add file missing from last commit
refactor out redundant method from GroupsMessagingModule
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs16
1 files changed, 7 insertions, 9 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
index e0840b1..533815f 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
@@ -203,16 +203,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
203 GroupRecord groupInfo = m_groupsModule.GetGroupRecord(groupID); 203 GroupRecord groupInfo = m_groupsModule.GetGroupRecord(groupID);
204 204
205 if (groupInfo != null) 205 if (groupInfo != null)
206 return StartGroupChatSession(agentID.Guid, groupInfo); 206 {
207 AddAgentToGroupSession(agentID.Guid, groupID.Guid);
208 return true;
209 }
207 else 210 else
211 {
208 return false; 212 return false;
209 } 213 }
210
211 protected bool StartGroupChatSession(Guid agentID, GroupRecord groupInfo)
212 {
213 AddAgentToGroupSession(agentID, groupInfo.GroupID.Guid);
214
215 return true;
216 } 214 }
217 215
218 public void SendMessageToGroup(GridInstantMessage im, UUID groupID) 216 public void SendMessageToGroup(GridInstantMessage im, UUID groupID)
@@ -455,7 +453,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
455 453
456 if (groupInfo != null) 454 if (groupInfo != null)
457 { 455 {
458 StartGroupChatSession(im.fromAgentID, groupInfo); 456 AddAgentToGroupSession(im.fromAgentID, groupInfo.GroupID.Guid);
459 457
460 ChatterBoxSessionStartReplyViaCaps(remoteClient, groupInfo.GroupName, groupID); 458 ChatterBoxSessionStartReplyViaCaps(remoteClient, groupInfo.GroupName, groupID);
461 459