From 135dd008da4372d2c9eebe1c7bbfe87681d55612 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 27 Mar 2019 15:51:31 -0400 Subject: [PATCH 1/5] DRTVWR-479: Remove unused iterators to pacify Xcode 10.2. --- indra/llui/lllayoutstack.cpp | 1 - indra/newview/llappearancemgr.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index b1ba725c2f..955e7089f4 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -516,7 +516,6 @@ LLLayoutPanel* LLLayoutStack::findEmbeddedPanel(LLPanel* panelp) const { if (!panelp) return NULL; - e_panel_list_t::const_iterator panel_it; BOOST_FOREACH(LLLayoutPanel* p, mPanels) { if (p == panelp) diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 08daeb0f59..22bcbad7da 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1865,7 +1865,6 @@ bool LLAppearanceMgr::getCanRemoveOutfit(const LLUUID& outfit_cat_id) LLFindNonRemovableObjects filter_non_removable; LLInventoryModel::cat_array_t cats; LLInventoryModel::item_array_t items; - LLInventoryModel::item_array_t::const_iterator it; gInventory.collectDescendentsIf(outfit_cat_id, cats, items, false, filter_non_removable); if (!cats.empty() || !items.empty()) { From 9ef117b1fd38dd4e737f8f585f4b1baf438f5788 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Thu, 28 Mar 2019 16:03:13 +0200 Subject: [PATCH 2/5] SL-10815 FIXED The weight of an object is displayed in the 'Land tool' floater --- indra/newview/llfloatertools.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index ee4fdbe9a5..c2c15ee12b 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -514,11 +514,6 @@ void LLFloaterTools::refresh() selection_info << getString("status_selectcount", selection_args); getChild("selection_count")->setText(selection_info.str()); - - bool have_selection = !LLSelectMgr::getInstance()->getSelection()->isEmpty(); - childSetVisible("selection_count", have_selection); - childSetVisible("remaining_capacity", have_selection); - childSetVisible("selection_empty", !have_selection); } From a4d62051b19d413110c7fb2dafd3414527286a0c Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 28 Mar 2019 18:55:48 +0200 Subject: [PATCH 3/5] SL-10655 Fixed 'Sit on ground' occasionally failing --- indra/newview/llviewermenu.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index ba68ce4cf4..aa6d75f5fb 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -4066,10 +4066,8 @@ void near_sit_down_point(BOOL success, void *) if (success) { gAgent.setFlying(FALSE); + gAgent.clearControlFlags(AGENT_CONTROL_STAND_UP); // might have been set by autopilot gAgent.setControlFlags(AGENT_CONTROL_SIT_ON_GROUND); - - // Might be first sit - //LLFirstUse::useSit(); } } From 8b0c77634b97847209fad3a009c3a50ff6cf49f6 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Tue, 2 Apr 2019 15:35:34 +0300 Subject: [PATCH 4/5] SL-10847 FIXED [French] llLoadUrl dialog wrongly adds '?' to URL --- indra/newview/skins/default/xui/fr/notifications.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index 9066f1e70c..a09a6a9aad 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -2951,7 +2951,7 @@ Si vous restez dans cette région, vous serez déconnecté(e). Si vous restez dans cette région, vous serez déconnecté(e). - Charger la page Web [URL] ? +Charger la page Web [URL] ? [MESSAGE] From eb6a7cde9d08215f18b9b9c707f39f73b60403a8 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 2 Apr 2019 17:32:29 +0300 Subject: [PATCH 5/5] SL-10510 Allow copy of worn items --- indra/newview/llinventorybridge.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 938adf8a2a..5b12b39fca 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2101,12 +2101,6 @@ BOOL LLItemBridge::isItemCopyable() const LLViewerInventoryItem* item = getItem(); if (item) { - // Can't copy worn objects. DEV-15183 - if(get_is_item_worn(mUUID)) - { - return FALSE; - } - return item->getPermissions().allowCopyBy(gAgent.getID()) || gSavedSettings.getBOOL("InventoryLinking"); } return FALSE;