diff options
| author | Master ScienceSim | 2010-10-28 09:09:42 -0700 |
|---|---|---|
| committer | Master ScienceSim | 2010-10-28 09:09:42 -0700 |
| commit | f2c1d0e34feba801ff85c35ee049ed6d3067bb0d (patch) | |
| tree | ff692ecc0db2b9cdf4cacd5a42234a5bb58ddd34 /OpenSim/Region/OptionalModules/Avatar | |
| parent | Added background thread to handle delayed send and save of appearance (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-f2c1d0e34feba801ff85c35ee049ed6d3067bb0d.zip opensim-SC_OLD-f2c1d0e34feba801ff85c35ee049ed6d3067bb0d.tar.gz opensim-SC_OLD-f2c1d0e34feba801ff85c35ee049ed6d3067bb0d.tar.bz2 opensim-SC_OLD-f2c1d0e34feba801ff85c35ee049ed6d3067bb0d.tar.xz | |
Merge branch 'opensim-master' into dev-appearance
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs index 25dba7f..3d34441 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs | |||
| @@ -220,7 +220,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
| 220 | groupID, groupMembers.Count); | 220 | groupID, groupMembers.Count); |
| 221 | 221 | ||
| 222 | foreach (GroupMembersData member in groupMembers) | 222 | foreach (GroupMembersData member in groupMembers) |
| 223 | { | 223 | { |
| 224 | if (m_groupData.hasAgentDroppedGroupChatSession(member.AgentID, groupID)) | 224 | if (m_groupData.hasAgentDroppedGroupChatSession(member.AgentID, groupID)) |
| 225 | { | 225 | { |
| 226 | // Don't deliver messages to people who have dropped this session | 226 | // Don't deliver messages to people who have dropped this session |
| @@ -266,7 +266,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
| 266 | 266 | ||
| 267 | void OnClientLogin(IClientAPI client) | 267 | void OnClientLogin(IClientAPI client) |
| 268 | { | 268 | { |
| 269 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: OnInstantMessage registered for {0}", client.Name); | 269 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING]: OnInstantMessage registered for {0}", client.Name); |
| 270 | } | 270 | } |
| 271 | 271 | ||
| 272 | private void OnNewClient(IClientAPI client) | 272 | private void OnNewClient(IClientAPI client) |