Ported use group name in chat feature from Emerald

2 files changed, 22 insertions, 1 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 333a780..667f0ad 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -772,6 +772,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>ShowGroupNameInChatIM</key>
+  <map>
+    <key>Comment</key>
+    <string>Show the group name when receiving group IMs</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>ShowMiniMapRadar</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 56aed12..ec6d4d4 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -2313,7 +2313,17 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         position,
                         true);
 
-                chat.mText = std::string("IM: ") + name + separator_string +  saved + message.substr(message_offset);
+                std::string group_name;
+                if (gAgent.isInGroup(session_id) && gSavedSettings.getBOOL("ShowGroupNameInChatIM"))
+                {
+                        group_name = std::string((char*)binary_bucket);
+                        chat.mText = std::string("[") + group_name + std::string("] ") + name 
+                                                + separator_string + saved + message.substr(message_offset);
+                }
+                else
+                {
+                        chat.mText = std::string("IM: ") + name + separator_string +  saved + message.substr(message_offset);
+                }
                 LLFloaterChat::addChat(chat, TRUE, is_this_agent);
         }
         break;