17 files changed, 95 insertions, 16 deletions
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 6cf7ffb..797e997 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -59,6 +59,7 @@
 #include "llfloateractivespeakers.h"
 #include "llfloateravatarinfo.h"
 #include "llfloaterchat.h"
+#include "llfloaterfriends.h"
 #include "llkeyboard.h"
 #include "lllineeditor.h"
 #include "llmenucommands.h"
@@ -1133,7 +1134,8 @@ LLFloaterIMPanel::LLFloaterIMPanel(
        mSpeakers(NULL),
        mSpeakerPanel(NULL),
        mFirstKeystrokeTimer(),
-        mLastKeystrokeTimer()
+        mLastKeystrokeTimer(),
+        mIMPanelType(IM_PANEL_PLAIN)
 {
        mSessionInitialTargetIDs = ids;
        init(session_label);
@@ -1151,27 +1153,32 @@ void LLFloaterIMPanel::init(const std::string& session_label)
                mFactoryMap["active_speakers_panel"] = LLCallbackMap(createSpeakersPanel, this);
                xml_filename = "floater_instant_message_group.xml";
                mVoiceChannel = new LLVoiceChannelGroup(mSessionUUID, mSessionLabel);
+                mIMPanelType = IM_PANEL_GROUP;
                break;
        case IM_SESSION_INVITE:
                mFactoryMap["active_speakers_panel"] = LLCallbackMap(createSpeakersPanel, this);
                if (gAgent.isInGroup(mSessionUUID))
                {
                        xml_filename = "floater_instant_message_group.xml";
+                        mIMPanelType = IM_PANEL_GROUP;
                }
                else // must be invite to ad hoc IM
                {
                        xml_filename = "floater_instant_message_ad_hoc.xml";
+                        mIMPanelType = IM_PANEL_CONFERENCE;
                }
                mVoiceChannel = new LLVoiceChannelGroup(mSessionUUID, mSessionLabel);
                break;
        case IM_SESSION_P2P_INVITE:
                xml_filename = "floater_instant_message.xml";
                mVoiceChannel = new LLVoiceChannelP2P(mSessionUUID, mSessionLabel, mOtherParticipantUUID);
+                mIMPanelType = IM_PANEL_PLAIN;
                break;
        case IM_SESSION_CONFERENCE_START:
                mFactoryMap["active_speakers_panel"] = LLCallbackMap(createSpeakersPanel, this);
                xml_filename = "floater_instant_message_ad_hoc.xml";
                mVoiceChannel = new LLVoiceChannelGroup(mSessionUUID, mSessionLabel);
+                mIMPanelType = IM_PANEL_CONFERENCE;
                break;
        // just received text from another user
        case IM_NOTHING_SPECIAL:
@@ -1183,10 +1190,12 @@ void LLFloaterIMPanel::init(const std::string& session_label)
                mCallBackEnabled = LLVoiceClient::getInstance()->isSessionCallBackPossible(mSessionUUID);
                
                mVoiceChannel = new LLVoiceChannelP2P(mSessionUUID, mSessionLabel, mOtherParticipantUUID);
+                mIMPanelType = IM_PANEL_PLAIN;
                break;
        default:
                llwarns << "Unknown session type" << llendl;
                xml_filename = "floater_instant_message.xml";
+                mIMPanelType = IM_PANEL_PLAIN;
                break;
        }
@@ -1296,6 +1305,14 @@ BOOL LLFloaterIMPanel::postBuild()
                // Profile combobox in floater_instant_message.xml
                childSetCommitCallback("profile_callee_btn", onCommitCombo, this);
+                LLComboBox* comboBox = getChild<LLComboBox>("profile_callee_btn");
+                if (LLAvatarTracker::instance().getBuddyInfo(mOtherParticipantUUID) == NULL)
+                {
+                        comboBox->add(getString("add_friend_string"), ADD_TOP);
+                }
+                comboBox->setCommitCallback(onCommitCombo);
+                comboBox->setCallbackUserData(this);
                childSetCommitCallback("group_info_btn", onCommitCombo, this);
                childSetAction("start_call_btn", onClickStartCall, this);
@@ -1875,27 +1892,32 @@ void LLFloaterIMPanel::onCommitCombo(LLUICtrl* caller, void* userdata)
                                }
                        }
                }
-                else if (caller->getValue().asString() == "pay_entry")
+                // profile
-                {
+                else if (self->getIMType() == IM_PANEL_PLAIN)
-                        handle_pay_by_id(self->getOtherParticipantID());
-                }
-                else if (caller->getValue().asString() == "teleport_entry")
-                {
-                        handle_lure(self->getOtherParticipantID());
-                }
-                else
                {
-                        // group
+                        if (caller->getValue().asString() == "pay_entry")
-                        if (self->getOtherParticipantID() == self->getSessionID())
                        {
-                                LLFloaterGroupInfo::showFromUUID(self->getSessionID());
+                                handle_pay_by_id(self->getOtherParticipantID());
                        }
-                        // profile
+                        else if (caller->getValue().asString() == "teleport_entry")
-                        else 
+                        {
+                                handle_lure(self->getOtherParticipantID());
+                        }
+                        else if (caller->getValue().asString() == self->getString("add_friend_string"))
+                        {
+                                std::string fullname = self->getTitle();
+                                LLPanelFriends::requestFriendshipDialog(self->getOtherParticipantID(), fullname);
+                        }
+                        else
                        {
                                LLFloaterAvatarInfo::showFromDirectory(self->getOtherParticipantID());
                        }
                }
+                // group
+                else if (self->getIMType() == IM_PANEL_GROUP)
+                {
+                        LLFloaterGroupInfo::showFromUUID(self->getSessionID());
+                }
        }
 }
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h
index 5887095..ddcbdc7 100644
--- a/linden/indra/newview/llimpanel.h
+++ b/linden/indra/newview/llimpanel.h
@@ -364,6 +364,18 @@ private:
        typedef std::map<LLUUID, LLStyleSP> styleMap;
        static styleMap mStyleMap;
+        typedef enum e_im_format
+        {
+                IM_PANEL_PLAIN,
+                IM_PANEL_GROUP,
+                IM_PANEL_CONFERENCE
+        } EIMPanelType;
+        EIMPanelType mIMPanelType;
+public:
+        EIMPanelType getIMType() { return mIMPanelType; }
 };
diff --git a/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml
index 9b695b5..27dbdcb 100644
--- a/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                Tekst chat er ikke tilgængeligt i dette opkald.
        </string>
+        <string name="add_friend_string">
+                Tilføj ven
+        </string>
        <flyout_button label="Profil..." name="profile_callee_btn"/>
        <button label="Opkald" name="start_call_btn" pad_right="7" width="120"/>
        <button halign="right" label="Afbryd" name="end_call_btn" width="120"/>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
index 1e926c4..ea822e4 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                Für diese Verbindung ist kein Text-Chat verfügbar.
        </string>
+        <string name="add_friend_string">
+                Freund hinzufügen
+        </string>
        <flyout_button label="Profil..." name="profile_callee_btn"/>
        <button label="Anrufen" name="start_call_btn" pad_right="7" width="115"/>
        <button halign="right" label="Anruf beenden" name="end_call_btn" width="115"/>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index cf2a457..5e81525 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -37,6 +37,9 @@
        <string name="unavailable_text_label">
                Text chat is not available for this call.
        </string>
+  <string name="add_friend_string">
+    Add Friend
+  </string>
  <flyout_button bottom="-40" follows="left|top" height="20" label="Profile" left="5" width="90"
       list_position="below" mouse_opaque="true" name="profile_callee_btn">
    <flyout_button_item value="history_entry" name="history_entry">
diff --git a/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
index 30b23d1..68ed9c6 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                Para esta llamada no está disponible el chat de texto.
        </string>
+        <string name="add_friend_string">
+                Añadir como amigo
+        </string>
        <flyout_button label="Perfil..." name="profile_callee_btn"/>
        <button label="Llamar" name="start_call_btn"/>
        <button label="Colgar" name="end_call_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
index 926483b..89b6cb2 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                Le chat écrit n&apos;est pas disponible pour cet appel.
        </string>
+        <string name="add_friend_string">
+                Devenir amis
+        </string>
        <flyout_button label="Profil..." name="profile_callee_btn"/>
        <button label="Appeler" name="start_call_btn"/>
        <button label="Raccrocher" name="end_call_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
