diff options
author | Oren Hurvitz | 2014-06-29 11:26:34 +0300 |
---|---|---|
committer | Justin Clark-Casey | 2014-08-02 00:56:23 +0100 |
commit | ae53c6b834b272cf4602a567f9417180562f67b8 (patch) | |
tree | 4decb57bec6406daabd98d6e74837181bb0fa190 /OpenSim/Addons/Groups/GroupsMessagingModule.cs | |
parent | Added "debug packet --all" option, which changes the packet logging level for... (diff) | |
download | opensim-SC_OLD-ae53c6b834b272cf4602a567f9417180562f67b8.zip opensim-SC_OLD-ae53c6b834b272cf4602a567f9417180562f67b8.tar.gz opensim-SC_OLD-ae53c6b834b272cf4602a567f9417180562f67b8.tar.bz2 opensim-SC_OLD-ae53c6b834b272cf4602a567f9417180562f67b8.tar.xz |
Include the group name in group IM's
When sending an ImprovedInstantMessage to a group, the IM's binary bucket is supposed to contain the group's name (this is what SL does). Singularity uses this to show the group name when it shows the message at the bottom of the viewer for a few seconds: "[Group Name] From User: Message". Before this update, the group name was empty ("[]").
This update doesn't have any visible effect in Firestorm, because it doesn't use the group name sent in the IM.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Addons/Groups/GroupsMessagingModule.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs index e6a4765..e95db41 100644 --- a/OpenSim/Addons/Groups/GroupsMessagingModule.cs +++ b/OpenSim/Addons/Groups/GroupsMessagingModule.cs | |||
@@ -325,6 +325,13 @@ namespace OpenSim.Groups | |||
325 | im.RegionID = thisClient.Scene.RegionInfo.RegionID.Guid; | 325 | im.RegionID = thisClient.Scene.RegionInfo.RegionID.Guid; |
326 | } | 326 | } |
327 | 327 | ||
328 | if ((im.binaryBucket == null) || (im.binaryBucket.Length == 0) || ((im.binaryBucket.Length == 1 && im.binaryBucket[0] == 0))) | ||
329 | { | ||
330 | ExtendedGroupRecord groupInfo = m_groupData.GetGroupRecord(UUID.Zero.ToString(), groupID, null); | ||
331 | if (groupInfo != null) | ||
332 | im.binaryBucket = Util.StringToBytes256(groupInfo.GroupName); | ||
333 | } | ||
334 | |||
328 | // Send to self first of all | 335 | // Send to self first of all |
329 | im.toAgentID = im.fromAgentID; | 336 | im.toAgentID = im.fromAgentID; |
330 | im.fromGroup = true; | 337 | im.fromGroup = true; |