SL-19273 Show message when folder is empty or if no search results

meow-7.2.2
Maxim Nikolenko 2023-02-27 18:02:19 +02:00
parent 8795da7c83
commit cb7debd70d
4 changed files with 6 additions and 5 deletions

View File

@ -67,8 +67,8 @@ public:
class Impl;
friend class Impl;
static const S32 LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MAX;
static const S32 LLFloaterSimpleSnapshot::THUMBNAIL_SNAPSHOT_DIM_MIN;
static const S32 THUMBNAIL_SNAPSHOT_DIM_MAX;
static const S32 THUMBNAIL_SNAPSHOT_DIM_MIN;
private:
void onSend();

View File

@ -2045,6 +2045,8 @@ LLInventorySingleFolderPanel::LLInventorySingleFolderPanel(const Params& params)
: LLInventoryPanel(params)
{
getFilter().setSingleFolderMode(true);
getFilter().setEmptyLookupMessage("InventorySingleFolderNoMatches");
getFilter().setDefaultEmptyLookupMessage("InventorySingleFolderEmpty");
mCommitCallbackRegistrar.add("Inventory.OpenSelectedFolder", boost::bind(&LLInventorySingleFolderPanel::openInCurrentWindow, this, _2));
}
@ -2166,8 +2168,6 @@ void LLInventorySingleFolderPanel::updateSingleFolderRoot()
mFolderRoot.get()->setCallbackRegistrar(&mCommitCallbackRegistrar);
buildNewViews(mFolderID);
mFolderRoot.get()->setShowEmptyMessage(false);
}
}

View File

@ -279,7 +279,6 @@
width="312">
<single_folder_inventory_panel
name="single_folder_inv"
show_empty_message="false"
follows="all"
left="0"
top="0"

View File

@ -2306,6 +2306,8 @@ For AI Character: Get the closest navigable point to the point provided.
<string name="FavoritesNoMatchingItems">To add a place to your favorites, click the star to the right of the location name, then save the landmark to "Favorites bar".</string>
<string name="MarketplaceNoListing">You have no listings yet.</string>
<string name="MarketplaceNoMatchingItems">No items found. Check the spelling of your search string and try again.</string>
<string name="InventorySingleFolderEmpty">Folder is empty.</string>
<string name="InventorySingleFolderNoMatches">No matches.</string>
<string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string>
<string name="InventoryInboxNoItems">Your Marketplace purchases will appear here. You may then drag them into your inventory to use them.</string>
<string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string>