From fefb08eef53da3cb0204d31f349aabfa6369f10b Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Mon, 7 Dec 2009 13:21:42 +0000 Subject: DEV-43799: Make the search web view be 650x600. --- indra/newview/skins/default/xui/en/floater_search.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index d363452204..c5d6f885d3 100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -1,8 +1,8 @@ + width="670"> http://eniac21.lindenlab.com:10001/viewer @@ -25,21 +25,20 @@ Done + width="650"> + width="650"> + height="600" + width="650" /> Date: Mon, 7 Dec 2009 14:25:21 +0000 Subject: EXT-3189: Fix tab order and location of Grid pulldown. The (optional) Grid pulldown on the login screen is now located below the Starting Location pulldown, rather than below the Last Name text entry field. The tab order is also now more obvious. --- indra/newview/skins/default/xui/en/panel_login.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 0bc2b44ad5..efe26d3887 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -75,16 +75,6 @@ tool_tip="[SECOND_LIFE] Last Name" top_delta="0" width="135" /> - + Date: Mon, 7 Dec 2009 11:43:24 -0500 Subject: EXT-3124 : Add lookup for finding all linked items to an item EXT-3195 : Regenerat Links sometimes pairs to library items Excluding library when repairing broken links. Reselecting original selected broken link after repairing. --HG-- branch : avatar-pipeline --- indra/newview/llpanelmaininventory.cpp | 6 ++++-- indra/newview/llviewerinventory.cpp | 23 +---------------------- 2 files changed, 5 insertions(+), 24 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 92b4c8383e..44d32cdc99 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -968,14 +968,16 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata) } if (command_name == "regenerate_link") { - LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem(); + LLInventoryPanel *active_panel = getActivePanel(); + LLFolderViewItem* current_item = active_panel->getRootFolder()->getCurSelectedItem(); if (!current_item) { return; } - const LLUUID& item_id = current_item->getListener()->getUUID(); + const LLUUID item_id = current_item->getListener()->getUUID(); LLViewerInventoryItem *item = gInventory.getItem(item_id); item->regenerateLink(); + active_panel->setSelection(item_id, TAKE_FOCUS_NO); } if (command_name == "find_original") { diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index f20d87a687..3019d714fd 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -1464,30 +1464,9 @@ LLUUID find_possible_item_for_regeneration(const LLViewerInventoryItem *target_i { LLViewerInventoryCategory::cat_array_t cats; LLViewerInventoryItem::item_array_t items; - /* - LLAssetIDMatches asset_id_matches(target_item->getAssetUUID()); - gInventory.collectDescendentsIf(LLUUID::null, - cats, - items, - LLInventoryModel::EXCLUDE_TRASH, - asset_id_matches); - for (LLViewerInventoryItem::item_array_t::const_iterator item_iter = items.begin(); - item_iter != items.end(); - item_iter++) - { - const LLViewerInventoryItem *item = (*item_iter); - if (!item->getIsBrokenLink()) - { - return item->getAssetUUID(); - } - } - */ - - items.clear(); - cats.clear(); LLRegenerateLinkCollector candidate_matches(target_item); - gInventory.collectDescendentsIf(LLUUID::null, + gInventory.collectDescendentsIf(gInventory.getRootFolderID(), cats, items, LLInventoryModel::EXCLUDE_TRASH, -- cgit v1.2.3 From ff7f3c348d5b08dfa817ebe2c9e1405879a5b8be Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 7 Dec 2009 13:06:24 -0500 Subject: EXT-3124 : Add lookup for finding all linked items to an item Commented this feature out since the viewer can't ask the server to change assetIDs of its inventory items. --HG-- branch : avatar-pipeline --- indra/newview/llpanelmaininventory.cpp | 3 ++- indra/newview/llviewerinventory.cpp | 4 +++- .../skins/default/xui/en/menu_inventory_gear_default.xml | 11 ----------- 3 files changed, 5 insertions(+), 13 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 44d32cdc99..9fd92725dc 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -966,6 +966,7 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata) preview_texture->openToSave(); } } + // This doesn't currently work, since the viewer can't change an assetID an item. if (command_name == "regenerate_link") { LLInventoryPanel *active_panel = getActivePanel(); @@ -1065,7 +1066,7 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata) } return FALSE; } - + // This doesn't currently work, since the viewer can't change an assetID an item. if (command_name == "regenerate_link") { LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem(); diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 3019d714fd..5da77ecdb9 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -1481,6 +1481,8 @@ LLUUID find_possible_item_for_regeneration(const LLViewerInventoryItem *target_i return LLUUID::null; } +// This currently dosen't work, because the sim does not allow us +// to change an item's assetID. BOOL LLViewerInventoryItem::regenerateLink() { const LLUUID target_item_id = find_possible_item_for_regeneration(this); @@ -1489,7 +1491,7 @@ BOOL LLViewerInventoryItem::regenerateLink() LLViewerInventoryCategory::cat_array_t cats; LLViewerInventoryItem::item_array_t items; LLAssetIDMatches asset_id_matches(getAssetUUID()); - gInventory.collectDescendentsIf(LLUUID::null, + gInventory.collectDescendentsIf(gInventory.getRootFolderID(), cats, items, LLInventoryModel::EXCLUDE_TRASH, diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml index e5592c3c57..4e6a07d020 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml @@ -111,15 +111,4 @@ function="Inventory.GearDefault.Enable" parameter="find_links" /> - - - - -- cgit v1.2.3