From c4a3eb3c421efafba64cef4beff9cab50a3d307e Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Tue, 17 Nov 2015 11:27:24 +0200 Subject: [PATCH 1/8] MAINT-5837 FIXED Hovering text is displayed when the avatar is blocked --- indra/newview/llviewerobject.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 92a5b02a07..d79c84bee3 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -5043,7 +5043,13 @@ void LLViewerObject::updateText() { if (mText.notNull()) { - LLVector3 up_offset(0,0,0); + LLVOAvatar* avatar = getAvatar(); + if (avatar) + { + mText->setHidden(avatar->isInMuteList()); + } + + LLVector3 up_offset(0,0,0); up_offset.mV[2] = getScale().mV[VZ]*0.6f; if (mDrawable.notNull()) From 219d6820829d1ed164e6ed96c22b9eec0f69ae91 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Fri, 13 Nov 2015 19:05:17 +0200 Subject: [PATCH 2/8] MAINT-5495 FIXED Drag and Drop no copy items from object contents to inventory creates multiple pop ups --- indra/newview/llinventorybridge.cpp | 43 ++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index adc0fced5a..2f392933a9 100755 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -80,6 +80,8 @@ #include "lllandmarkactions.h" #include "llpanellandmarks.h" +#include + void copy_slurl_to_clipboard_callback_inv(const std::string& slurl); typedef std::pair two_uuids_t; @@ -99,7 +101,7 @@ struct LLMoveInv using namespace LLOldEvents; // Function declarations -bool move_task_inventory_callback(const LLSD& notification, const LLSD& response, LLMoveInv*); +bool move_task_inventory_callback(const LLSD& notification, const LLSD& response, boost::shared_ptr); bool confirm_attachment_rez(const LLSD& notification, const LLSD& response); void teleport_via_landmark(const LLUUID& asset_id); static BOOL can_move_to_outfit(LLInventoryItem* inv_item, BOOL move_is_into_current_outfit); @@ -2793,7 +2795,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat, return accept; } -void warn_move_inventory(LLViewerObject* object, LLMoveInv* move_inv) +void warn_move_inventory(LLViewerObject* object, boost::shared_ptr move_inv) { const char* dialog = NULL; if (object->flagScripted()) @@ -2804,7 +2806,34 @@ void warn_move_inventory(LLViewerObject* object, LLMoveInv* move_inv) { dialog = "MoveInventoryFromObject"; } - LLNotificationsUtil::add(dialog, LLSD(), LLSD(), boost::bind(move_task_inventory_callback, _1, _2, move_inv)); + + static LLNotificationPtr notification_ptr = NULL; + static boost::shared_ptr inv_ptr; + + // Notification blocks user from interacting with inventories so everything that comes after first message + // is part of this message - don'r show it again + // Note: workaround for MAINT-5495 untill proper refactoring and warning system for Drag&Drop can be made. + if (notification_ptr == NULL + || !notification_ptr->isActive() + || LLNotificationsUtil::find(notification_ptr->getID()) == NULL + || inv_ptr->mCategoryID != move_inv->mCategoryID + || inv_ptr->mObjectID != move_inv->mObjectID) + { + notification_ptr = LLNotificationsUtil::add(dialog, LLSD(), LLSD(), boost::bind(move_task_inventory_callback, _1, _2, move_inv)); + inv_ptr = move_inv; + } + else + { + // Notification is alive and not responded, operating inv_ptr should be safe so attach new data + two_uuids_list_t::iterator move_it; + for (move_it = move_inv->mMoveList.begin(); + move_it != move_inv->mMoveList.end(); + ++move_it) + { + inv_ptr->mMoveList.push_back(*move_it); + } + move_inv.reset(); + } } // Move/copy all inventory items from the Contents folder of an in-world @@ -2892,7 +2921,7 @@ BOOL move_inv_category_world_to_agent(const LLUUID& object_id, if(drop && accept) { it = inventory_objects.begin(); - LLMoveInv* move_inv = new LLMoveInv; + boost::shared_ptr move_inv(new LLMoveInv); move_inv->mObjectID = object_id; move_inv->mCategoryID = category_id; move_inv->mCallback = callback; @@ -4408,7 +4437,7 @@ LLFontGL::StyleFlags LLMarketplaceFolderBridge::getLabelStyle() const // helper stuff -bool move_task_inventory_callback(const LLSD& notification, const LLSD& response, LLMoveInv* move_inv) +bool move_task_inventory_callback(const LLSD& notification, const LLSD& response, boost::shared_ptr move_inv) { LLFloaterOpenObject::LLCatAndWear* cat_and_wear = (LLFloaterOpenObject::LLCatAndWear* )move_inv->mUserData; LLViewerObject* object = gObjectList.findObject(move_inv->mObjectID); @@ -4444,7 +4473,7 @@ bool move_task_inventory_callback(const LLSD& notification, const LLSD& response move_inv->mCallback(option, move_inv->mUserData); } - delete move_inv; + move_inv.reset(); //since notification will persist return false; } @@ -4860,7 +4889,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item, if (accept && drop) { - LLMoveInv* move_inv = new LLMoveInv; + boost::shared_ptr move_inv (new LLMoveInv()); move_inv->mObjectID = inv_item->getParentUUID(); two_uuids_t item_pair(mUUID, inv_item->getUUID()); move_inv->mMoveList.push_back(item_pair); From 431f06748ec7e0f97619e5209586e0b584488a88 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 17 Nov 2015 18:49:04 +0200 Subject: [PATCH 3/8] MAINT-5870 FIXED Texture mapping drop down overlaps color thumbnail. --- indra/newview/skins/default/xui/en/panel_tools_texture.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index a90bb18d48..2dae1025ec 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -361,7 +361,7 @@ name="label shininess" left_pad="10" text_readonly_color="LabelDisabledColor" - top_delta="6" + top_delta="4" width="90"> Shininess @@ -405,7 +405,7 @@ left_delta="-100" name="label glossiness" text_readonly_color="LabelDisabledColor" - top_pad="8" + top_pad="7" width="116"> Glossiness @@ -531,7 +531,7 @@ left="10" name="tex gen" text_readonly_color="LabelDisabledColor" - top_pad="40" + top_pad="46" width="140"> Mapping From fd742bca7a33364ffdee549e4dc949214f6720e4 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 17 Nov 2015 20:47:08 +0200 Subject: [PATCH 4/8] MAINT-5495 linux build fix --- indra/newview/llinventorybridge.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 2f392933a9..9782c792c9 100755 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2807,7 +2807,7 @@ void warn_move_inventory(LLViewerObject* object, boost::shared_ptr mo dialog = "MoveInventoryFromObject"; } - static LLNotificationPtr notification_ptr = NULL; + static LLNotificationPtr notification_ptr; static boost::shared_ptr inv_ptr; // Notification blocks user from interacting with inventories so everything that comes after first message From 04dc484cae5f49ea5d9e1856680dc5fae3fecc7b Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Wed, 18 Nov 2015 17:56:11 +0200 Subject: [PATCH 5/8] MAINT-5876 FIXED Facial expressions & Preview while not working in many languages when importing animations --- .../xui/de/floater_animation_bvh_preview.xml | 48 +++++++++---------- .../xui/fr/floater_animation_bvh_preview.xml | 48 +++++++++---------- .../xui/it/floater_animation_bvh_preview.xml | 48 +++++++++---------- .../xui/ja/floater_animation_bvh_preview.xml | 48 +++++++++---------- .../xui/pt/floater_animation_bvh_preview.xml | 48 +++++++++---------- .../xui/ru/floater_animation_bvh_preview.xml | 48 +++++++++---------- .../xui/tr/floater_animation_bvh_preview.xml | 48 +++++++++---------- .../xui/zh/floater_animation_bvh_preview.xml | 48 +++++++++---------- 8 files changed, 192 insertions(+), 192 deletions(-) diff --git a/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml index 9a6f5e0166..d427376574 100755 --- a/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml @@ -141,35 +141,35 @@ Maximal erlaubt sind [MAX_LENGTH] Sekunden. Ausdruck - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + Vorschau während: - - - - + + + + diff --git a/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml index 84c40b5987..a20b8cdf72 100755 --- a/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml @@ -141,35 +141,35 @@ La limite maximale est de [MAX_LENGTH] secondes. Expression - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + Aperçu - - - - + + + + diff --git a/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml index a4319f2e77..34ee9aaed5 100755 --- a/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml @@ -141,35 +141,35 @@ La lunghezza massima dell'animazione è [MAX_LENGTH] secondi. Espressione - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + Anteprima mentre - - - - + + + + diff --git a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml index f74bab3598..20c7298462 100755 --- a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml @@ -141,35 +141,35 @@ 表情 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + プレビュー中の動作 - - - - + + + + diff --git a/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml index 5cae581045..64515dfa61 100755 --- a/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml @@ -141,35 +141,35 @@ A duração máxima da animação é de [MAX_LENGTH] segundos. Expressão - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + Visualizar enquanto - - - - + + + + diff --git a/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml index 8ad9d8657a..d709987147 100755 --- a/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml @@ -141,35 +141,35 @@ Выражение лица - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + Просмотр во время - - - - + + + + diff --git a/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml index f8800c674d..c4e2fd2a93 100755 --- a/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml @@ -141,35 +141,35 @@ Maksimum animasyon uzunluğu [LENGTH] saniye. İfade - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + Şu sırada önizle - - - - + + + + diff --git a/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml index ffb0de8a68..756cca825d 100755 --- a/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml @@ -141,35 +141,35 @@ 表情 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + 預覽… - - - - + + + + From 7adfbc7b8261b928f177042a24a4a0b9138a3776 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Thu, 19 Nov 2015 22:14:06 +0200 Subject: [PATCH 6/8] MAINT-5847 Backed out changeset: 114068a17d38 --- indra/newview/llconversationview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index e4cf8d3fbb..3a6e4c4dfe 100644 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -437,7 +437,7 @@ void LLConversationViewSession::setIconsVisible(bool visible) // Show/hide icons for the 1-n-1 chat. LLConversationItem* vmi = dynamic_cast(getViewModelItem()); - if (vmi && mItemPanel) + if (vmi) { switch (vmi->getType()) { From 0c4ec8642471bacb4bf9d61283aa28af8015985a Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Thu, 19 Nov 2015 22:17:37 +0200 Subject: [PATCH 7/8] MAINT-5297 Backed out changeset: dd9e3cbf10e5 --- indra/newview/app_settings/settings.xml | 11 -------- indra/newview/llavatarlist.cpp | 14 ++++------ indra/newview/llavatarlist.h | 2 +- indra/newview/llconversationview.cpp | 4 +-- indra/newview/llfloaterimcontainer.cpp | 5 ++-- indra/newview/llpanelpeople.cpp | 24 +++-------------- .../xui/en/menu_people_friends_view.xml | 4 +-- .../xui/en/menu_people_nearby_view.xml | 4 +-- .../xui/en/menu_people_recent_view.xml | 4 +-- .../xui/en/panel_preferences_setup.xml | 26 ------------------- 10 files changed, 20 insertions(+), 78 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e04d03c832..73f50c5ce2 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11040,17 +11040,6 @@ Value 1 - GlobalShowIconsOverride - - Comment - Show/hide people icons in any list. This option should be set back to 0 when icons are enabled locally for the lists - Persist - 1 - Type - Boolean - Value - 0 - FriendsSortOrder Comment diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp index c7fa375ada..8846d1317d 100755 --- a/indra/newview/llavatarlist.cpp +++ b/indra/newview/llavatarlist.cpp @@ -63,18 +63,16 @@ bool LLAvatarList::contains(const LLUUID& id) return std::find(ids.begin(), ids.end(), id) != ids.end(); } -void LLAvatarList::setIconsVisible(bool visible) +void LLAvatarList::toggleIcons() { - if (visible == mShowIcons) // nothing to be done here. - return; - // Save the new value for new items to use. - mShowIcons = visible; - + mShowIcons = !mShowIcons; + gSavedSettings.setBOOL(mIconParamName, mShowIcons); + // Show/hide icons for all existing items. std::vector items; getItems(items); - for (std::vector::const_iterator it = items.begin(); it != items.end(); it++) + for( std::vector::const_iterator it = items.begin(); it != items.end(); it++) { static_cast(*it)->setAvatarIconVisible(mShowIcons); } @@ -189,8 +187,6 @@ void LLAvatarList::draw() updateAvatarNames(); } - setIconsVisible(gSavedSettings.getBOOL(mIconParamName) && !gSavedSettings.getBOOL("GlobalShowIconsOverride")); - if (mDirty) refresh(); diff --git a/indra/newview/llavatarlist.h b/indra/newview/llavatarlist.h index 159ff991e6..3542577ae3 100755 --- a/indra/newview/llavatarlist.h +++ b/indra/newview/llavatarlist.h @@ -76,7 +76,7 @@ public: void setSessionID(const LLUUID& session_id) { mSessionID = session_id; } const LLUUID& getSessionID() { return mSessionID; } - void setIconsVisible(bool visible); + void toggleIcons(); void setSpeakingIndicatorsVisible(bool visible); void showPermissions(bool visible); void sortByName(); diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index 3a6e4c4dfe..924a8d7206 100644 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -503,7 +503,7 @@ void LLConversationViewSession::refresh() } } - setIconsVisible(gSavedSettings.getBOOL("ChatShowIcons") && !gSavedSettings.getBOOL("GlobalShowIconsOverride")); + setIconsVisible(gSavedSettings.getBOOL("ChatShowIcons")); requestArrange(); // Do the regular upstream refresh @@ -572,7 +572,7 @@ void LLConversationViewParticipant::initFromParams(const LLConversationViewParti BOOL LLConversationViewParticipant::postBuild() { mAvatarIcon = getChild("avatar_icon"); - mAvatarIcon->setVisible(gSavedSettings.getBOOL("ChatShowIcons") && !gSavedSettings.getBOOL("GlobalShowIconsOverride")); + mAvatarIcon->setVisible(gSavedSettings.getBOOL("ChatShowIcons")); mInfoBtn = getChild("info_btn"); mInfoBtn->setClickedCallback(boost::bind(&LLConversationViewParticipant::onInfoBtnClick, this)); diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 91a0af3e8d..fc87e5dc5a 100755 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -926,8 +926,7 @@ void LLFloaterIMContainer::onCustomAction(const LLSD& userdata) } if ("view_icons" == command) { - gSavedSettings.setBOOL("ChatShowIcons", !(gSavedSettings.getBOOL("ChatShowIcons") && !gSavedSettings.getBOOL("GlobalShowIconsOverride"))); - gSavedSettings.setBOOL("GlobalShowIconsOverride", (!gSavedSettings.getBOOL("ChatShowIcons") && gSavedSettings.getBOOL("GlobalShowIconsOverride"))); + gSavedSettings.setBOOL("ChatShowIcons", !gSavedSettings.getBOOL("ChatShowIcons")); } if ("chat_preferences" == command) { @@ -981,7 +980,7 @@ BOOL LLFloaterIMContainer::isActionChecked(const LLSD& userdata) } if ("view_icons" == command) { - return gSavedSettings.getBOOL("ChatShowIcons") && !gSavedSettings.getBOOL("GlobalShowIconsOverride"); + return gSavedSettings.getBOOL("ChatShowIcons"); } if ("Translating.Enabled" == command) { diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index e28f37ccb0..73b928f014 100755 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -1331,12 +1331,8 @@ void LLPanelPeople::onFriendsViewSortMenuItemClicked(const LLSD& userdata) } else if (chosen_item == "view_icons") { - std::string param = mAllFriendList->getIconParamName(); - gSavedSettings.setBOOL(param, !(gSavedSettings.getBOOL(param) && !gSavedSettings.getBOOL("GlobalShowIconsOverride"))); - gSavedSettings.setBOOL("GlobalShowIconsOverride", (!gSavedSettings.getBOOL(param) && gSavedSettings.getBOOL("GlobalShowIconsOverride"))); - gSavedSettings.setBOOL(mOnlineFriendList->getIconParamName(), gSavedSettings.getBOOL(param)); - mAllFriendList->setIconsVisible(gSavedSettings.getBOOL(param)); - mOnlineFriendList->setIconsVisible(gSavedSettings.getBOOL(param)); + mAllFriendList->toggleIcons(); + mOnlineFriendList->toggleIcons(); } else if (chosen_item == "view_permissions") { @@ -1372,10 +1368,7 @@ void LLPanelPeople::onNearbyViewSortMenuItemClicked(const LLSD& userdata) } else if (chosen_item == "view_icons") { - std::string param = mNearbyList->getIconParamName(); - gSavedSettings.setBOOL(param, !(gSavedSettings.getBOOL(param) && !gSavedSettings.getBOOL("GlobalShowIconsOverride"))); - gSavedSettings.setBOOL("GlobalShowIconsOverride", (!gSavedSettings.getBOOL(param) && gSavedSettings.getBOOL("GlobalShowIconsOverride"))); - mNearbyList->setIconsVisible(gSavedSettings.getBOOL(param)); + mNearbyList->toggleIcons(); } else if (chosen_item == "sort_distance") { @@ -1394,8 +1387,6 @@ bool LLPanelPeople::onNearbyViewSortMenuItemCheck(const LLSD& userdata) return sort_order == E_SORT_BY_NAME; if (item == "sort_distance") return sort_order == E_SORT_BY_DISTANCE; - if (item == "view_icons") - return gSavedSettings.getBOOL(mNearbyList->getIconParamName()) && !gSavedSettings.getBOOL("GlobalShowIconsOverride"); return false; } @@ -1414,10 +1405,7 @@ void LLPanelPeople::onRecentViewSortMenuItemClicked(const LLSD& userdata) } else if (chosen_item == "view_icons") { - std::string param = mRecentList->getIconParamName(); - gSavedSettings.setBOOL(param, !(gSavedSettings.getBOOL(param) && !gSavedSettings.getBOOL("GlobalShowIconsOverride"))); - gSavedSettings.setBOOL("GlobalShowIconsOverride", (!gSavedSettings.getBOOL(param) && gSavedSettings.getBOOL("GlobalShowIconsOverride"))); - mRecentList->setIconsVisible(gSavedSettings.getBOOL(param)); + mRecentList->toggleIcons(); } } @@ -1430,8 +1418,6 @@ bool LLPanelPeople::onFriendsViewSortMenuItemCheck(const LLSD& userdata) return sort_order == E_SORT_BY_NAME; if (item == "sort_status") return sort_order == E_SORT_BY_STATUS; - if (item == "view_icons") - return gSavedSettings.getBOOL(mAllFriendList->getIconParamName()) && !gSavedSettings.getBOOL("GlobalShowIconsOverride"); return false; } @@ -1445,8 +1431,6 @@ bool LLPanelPeople::onRecentViewSortMenuItemCheck(const LLSD& userdata) return sort_order == E_SORT_BY_MOST_RECENT; if (item == "sort_name") return sort_order == E_SORT_BY_NAME; - if (item == "view_icons") - return gSavedSettings.getBOOL(mRecentList->getIconParamName()) && !gSavedSettings.getBOOL("GlobalShowIconsOverride"); return false; } diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml index 02c6cfc006..8790fde7c5 100755 --- a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml +++ b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml @@ -29,8 +29,8 @@ function="People.Friends.ViewSort.Action" parameter="view_icons" /> + function="CheckControl" + parameter="FriendsListShowIcons" /> + function="CheckControl" + parameter="NearbyListShowIcons" /> + function="CheckControl" + parameter="RecentListShowIcons" /> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index a8be517f3c..b201e071ef 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -313,30 +313,4 @@ - - People Icons: - - From d6284458e562c3c792415d1f64929d0e20f2963c Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Thu, 19 Nov 2015 22:17:54 +0200 Subject: [PATCH 8/8] MAINT-5297 Backed out changeset: bfef055de5f5 --- indra/newview/app_settings/settings.xml | 11 --- indra/newview/llconversationview.cpp | 81 +++---------------- indra/newview/llconversationview.h | 5 +- indra/newview/llfloaterimcontainer.cpp | 8 -- .../default/xui/en/menu_participant_view.xml | 13 --- 5 files changed, 11 insertions(+), 107 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 73f50c5ce2..5f378c64e8 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1730,17 +1730,6 @@ Value 1 - ChatShowIcons - - Comment - Show/hide people icons in chat - Persist - 1 - Type - Boolean - Value - 1 - CheesyBeacon Comment diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index 924a8d7206..b18e543f0a 100644 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -85,8 +85,7 @@ LLConversationViewSession::LLConversationViewSession(const LLConversationViewSes mHasArrow(true), mIsInActiveVoiceChannel(false), mFlashStateOn(false), - mFlashStarted(false), - mShowIcons(true) + mFlashStarted(false) { mFlashTimer = new LLFlashTimer(); } @@ -174,7 +173,7 @@ BOOL LLConversationViewSession::postBuild() if (session) { LLAvatarIconCtrl* icon = mItemPanel->getChild("avatar_icon"); - icon->setVisible(mShowIcons); + icon->setVisible(true); icon->setValue(session->mOtherParticipantID); mSpeakingIndicator->setSpeakerId(gAgentID, session->mSessionID, true); mHasArrow = false; @@ -427,49 +426,6 @@ void LLConversationViewSession::showVoiceIndicator(bool visible) requestArrange(); } -void LLConversationViewSession::setIconsVisible(bool visible) -{ - if (visible == mShowIcons) // nothing to be done here. - return; - - // Save the new value for new items to use. - mShowIcons = visible; - - // Show/hide icons for the 1-n-1 chat. - LLConversationItem* vmi = dynamic_cast(getViewModelItem()); - if (vmi) - { - switch (vmi->getType()) - { - case LLConversationItem::CONV_PARTICIPANT: - case LLConversationItem::CONV_SESSION_1_ON_1: - { - LLIconCtrl* icon = mItemPanel->getChild("avatar_icon"); - icon->setVisible(mShowIcons); - break; - } - /* - case LLConversationItem::CONV_SESSION_AD_HOC: - case LLConversationItem::CONV_SESSION_GROUP: - { - LLIconCtrl* icon = mItemPanel->getChild("group_icon"); - icon->setVisible(mShowIcons); - break; - } - */ - default: - break; - } - } - - // Show/hide icons for all existing items. - items_t::const_iterator iter; - for (iter = getItemsBegin(); iter != getItemsEnd(); iter++) - { - dynamic_cast(*iter)->setAvatarIconVisible(mShowIcons); - } -} - void LLConversationViewSession::refresh() { // Refresh the session view from its model data @@ -502,9 +458,6 @@ void LLConversationViewSession::refresh() } } } - - setIconsVisible(gSavedSettings.getBOOL("ChatShowIcons")); - requestArrange(); // Do the regular upstream refresh LLFolderViewFolder::refresh(); @@ -556,7 +509,7 @@ void LLConversationViewParticipant::initFromParams(const LLConversationViewParti LLAvatarIconCtrl::Params avatar_icon_params(params.avatar_icon()); applyXUILayout(avatar_icon_params, this); LLAvatarIconCtrl * avatarIcon = LLUICtrlFactory::create(avatar_icon_params); - addChild(avatarIcon); + addChild(avatarIcon); LLButton::Params info_button_params(params.info_button()); applyXUILayout(info_button_params, this); @@ -572,7 +525,6 @@ void LLConversationViewParticipant::initFromParams(const LLConversationViewParti BOOL LLConversationViewParticipant::postBuild() { mAvatarIcon = getChild("avatar_icon"); - mAvatarIcon->setVisible(gSavedSettings.getBOOL("ChatShowIcons")); mInfoBtn = getChild("info_btn"); mInfoBtn->setClickedCallback(boost::bind(&LLConversationViewParticipant::onInfoBtnClick, this)); @@ -636,12 +588,12 @@ S32 LLConversationViewParticipant::arrange(S32* width, S32* height) S32 arranged = LLFolderViewItem::arrange(width, height); //Adjusts the avatar icon based upon the indentation - LLRect avatarRect(getIndentation(), - mAvatarIcon->getRect().mTop, - getIndentation() + mAvatarIcon->getRect().getWidth(), - mAvatarIcon->getRect().mBottom); - mAvatarIcon->setShape(avatarRect); - + LLRect avatarRect(getIndentation(), + mAvatarIcon->getRect().mTop, + getIndentation() + mAvatarIcon->getRect().getWidth(), + mAvatarIcon->getRect().mBottom); + mAvatarIcon->setShape(avatarRect); + //Since dimensions changed, adjust the children (info button, speaker indicator) updateChildren(); @@ -713,7 +665,7 @@ void LLConversationViewParticipant::onMouseLeave(S32 x, S32 y, MASK mask) S32 LLConversationViewParticipant::getLabelXPos() { - return getIndentation() + (mAvatarIcon->getVisible() ? mAvatarIcon->getRect().getWidth() : 0) + mIconPad; + return getIndentation() + mAvatarIcon->getRect().getWidth() + mIconPad; } // static @@ -792,18 +744,5 @@ void LLConversationViewParticipant::hideSpeakingIndicator() mSpeakingIndicator->setVisible(false); } -void LLConversationViewParticipant::setAvatarIconVisible(bool visible) -{ - // Already done? Then do nothing. - if (mAvatarIcon->getVisible() == (BOOL)visible) - { - return; - } - - // Show/hide avatar icon. - mAvatarIcon->setVisible(visible); - updateChildren(); -} - // EOF diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h index 6aaba9b59c..5a74974302 100644 --- a/indra/newview/llconversationview.h +++ b/indra/newview/llconversationview.h @@ -83,7 +83,7 @@ public: LLConversationViewParticipant* findParticipant(const LLUUID& participant_id); void showVoiceIndicator(bool visible); - void setIconsVisible(bool visible); + virtual void refresh(); /*virtual*/ void setFlashState(bool flash_state); @@ -110,8 +110,6 @@ private: bool mIsInActiveVoiceChannel; - bool mShowIcons; - LLVoiceClientStatusObserver* mVoiceClientObserver; boost::signals2::connection mActiveVoiceChannelConnection; @@ -147,7 +145,6 @@ public: /*virtual*/ S32 getLabelXPos(); /*virtual*/ BOOL handleMouseDown( S32 x, S32 y, MASK mask ); void hideSpeakingIndicator(); - void setAvatarIconVisible(bool visible); protected: friend class LLUICtrlFactory; diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index fc87e5dc5a..15b67b905d 100755 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -924,10 +924,6 @@ void LLFloaterIMContainer::onCustomAction(const LLSD& userdata) { setSortOrderParticipants(LLConversationFilter::SO_DISTANCE); } - if ("view_icons" == command) - { - gSavedSettings.setBOOL("ChatShowIcons", !gSavedSettings.getBOOL("ChatShowIcons")); - } if ("chat_preferences" == command) { LLFloaterPreference * floater_prefp = LLFloaterReg::showTypedInstance("preferences"); @@ -978,10 +974,6 @@ BOOL LLFloaterIMContainer::isActionChecked(const LLSD& userdata) { return (order.getSortOrderParticipants() == LLConversationFilter::SO_DISTANCE); } - if ("view_icons" == command) - { - return gSavedSettings.getBOOL("ChatShowIcons"); - } if ("Translating.Enabled" == command) { return gSavedPerAccountSettings.getBOOL("TranslatingEnabled"); diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml index 658238bf41..7ea87ee05c 100755 --- a/indra/newview/skins/default/xui/en/menu_participant_view.xml +++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml @@ -59,19 +59,6 @@ function="IMFloaterContainer.Check" parameter="sort_participants_by_recent" /> - - - - -