From 15dbce00eebf1368a559e82d52989dce651ef544 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Thu, 21 Nov 2013 23:09:13 -0500 Subject: [PATCH 01/11] Prevent any RLVa filtering of music information as mentioned in SV-1226 --- indra/newview/llmediaremotectrl.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/indra/newview/llmediaremotectrl.cpp b/indra/newview/llmediaremotectrl.cpp index 38ce628da..b5841d2f4 100644 --- a/indra/newview/llmediaremotectrl.cpp +++ b/indra/newview/llmediaremotectrl.cpp @@ -279,6 +279,9 @@ void LLMediaRemoteCtrl::enableMediaButtons() LLChat chat; chat.mText = getString("Now_playing") + " " + info_text; chat.mSourceType = CHAT_SOURCE_SYSTEM; + // Lie to RLVa so it won't filter this + chat.mRlvLocFiltered = true; + chat.mRlvNamesFiltered = true; LLFloaterChat::addChat(chat); } } From f3f1727b4952592b0775b3a1f563c973eafa1b64 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Fri, 22 Nov 2013 00:49:47 -0500 Subject: [PATCH 02/11] Actually fix SV-1226 It happened because we filtered mFromName which started out as from_name, and inconsistently used the two after that... This change switches to just using mFromName after that point.. SV-1226 #close Fixed it~ --- indra/newview/llviewermessage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index b1523682d..7c2c5a898 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4018,7 +4018,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) std::string prefix = mesg.substr(0, 4); if (prefix == "/me " || prefix == "/me'") { - chat.mText = from_name; + chat.mText = chat.mFromName; mesg = mesg.substr(3); ircstyle = TRUE; // This block was moved up to allow bubbles with italicized chat @@ -4191,7 +4191,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) break; } - chat.mText = from_name + verb + mesg; + chat.mText = chat.mFromName + verb + mesg; } if (chatter) From 209e64b13646cb57c03e53fe5d7a818838380b0d Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Fri, 22 Nov 2013 17:35:11 -0500 Subject: [PATCH 03/11] Merge llfloatertools.cpp with upstream to fix MATBUG-240 MATBUG-240: Unable to change media settings for an already applied media texture unless media texture is removed and reapplied. --- indra/newview/llfloatertools.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 0cf47303f..062ada4ba 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -1313,7 +1313,7 @@ void LLFloaterTools::getMediaState() getChildView("media_tex")->setEnabled(bool_has_media && editable); getChildView("edit_media")->setEnabled(bool_has_media && LLFloaterMediaSettings::getInstance()->mIdenticalHasMediaInfo && editable ); getChildView("delete_media")->setEnabled(bool_has_media && editable ); - getChildView("add_media")->setEnabled(( ! bool_has_media ) && editable ); + getChildView("add_media")->setEnabled(editable); // TODO: display a list of all media on the face - use 'identical' flag } else // not all face has media but at least one does. @@ -1343,7 +1343,7 @@ void LLFloaterTools::getMediaState() getChildView("media_tex")->setEnabled(TRUE); getChildView("edit_media")->setEnabled(LLFloaterMediaSettings::getInstance()->mIdenticalHasMediaInfo); getChildView("delete_media")->setEnabled(TRUE); - getChildView("add_media")->setEnabled(FALSE ); + getChildView("add_media")->setEnabled(editable); } media_info->setText(media_title); @@ -1353,6 +1353,8 @@ void LLFloaterTools::getMediaState() if(mTitleMedia) LLFloaterMediaSettings::initValues(mMediaSettings, editable ); } + + ////////////////////////////////////////////////////////////////////////////// // called when a user wants to add media to a prim or prim face void LLFloaterTools::onClickBtnAddMedia() From 53969d05d8e9a33d04c67d7492b0aeb9705182da Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Fri, 22 Nov 2013 18:00:58 -0500 Subject: [PATCH 04/11] [LLIMMgr/LLIMPanel] Always allow Drag and Drop sharing of any inventory regardless of mDialog so long as mSessionType is P2P_SESSION --- indra/newview/llimpanel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index 2633f830c..d1c62c856 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -867,7 +867,7 @@ BOOL LLFloaterIMPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, std::string& tooltip_msg) { - if (mDialog == IM_NOTHING_SPECIAL) + if (mSessionType == P2P_SESSION) { LLToolDragAndDrop::handleGiveDragAndDrop(mOtherParticipantUUID, mSessionUUID, drop, cargo_type, cargo_data, accept); From 15fefc231b1d8858199bb9f1a13b885dbf859e24 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Fri, 22 Nov 2013 18:09:13 -0500 Subject: [PATCH 05/11] [LLIMMgr/LLIMPanel] isInviteAllowed should return based on mSessionType, not on mDialog. --- indra/newview/llimpanel.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index d1c62c856..af8ee0a32 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -949,9 +949,7 @@ BOOL LLFloaterIMPanel::dropCategory(LLInventoryCategory* category, BOOL drop) bool LLFloaterIMPanel::isInviteAllowed() const { - - return ( (IM_SESSION_CONFERENCE_START == mDialog) - || (IM_SESSION_INVITE == mDialog) ); + return mSessionType != P2P_SESSION; } void LLFloaterIMPanel::removeDynamics(LLComboBox* flyout) From 2d660227273d8692d526f898eb479ef318eb8270 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Fri, 22 Nov 2013 18:18:05 -0500 Subject: [PATCH 06/11] [LLIMMgr/LLIMPanel] Clean up the now redundant usage of isInviteAllowed() --- indra/newview/llimpanel.cpp | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index af8ee0a32..3aedaa8b6 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -874,7 +874,7 @@ BOOL LLFloaterIMPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, } // handle case for dropping calling cards (and folders of calling cards) onto invitation panel for invites - else if (isInviteAllowed()) + else { *accept = ACCEPT_NO; @@ -898,28 +898,23 @@ BOOL LLFloaterIMPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, BOOL LLFloaterIMPanel::dropCallingCard(LLInventoryItem* item, BOOL drop) { - BOOL rv = isInviteAllowed(); - if(rv && item && item->getCreatorUUID().notNull()) + if (item && item->getCreatorUUID().notNull()) { - if(drop) + if (drop) { LLDynamicArray ids; ids.put(item->getCreatorUUID()); inviteToSession(ids); } + return true; } - else - { - // set to false if creator uuid is null. - rv = FALSE; - } - return rv; + // return false if creator uuid is null. + return false; } BOOL LLFloaterIMPanel::dropCategory(LLInventoryCategory* category, BOOL drop) { - BOOL rv = isInviteAllowed(); - if(rv && category) + if (category) { LLInventoryModel::cat_array_t cats; LLInventoryModel::item_array_t items; @@ -932,7 +927,7 @@ BOOL LLFloaterIMPanel::dropCategory(LLInventoryCategory* category, BOOL drop) S32 count = items.count(); if(count == 0) { - rv = FALSE; + return false; } else if(drop) { @@ -944,7 +939,7 @@ BOOL LLFloaterIMPanel::dropCategory(LLInventoryCategory* category, BOOL drop) inviteToSession(ids); } } - return rv; + return true; } bool LLFloaterIMPanel::isInviteAllowed() const From 7d98cf189170d623076662599e83e586d90d0bf3 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Fri, 22 Nov 2013 18:41:34 -0500 Subject: [PATCH 07/11] [LLIMMgr/LLIMPanel] Woops, only allow invites to Adhocs!! --- indra/newview/llimpanel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index 3aedaa8b6..ed0fff564 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -874,7 +874,7 @@ BOOL LLFloaterIMPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, } // handle case for dropping calling cards (and folders of calling cards) onto invitation panel for invites - else + else if (isInviteAllowed()) { *accept = ACCEPT_NO; @@ -944,7 +944,7 @@ BOOL LLFloaterIMPanel::dropCategory(LLInventoryCategory* category, BOOL drop) bool LLFloaterIMPanel::isInviteAllowed() const { - return mSessionType != P2P_SESSION; + return mSessionType == ADHOC_SESSION; } void LLFloaterIMPanel::removeDynamics(LLComboBox* flyout) From 44d1b4f1fb81497f026456deca487e4f071048fb Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Fri, 22 Nov 2013 20:21:47 -0500 Subject: [PATCH 08/11] A start on the group's feature request to have indication of mute in friends list We may need to trick the friends list into refreshing when someone is muted to complete this feature... probably need mutelist callbacks if those exist --- indra/newview/llfloaterfriends.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/indra/newview/llfloaterfriends.cpp b/indra/newview/llfloaterfriends.cpp index 45cedfeac..b8f155914 100644 --- a/indra/newview/llfloaterfriends.cpp +++ b/indra/newview/llfloaterfriends.cpp @@ -426,6 +426,9 @@ BOOL LLPanelFriends::addFriend(const LLUUID& agent_id) friend_column["value"] = fullname; friend_column["font"] = "SANSSERIF"; friend_column["font-style"] = "NORMAL"; + static const LLCachedControl sDefaultColor(gColors, "DefaultListText"); + static const LLCachedControl sMutedColor("AscentMutedColor"); + friend_column["color"] = LLAvatarActions::isBlocked(agent_id) ? sMutedColor : sDefaultColor; LLSD& online_status_column = element["columns"][LIST_ONLINE_STATUS]; online_status_column["column"] = "icon_online_status"; From 26655aefe02a477d4e4879dd83b5269274a2ba1f Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Mon, 25 Nov 2013 03:24:40 -0500 Subject: [PATCH 09/11] Fix last online unknown showing up as zeroed out date. Adds group_member_status_unknown to strings.xml SV-1237 #close Fixed~ --- indra/newview/llgroupmgr.cpp | 7 +++++++ indra/newview/skins/default/xui/en-us/strings.xml | 1 + 2 files changed, 8 insertions(+) diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp index 3bd9c3715..eaef2534b 100644 --- a/indra/newview/llgroupmgr.cpp +++ b/indra/newview/llgroupmgr.cpp @@ -995,6 +995,11 @@ void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data) static std::string localized_online(LLTrans::getString("group_member_status_online")); online_status = localized_online; } + else if (online_status == "unknown") + { + static std::string localized_unknown(LLTrans::getString("group_member_status_unknown")); + online_status = localized_unknown; + } else { formatDateString(online_status); // reformat for sorting, e.g. 12/25/2008 -> 2008/12/25 @@ -2058,6 +2063,8 @@ void LLGroupMgr::processCapGroupMembersRequest(const LLSD& content) online_status = member_info["last_login"].asString(); if (online_status == "Online") online_status = LLTrans::getString("group_member_status_online"); + else if (online_status == "unknown") + online_status = LLTrans::getString("group_member_status_unknown"); else formatDateString(online_status); } diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml index 03b8ef839..d1909fb66 100644 --- a/indra/newview/skins/default/xui/en-us/strings.xml +++ b/indra/newview/skins/default/xui/en-us/strings.xml @@ -4235,6 +4235,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Officers Owners Online + Unknown Uploading... From 201ca35afb84ccb47336836fadad0ec2d8dc70bc Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Mon, 25 Nov 2013 03:33:13 -0500 Subject: [PATCH 10/11] Possible fix for Mute/Unmute from lists of avatars not working --- indra/newview/skins/default/xui/en-us/menu_avs_list.xml | 2 +- indra/newview/skins/default/xui/en-us/menu_radar.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/en-us/menu_avs_list.xml b/indra/newview/skins/default/xui/en-us/menu_avs_list.xml index a0d1b5a71..1c5e594ec 100644 --- a/indra/newview/skins/default/xui/en-us/menu_avs_list.xml +++ b/indra/newview/skins/default/xui/en-us/menu_avs_list.xml @@ -54,7 +54,7 @@ - + diff --git a/indra/newview/skins/default/xui/en-us/menu_radar.xml b/indra/newview/skins/default/xui/en-us/menu_radar.xml index a2e73b084..2194e92b2 100644 --- a/indra/newview/skins/default/xui/en-us/menu_radar.xml +++ b/indra/newview/skins/default/xui/en-us/menu_radar.xml @@ -129,7 +129,7 @@ - + From 98d5e4bea8bfc48242c7f9f637b619e520163ea8 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Mon, 25 Nov 2013 03:44:07 -0500 Subject: [PATCH 11/11] Possibly fix and restore Report Abuse to avs list menus --- indra/newview/llviewermenu.cpp | 4 +--- indra/newview/skins/default/xui/en-us/menu_avs_list.xml | 6 +++--- indra/newview/skins/default/xui/en-us/menu_radar.xml | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index c009980e1..09ac1696b 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -9474,7 +9474,6 @@ class ListStartIM : public view_listener_t } }; -/* Singu TODO: Figure out why this wouldn't work class ListAbuseReport : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) @@ -9483,7 +9482,6 @@ class ListAbuseReport : public view_listener_t return true; } }; -*/ // Create the args for administrative notifications used in lists, tossing the selected names into it. LLSD create_args(const uuid_vec_t& ids, const std::string& token) @@ -9898,7 +9896,7 @@ void initialize_menus() addMenu(new ListStartCall(), "List.StartCall"); addMenu(new ListStartConference(), "List.StartConference"); addMenu(new ListStartIM(), "List.StartIM"); - //addMenu(new ListAbuseReport(), "List.AbuseReport"); + addMenu(new ListAbuseReport(), "List.AbuseReport"); addMenu(new ListEject(), "List.ParcelEject"); addMenu(new ListFreeze(), "List.Freeze"); addMenu(new ListEstateBan(), "List.EstateBan"); diff --git a/indra/newview/skins/default/xui/en-us/menu_avs_list.xml b/indra/newview/skins/default/xui/en-us/menu_avs_list.xml index 1c5e594ec..7377eebf9 100644 --- a/indra/newview/skins/default/xui/en-us/menu_avs_list.xml +++ b/indra/newview/skins/default/xui/en-us/menu_avs_list.xml @@ -58,10 +58,10 @@ - + diff --git a/indra/newview/skins/default/xui/en-us/menu_radar.xml b/indra/newview/skins/default/xui/en-us/menu_radar.xml index 2194e92b2..8d30d76a6 100644 --- a/indra/newview/skins/default/xui/en-us/menu_radar.xml +++ b/indra/newview/skins/default/xui/en-us/menu_radar.xml @@ -133,10 +133,10 @@ - +