4 files changed, 48 insertions, 105 deletions

diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index be6df5b..6cf7ffb 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1082,7 +1082,6 @@ LLFloaterIMPanel::LLFloaterIMPanel(
         LLFloater(session_label, LLRect(), session_label),
         mInputEditor(NULL),
         mHistoryEditor(NULL),
-        mComboIM(NULL),
         mSessionUUID(session_id),
         mVoiceChannel(NULL),
         mSessionInitialized(FALSE),
@@ -1283,10 +1282,6 @@ BOOL LLFloaterIMPanel::postBuild()
         requires<LLLineEditor>("chat_editor");
         requires<LLTextEditor>("im_history");
 
-#if LL_LINUX || LL_DARWIN
-        childSetVisible("history_btn", false);
-#endif
-
         if (checkRequirements())
         {
                 mInputEditor = getChild<LLLineEditor>("chat_editor");
@@ -1300,18 +1295,8 @@ BOOL LLFloaterIMPanel::postBuild()
                 mInputEditor->setReplaceNewlinesWithSpaces( FALSE );
 
                 // Profile combobox in floater_instant_message.xml
-                mComboIM = getChild<LLComboBox>("profile_callee_btn");
-                mComboIM->setCommitCallback(onCommitCombo);
-                mComboIM->setCallbackUserData(this);
-
-#ifdef LL_WINDOWS
-                mComboIM->add(getString("history_entry"));
-#endif
-                mComboIM->add(getString("pay_entry"));
-                mComboIM->add(getString("teleport_entry"));
-
-                childSetAction("group_info_btn", onClickGroupInfo, this);
-                childSetAction("history_btn", onClickHistory, this);
+                childSetCommitCallback("profile_callee_btn", onCommitCombo, this);
+                childSetCommitCallback("group_info_btn", onCommitCombo, this);
 
                 childSetAction("start_call_btn", onClickStartCall, this);
                 childSetAction("end_call_btn", onClickEndCall, this);
@@ -1804,41 +1789,6 @@ void LLFloaterIMPanel::onTabClick(void* userdata)
 }
 
 // static
-void LLFloaterIMPanel::onClickHistory( void* userdata )
-{
-        LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
-        
-        if (self->mOtherParticipantUUID.notNull())
-        {
-                struct stat fileInfo;
-                int result;
-                
-                std::string fullname = self->getTitle();;
-                //gCacheName->getFullName(self->mOtherParticipantUUID, fullname);
-                //if(fullname == "(Loading...)")
-                std::string file_path = gDirUtilp->getPerAccountChatLogsDir() + "\\" + fullname + ".txt";
-
-                // check if file exists by trying to get its attributes
-                result = stat(file_path.c_str(), &fileInfo);
-                if(result == 0)
-                {
-                        char command[256];
-                        sprintf(command, "\"%s\\%s.txt\"", gDirUtilp->getPerAccountChatLogsDir().c_str(),fullname.c_str());
-                        gViewerWindow->getWindow()->ShellEx(command);
-
-                        llinfos << command << llendl;
-                }
-                else
-                {
-                        LLSD args;
-                        args["[NAME]"] = fullname;
-                        LLNotifications::instance().add("IMLogNotFound", args);
-                        llinfos << file_path << llendl;
-                }
-        }
-}
-
-// static
 void LLFloaterIMPanel::onClickGroupInfo( void* userdata )
 {
         //  Bring up the Profile window
@@ -1899,59 +1849,52 @@ void LLFloaterIMPanel::onCommitChat(LLUICtrl* caller, void* userdata)
 void LLFloaterIMPanel::onCommitCombo(LLUICtrl* caller, void* userdata)
 {
         LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
-        LLCtrlListInterface* options = self->mComboIM ? self->mComboIM->getListInterface() : NULL;
-        if (options)
+        if (self->getOtherParticipantID().notNull())
         {
-                S32 index = options->getFirstSelectedIndex();
-                if (index < 0)
+                if (caller->getValue().asString() == "history_entry")
                 {
-                        // Open profile or group window
-                        if (self->mOtherParticipantUUID.notNull())
+                        if (self->getOtherParticipantID().notNull())
                         {
-                                LLFloaterAvatarInfo::showFromDirectory(self->getOtherParticipantID());
-                        }
-                        return;
-                }
-
-                std::string selected = self->mComboIM->getSelectedValue().asString();
-                if (selected == self->getString("history_entry"))
-                {
-                        if (self->mOtherParticipantUUID.notNull())
-                        {
-                                struct stat fileInfo;
-                                int result;
-                                
-                                std::string fullname = self->getTitle();;
+                                std::string fullname = self->getTitle();
                                 //gCacheName->getFullName(self->mOtherParticipantUUID, fullname);
                                 //if(fullname == "(Loading...)")
-                                std::string file_path = gDirUtilp->getPerAccountChatLogsDir() + "\\" + fullname + ".txt";
+                                std::string file = gDirUtilp->getPerAccountChatLogsDir() + "\\" + fullname + ".txt";
 
-                                // check if file exists by trying to get its attributes
-                                result = stat(file_path.c_str(), &fileInfo);
-                                if(result == 0)
+                                llstat stat_info;
+                                if (LLFile::stat(file.c_str(), &stat_info)) 
                                 {
-                                        char command[256];
-                                        sprintf(command, "\"%s\\%s.txt\"", gDirUtilp->getPerAccountChatLogsDir().c_str(),fullname.c_str());
-                                        gViewerWindow->getWindow()->ShellEx(command);
-
-                                        llinfos << command << llendl;
+                                        LLSD args;
+                                        args["[NAME]"] = fullname;
+                                        LLNotifications::instance().add("IMLogNotFound", args, LLSD());
+                                        //llinfos << file << " not found" << llendl;
                                 }
                                 else
                                 {
-                                        LLSD args;
-                                        args["[NAME]"] = fullname;
-                                        LLNotifications::instance().add("IMLogNotFound", args);
-                                        llinfos << file_path << llendl;
+                                        gViewerWindow->getWindow()->ShellEx(file);
+                                        //llinfos << file << " found" << llendl;
                                 }
                         }
                 }
-                else if (selected == self->getString("pay_entry"))
+                else if (caller->getValue().asString() == "pay_entry")
                 {
-                        handle_pay_by_id(self->mOtherParticipantUUID);
+                        handle_pay_by_id(self->getOtherParticipantID());
                 }
-                else if (selected == self->getString("teleport_entry"))
+                else if (caller->getValue().asString() == "teleport_entry")
                 {
-                        handle_lure(self->mOtherParticipantUUID);
+                        handle_lure(self->getOtherParticipantID());
+                }
+                else
+                {
+                        // group
+                        if (self->getOtherParticipantID() == self->getSessionID())
+                        {
+                                LLFloaterGroupInfo::showFromUUID(self->getSessionID());
+                        }
+                        // profile
+                        else 
+                        {
+                                LLFloaterAvatarInfo::showFromDirectory(self->getOtherParticipantID());
+                        }
                 }
         }
 }
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h
index 24f5c9b..5887095 100644
--- a/linden/indra/newview/llimpanel.h
+++ b/linden/indra/newview/llimpanel.h
@@ -232,7 +232,6 @@ public:
         static void             onCommitCombo(LLUICtrl* caller, void* userdata);
         static void             onTabClick( void* userdata );
 
-        static void             onClickHistory( void* userdata );
         static void             onClickGroupInfo( void* userdata );
         static void             onClickClose( void* userdata );
         static void             onClickStartCall( void* userdata );
@@ -300,7 +299,6 @@ private:
 private:
         LLLineEditor* mInputEditor;
         LLViewerTextEditor* mHistoryEditor;
-        LLComboBox* mComboIM;
 
         // The value of the mSessionUUID depends on how the IM session was started:
         //   one-on-one  ==> random id
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 98d2020..cf2a457 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,17 +37,17 @@
         <string name="unavailable_text_label">
                 Text chat is not available for this call.
         </string>
-  <string name="history_entry">
-    History
-  </string>
-  <string name="pay_entry">
-    Pay
-  </string>
-  <string name="teleport_entry">
-    Offer Teleport
-  </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">
+      View History
+    </flyout_button_item>
+    <flyout_button_item value="pay_entry" name="pay_entry">
+      Pay
+    </flyout_button_item>
+    <flyout_button_item value="teleport_entry" name="teleport_entry">
+     Offer Teleport
+    </flyout_button_item>
   </flyout_button>
         <button bottom="-40" follows="left|top" halign="center" height="20"
              image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index 1266975..4c9ba2a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -44,18 +44,20 @@
              orientation="horizontal" tab_group="1" width="495" name="panels">
                 <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"
                      height="130" left="0" min_width="210" name="im_contents_panel" width="175">
-                        <button bottom="-20" follows="left|top" height="20" label="Group Info" left="5"
-                             name="group_info_btn" tab_group="0" width="90" />
+                        <flyout_button bottom="-20" follows="left|top" height="20" label="Group Info" left="5"
+                             list_position="below" name="group_info_btn" tab_group="0" width="110">
+        <flyout_button_item value="history_entry" name="history_entry">
+          View History
+        </flyout_button_item>
+      </flyout_button>
                         <button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"
                              image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-                             label="Join Call" left_delta="95" name="start_call_btn" pad_right="12"
+                             label="Join Call" left_delta="115" name="start_call_btn" pad_right="12"
                              width="92" />
                         <button bottom_delta="0" follows="left|top" halign="right" height="20"
                              image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
                              label="End Call" left_delta="0" name="end_call_btn" pad_right="12"
                              visible="false" width="92" />
-      <button bottom="-20" follows="left|top" halign="center" height="20" label="History" left_delta="97"
-              name="history_btn" visible="true" width="85" />
                         <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
                              label_selected="&gt; &gt;" left="143" name="toggle_active_speakers_btn"
                              right="176"