index 3469323..09c7af6 100644
--- a/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                Szöveges üzenetküldés nem elérhető a jelenlegi hívás alatt.
        </string>
+        <string name="add_friend_string">
+                Barátokhoz ad
+        </string>
        <flyout_button label="Adatlap" name="profile_callee_btn"/>
        <button label="Hívás" name="start_call_btn"/>
        <button label="Hívás vége" name="end_call_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml
index 7bdc046..511dac5 100644
--- a/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                La chat di testo non è disponibile in questa chiamata.
        </string>
+        <string name="add_friend_string">
+                Aggiungi come amico
+        </string>
        <flyout_button label="Profilo..." name="profile_callee_btn"/>
        <button label="Chiama" name="start_call_btn"/>
        <button label="Termina" name="end_call_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
index c9de54e..8bba7e3 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                このコールでは文字チャットが利用できません。
        </string>
+        <string name="add_friend_string">
+                フレンドに追加
+        </string>
        <flyout_button label="プロフィール" name="profile_callee_btn" width="100"/>
        <button label="コール" left_delta="105" name="start_call_btn" width="100"/>
        <button label="呼出終了" name="end_call_btn" width="100"/>
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
index f1d0a48..68284be 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
@@ -21,6 +21,9 @@
        <string name="default_text_label">
                메신저를 사용하려면 여기를 클릭하십시오.
        </string>
+        <string name="add_friend_string">
+                친구 추가
+        </string>
        <flyout_button label="프로필" name="profile_callee_btn" />
        <button label="음성연결" name="start_call_btn" />
        <button label="연결종료" name="end_call_btn" />
diff --git a/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml
index 1d918b8..40b7c6e 100755
--- a/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml
@@ -24,6 +24,9 @@
        <string name="typing_start_string">
                [NAME] pisze...
        </string>
+        <string name="add_friend_string">
+                Dodaj Znajomość
+        </string>
        <string name="session_start_string">
                Rozpoczęcie rozmowy z [NAME]. Proszę czekać...
        </string>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
index 983a13c..dc69246 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                Conversa por texto não está disponível para esta chamada.
        </string>
+        <string name="add_friend_string">
+                Adicionar amigo
+        </string>
        <flyout_button label="Perfil..." name="profile_callee_btn"/>
        <button label="Chamar" name="start_call_btn"/>
        <button label="Terminar Chamada" name="end_call_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml
index 7aa1c19..f0379e1 100644
--- a/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                Текстовый чат недоступен для этого вызова.
        </string>
+        <string name="add_friend_string">
+                Добавить Друга
+        </string>
        <flyout_button label="Профиль..." name="profile_callee_btn"/>
        <button label="Звонок" name="start_call_btn"/>
        <button label="Конец звонка" name="end_call_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml
index b627271..3fcb891 100644
--- a/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                Bu arama için yazılı sohbet mevcut değil.
        </string>
+        <string name="add_friend_string">
+                Arkadaş ol
+        </string>
        <flyout_button label="Profil..." name="profile_callee_btn"/>
        <button label="Ara" name="start_call_btn"/>
        <button label="Kapat" name="end_call_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml
index 60ac3b8..a017d38 100644
--- a/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                Текстовий чат недоступний для цього виклику.
        </string>
+        <string name="add_friend_string">
+                Додати Друга
+        </string>
        <flyout_button label="Профіль..." name="profile_callee_btn"/>
        <button label="Дзвінок" name="start_call_btn"/>
        <button label="Кінець дзвінка" name="end_call_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
index ace6d8c..a59000c 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
@@ -30,7 +30,10 @@
        <string name="unavailable_text_label">
                本次通话不可以文字聊天。
        </string>
-  <flyout_button label="档案..." name="profile_callee_btn"/>
+        <string name="add_friend_string">
+                添加为好友
+        </string>
+        <flyout_button label="档案..." name="profile_callee_btn"/>
        <button label="呼叫" name="start_call_btn"/>
        <button label="结束呼叫" name="end_call_btn" pad_right="10" visible="false"/>
        <panel name="speaker_controls">