Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync? I dunno, not important.

Browse Source
This commit is contained in:
Lirusaito
2019-03-07 13:37:39 -05:00
parent c7de0ccf99
commit 7c3ba8bd9a
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llfolderview.cpp
View File

@@ -957,12 +957,7 @@ void LLFolderView::draw()
} }
else else
{ {
// if(getFilter()) mStatusText = LLTrans::getString("InventoryNoMatchingItems"); //, args);
// {
// LLStringUtil::format_map_t args;
// args["[SEARCH_TERM]"] = LLURI::escape(getFilter().getFilterSubStringOrig());
mStatusText = LLTrans::getString("InventoryNoMatchingItems"); //, args);
// }
} }
mStatusTextBox->setWrappedText(mStatusText); mStatusTextBox->setWrappedText(mStatusText);
mStatusTextBox->setVisible( TRUE ); mStatusTextBox->setVisible( TRUE );

3
indra/newview/llfolderview.h
View File

@@ -104,6 +104,9 @@ public:
void setSelectCallback(const signal_t::slot_type& cb) { mSelectSignal.connect(cb); } void setSelectCallback(const signal_t::slot_type& cb) { mSelectSignal.connect(cb); }
void setReshapeCallback(const signal_t::slot_type& cb) { mReshapeSignal.connect(cb); } void setReshapeCallback(const signal_t::slot_type& cb) { mReshapeSignal.connect(cb); }
void setAllowMultiSelect(BOOL allow) { mAllowMultiSelect = allow; } void setAllowMultiSelect(BOOL allow) { mAllowMultiSelect = allow; }
void setShowEmptyMessage(bool show) { mShowEmptyMessage = show; }
/*void setShowItemLinkOverlays(bool show) { mShowItemLinkOverlays = show; }
void setAllowDropOnRoot(bool show) { mAllowDropOnRoot = show; }*/
LLInventoryFilter& getFilter() { return mFilter; } LLInventoryFilter& getFilter() { return mFilter; }
const std::string getFilterSubString(BOOL trim = FALSE); const std::string getFilterSubString(BOOL trim = FALSE);

7
indra/newview/llinventorypanel.cpp
View File

@@ -142,6 +142,8 @@ LLInventoryPanel::LLInventoryPanel(const std::string& name,
mSortOrderSetting(sort_order_setting), mSortOrderSetting(sort_order_setting),
mStartFolder(start_folder), mStartFolder(start_folder),
mShowRootFolder(false), mShowRootFolder(false),
mShowEmptyMessage(true),
//mShowItemLinkOverlays(false),
mAllowDropOnRoot(true), mAllowDropOnRoot(true),
mAllowWear(true), mAllowWear(true),
mUseMarketplaceFolders(false), mUseMarketplaceFolders(false),
@@ -351,6 +353,8 @@ LLView* LLInventoryPanel::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
// Singu TODO: Turn these into mParams like upstream. // Singu TODO: Turn these into mParams like upstream.
node->getAttribute_bool("show_root_folder", panel->mShowRootFolder); node->getAttribute_bool("show_root_folder", panel->mShowRootFolder);
node->getAttribute_bool("show_empty_message", panel->mShowEmptyMessage);
//node->getAttribute_bool("show_item_link_overlays", panel->mShowItemLinkOverlays);
node->getAttribute_bool("allow_drop_on_root", panel->mAllowDropOnRoot); node->getAttribute_bool("allow_drop_on_root", panel->mAllowDropOnRoot);
node->getAttribute_bool("allow_wear", panel->mAllowWear); node->getAttribute_bool("allow_wear", panel->mAllowWear);
node->getAttribute_bool("use_marketplace_folders", panel->mUseMarketplaceFolders); node->getAttribute_bool("use_marketplace_folders", panel->mUseMarketplaceFolders);
@@ -803,6 +807,9 @@ LLFolderView * LLInventoryPanel::createFolderView(LLInvFVBridge * bridge, bool u
bridge, bridge,
mGroupedItemBridge); mGroupedItemBridge);
ret->setAllowMultiSelect(mAllowMultiSelect); ret->setAllowMultiSelect(mAllowMultiSelect);
ret->setShowEmptyMessage(mShowEmptyMessage);
/*ret->setShowItemLinkOverlays(mShowItemLinkOverlays);
ret->setAllowDropOnRoot(mAllowDropOnRoot);*/
return ret; return ret;
} }

2
indra/newview/llinventorypanel.h
View File

@@ -238,6 +238,8 @@ public:
private: private:
LLSD mStartFolder; LLSD mStartFolder;
bool mShowRootFolder; bool mShowRootFolder;
bool mShowEmptyMessage;
//bool mShowItemLinkOverlays;
bool mAllowDropOnRoot; bool mAllowDropOnRoot;
bool mAllowWear; bool mAllowWear;
bool mUseMarketplaceFolders; bool mUseMarketplaceFolders;