livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge viewer-neko

master
Ansariel 2019-04-03 00:18:43 +02:00
parent 2a2baac7a5 65bf63c973
commit aa154f3c22
6 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llui/lllayoutstack.cpp
View File

@ -593,7 +593,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)

1
indra/newview/llappearancemgr.cpp
View File

@ -1970,7 +1970,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())
{

12
indra/newview/llfloatertools.cpp
View File

@ -699,18 +699,6 @@ void LLFloaterTools::refresh()
selection_info << getString("status_selectcount", selection_args);
getChild<LLTextBox>("selection_count")->setText(selection_info.str());
bool have_selection = !LLSelectMgr::getInstance()->getSelection()->isEmpty();
// <FS:Ansariel> FIRE-13838 / VWR-29517: Text and link from other tools is presented in Land tool from Build floater
//childSetVisible("selection_count", have_selection);
//childSetVisible("remaining_capacity", have_selection);
//childSetVisible("selection_empty", !have_selection);
LLTool *tool = LLToolMgr::getInstance()->getCurrentTool();
bool land_visible = (tool == LLToolBrushLand::getInstance() || tool == LLToolSelectLand::getInstance() );
childSetVisible("selection_count", !land_visible && have_selection);
childSetVisible("remaining_capacity", !land_visible && have_selection);
childSetVisible("selection_empty", !land_visible && !have_selection);
// </FS:Ansariel>
}
// <FS> disable the object and prim counts if nothing selected

9
indra/newview/llinventorybridge.cpp
View File

@ -2316,15 +2316,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;
}
*/
// [SL:KB] - Patch: Inventory-Links | Checked: 2010-04-12 (Catznip-2.2.0a) | Added: Catznip-2.0.0a
// We'll allow copying a link if:
// - its target is available

4
indra/newview/llviewermenu.cpp
View File

@ -5178,10 +5178,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();
}
}

2
indra/newview/skins/default/xui/fr/notifications.xml
View File

@ -2928,7 +2928,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).
</notification>
<notification name="LoadWebPage">
Charger la page Web [URL] ?
Charger la page Web [URL] ?
[MESSAGE]