From 52b9f421ac5f2377148902a45b572d07f55bfc0d Mon Sep 17 00:00:00 2001 From: ziree Date: Mon, 23 May 2011 21:37:38 +0200 Subject: [PATCH 1/7] Fixed (i) button only coming up on one-on-one chats. Fixes FIRE-1114 --- indra/newview/llimfloater.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 524ebeda6b..b05b204017 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -633,6 +633,10 @@ BOOL LLIMFloater::postBuild() LLButton* add_friend = getChild("add_friend_btn"); add_friend->setClickedCallback(boost::bind(&LLIMFloater::onAddFriendButtonClicked, this)); + // support sysinfo button -Zi + mSysinfoButton=getChild("send_sysinfo_btn"); + onSysinfoButtonVisibilityChanged(FALSE); + // extra icon controls -AO LLButton* transl = getChild("translate_btn"); //TT @@ -671,7 +675,6 @@ BOOL LLIMFloater::postBuild() } // support sysinfo button -Zi - mSysinfoButton=getChild("send_sysinfo_btn"); mSysinfoButton->setClickedCallback(boost::bind(&LLIMFloater::onSysinfoButtonClicked, this)); // this needs to be extended to fsdata awareness, once we have it. -Zi // mIsSupportIM=fsdata(partnerUUID).isSupport(); // pseudocode something like this From b466cdbee3d57692b24890313f60de5ef86d6cf8 Mon Sep 17 00:00:00 2001 From: ziree Date: Tue, 24 May 2011 21:14:50 +0200 Subject: [PATCH 2/7] Proposed fix for FIRE-1091 - There was an error with IM windows getting torn off instead of the contacts floater due to a naming mix-up. --- indra/newview/fscontactsfloater.cpp | 15 +++++++++++++++ indra/newview/llimfloater.cpp | 13 +------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/indra/newview/fscontactsfloater.cpp b/indra/newview/fscontactsfloater.cpp index c5533d85bd..203de49493 100644 --- a/indra/newview/fscontactsfloater.cpp +++ b/indra/newview/fscontactsfloater.cpp @@ -44,8 +44,10 @@ #include "llfriendcard.h" #include "llgroupactions.h" #include "llgrouplist.h" +#include "llimfloatercontainer.h" #include "llsidetray.h" #include "llstartup.h" +#include "llviewercontrol.h" static const std::string FRIENDS_TAB_NAME = "friends_panel"; static const std::string GROUP_TAB_NAME = "groups_panel"; @@ -153,6 +155,19 @@ void FSFloaterContacts::updateButtons() void FSFloaterContacts::onOpen(const LLSD& key) { + if (gSavedSettings.getBOOL("ContactsTornOff")) + { + LLIMFloaterContainer* floater_container = LLIMFloaterContainer::getInstance(); + // first set the tear-off host to the conversations container + setHost(floater_container); + // clear the tear-off host right after, the "last host used" will still stick + setHost(NULL); + // reparent to floater view + gFloaterView->addChild(this); + // and remember we are torn off + setTornOff(TRUE); + } + if (key.asString() == "friends") { childShowTab("friends_and_groups", "friends_panel"); diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index b05b204017..d1b9773245 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -899,19 +899,8 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id) { LLIMFloaterContainer* floater_container = LLIMFloaterContainer::getInstance(); - if (gSavedSettings.getBOOL("ContactsTornOff")) - { - // first set the tear-off host to the conversations container - floater->setHost(floater_container); - // clear the tear-off host right after, the "last host used" will still stick - floater->setHost(NULL); - // reparent to floater view - gFloaterView->addChild(floater); - // and remember we are torn off - floater->setTornOff(TRUE); - } // do not add existed floaters to avoid adding torn off instances - else if (!exist) + if (!exist) { // LLTabContainer::eInsertionPoint i_pt = user_initiated ? LLTabContainer::RIGHT_OF_CURRENT : LLTabContainer::END; // TODO: mantipov: use LLTabContainer::RIGHT_OF_CURRENT if it exists From 756ac43a5f84389d82d09157c00d963c6eb15173 Mon Sep 17 00:00:00 2001 From: ziree Date: Tue, 24 May 2011 23:55:03 +0200 Subject: [PATCH 3/7] Fixed FIRE-1088 - Toasts missing name field. --- indra/newview/llimhandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llimhandler.cpp b/indra/newview/llimhandler.cpp index 87993cf5ff..eeb1e35f51 100644 --- a/indra/newview/llimhandler.cpp +++ b/indra/newview/llimhandler.cpp @@ -182,7 +182,7 @@ bool LLIMHandler::processNotification(const LLSD& notify) LLToastIMPanel::Params im_p; im_p.notification = notification; im_p.avatar_id = avatar_id; - im_p.from = substitutions["c"].asString(); + im_p.from = substitutions["FROM"].asString(); im_p.time = substitutions["TIME"].asString(); im_p.message = substitutions["MESSAGE"].asString(); im_p.session_id = substitutions["SESSION_ID"].asUUID(); From 21a22393b9c4fe9d2e4d5fbb1ab9246836f6cfde Mon Sep 17 00:00:00 2001 From: Arrehn Date: Tue, 24 May 2011 20:03:15 -0400 Subject: [PATCH 4/7] FIRE-1131, Fix missing strings in Metaharper group notices --- .../metaharper/xui/en/language_settings.xml | 62 ----------- .../metaharper/xui/en/panel_group_notify.xml | 102 ------------------ 2 files changed, 164 deletions(-) delete mode 100644 indra/newview/skins/metaharper/xui/en/language_settings.xml delete mode 100644 indra/newview/skins/metaharper/xui/en/panel_group_notify.xml diff --git a/indra/newview/skins/metaharper/xui/en/language_settings.xml b/indra/newview/skins/metaharper/xui/en/language_settings.xml deleted file mode 100644 index c8a06fe401..0000000000 --- a/indra/newview/skins/metaharper/xui/en/language_settings.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - english - C - C - - - - - hour,datetime,slt - min,datetime,slt - year,datetime,slt - day,datetime,slt - mthnum,datetime,slt - wkday,datetime,slt - ampm,datetime,slt - hour12,datetime,slt - - mthnum,datetime,local - wkday,datetime,local - mth,datetime,local - day,datetime,local - second,datetime,local - hour,datetime,local - min,datetime,local - year,datetime,local - - weekday,datetime,utc - day,datetime,utc - mth,datetime,utc - year,datetime,utc - hour,datetime,utc - min,datetime,utc - second,datetime,utc - timezone,datetime,utc - diff --git a/indra/newview/skins/metaharper/xui/en/panel_group_notify.xml b/indra/newview/skins/metaharper/xui/en/panel_group_notify.xml deleted file mode 100644 index febff0d9a6..0000000000 --- a/indra/newview/skins/metaharper/xui/en/panel_group_notify.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - -