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

Couple fix ups

Browse Source
This commit is contained in:
Lirusaito
2019-03-04 19:37:53 -05:00
parent e350824896
commit fcb751ae4a
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llinventorypanel.cpp
View File

@@ -299,7 +299,7 @@ class LLInventoryRecentItemsPanel : public LLInventoryPanel
public: public:
LLInventoryRecentItemsPanel(const std::string& name, LLInventoryRecentItemsPanel(const std::string& name,
const std::string& sort_order_setting, const std::string& sort_order_setting,
const std::string& start_folder, const LLSD& start_folder,
const LLRect& rect, const LLRect& rect,
LLInventoryModel* inventory, LLInventoryModel* inventory,
BOOL allow_multi_select, BOOL allow_multi_select,
@@ -332,7 +332,7 @@ LLView* LLInventoryPanel::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
if (node->getAttributeString("start_folder.type", start)) if (node->getAttributeString("start_folder.type", start))
start_folder["type"] = start; start_folder["type"] = start;
if(name == "Recent Items") if (name == "Recent Items")
panel = new LLInventoryRecentItemsPanel(name, sort_order, start_folder, panel = new LLInventoryRecentItemsPanel(name, sort_order, start_folder,
rect, &gInventory, rect, &gInventory,
allow_multi_select, parent); allow_multi_select, parent);
@@ -1382,12 +1382,12 @@ static const LLRecentInventoryBridgeBuilder RECENT_ITEMS_BUILDER;
LLInventoryRecentItemsPanel:: LLInventoryRecentItemsPanel(const std::string& name, LLInventoryRecentItemsPanel:: LLInventoryRecentItemsPanel(const std::string& name,
const std::string& sort_order_setting, const std::string& sort_order_setting,
const std::string& start_folder, const LLSD& start_folder,
const LLRect& rect, const LLRect& rect,
LLInventoryModel* inventory, LLInventoryModel* inventory,
BOOL allow_multi_select, BOOL allow_multi_select,
LLView *parent_view) : LLView *parent_view) :
LLInventoryPanel(name, sort_order_setting, start_folder,rect,inventory,allow_multi_select,parent_view) LLInventoryPanel(name, sort_order_setting,start_folder,rect,inventory,allow_multi_select,parent_view)
{ {
// replace bridge builder to have necessary View bridges. // replace bridge builder to have necessary View bridges.
mInvFVBridgeBuilder = &RECENT_ITEMS_BUILDER; mInvFVBridgeBuilder = &RECENT_ITEMS_BUILDER;

2
indra/newview/skins/default/xui/en-us/panel_marketplace_listings_inventory.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<inventory_panel <inventory_panel
label="ALL" label="All"
name="All Items" name="All Items"
help_topic="marketplace_tab" help_topic="marketplace_tab"
layout="topleft" layout="topleft"

2
indra/newview/skins/default/xui/en-us/panel_marketplace_listings_listed.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<inventory_panel <inventory_panel
label="LISTED" label="Listed"
name="Active Items" name="Active Items"
help_topic="marketplace_tab" help_topic="marketplace_tab"
layout="topleft" layout="topleft"

2
indra/newview/skins/default/xui/en-us/panel_marketplace_listings_unassociated.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<inventory_panel <inventory_panel
label="UNASSOCIATED" label="Unassociated"
name="Unassociated Items" name="Unassociated Items"
help_topic="marketplace_tab" help_topic="marketplace_tab"
layout="topleft" layout="topleft"

2
indra/newview/skins/default/xui/en-us/panel_marketplace_listings_unlisted.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<inventory_panel <inventory_panel
label="UNLISTED" label="Unlisted"
name="Inactive Items" name="Inactive Items"
help_topic="marketplace_tab" help_topic="marketplace_tab"
layout="topleft" layout="topleft"