From bda0e60f98cc7e07fe50bff6a4842c2791ec3ef7 Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Tue, 16 Mar 2010 15:31:30 +0200
Subject: =?UTF-8?q?fix=20for=20normal=20EXT-6354=20[HARD=20CODED]=20-=20In?=
 =?UTF-8?q?ventory,=20Filter-popup:=20Title=20isn=D2=91t=20localized=20rev?=
 =?UTF-8?q?iwed=20https://codereview.productengine.com/secondlife/r/35/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/llfolderview.cpp           | 2 +-
 indra/newview/llfolderview.h             | 5 +++--
 indra/newview/llinventorypanel.cpp       | 1 +
 indra/newview/llpanelobjectinventory.cpp | 1 +
 indra/newview/llplacesinventorypanel.cpp | 1 +
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 0de41ee591..f74d912842 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -186,7 +186,7 @@ LLFolderView::LLFolderView(const Params& p)
 	mNeedsAutoRename(FALSE),
 	mDebugFilters(FALSE),
 	mSortOrder(LLInventoryFilter::SO_FOLDERS_BY_NAME),	// This gets overridden by a pref immediately
-	mFilter( new LLInventoryFilter(p.name) ),
+	mFilter( new LLInventoryFilter(p.title) ),
 	mShowSelectionContext(FALSE),
 	mShowSingleSelection(FALSE),
 	mArrangeGeneration(0),
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index 38255b3cea..42390dfd17 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -93,8 +93,9 @@ class LLFolderView : public LLFolderViewFolder, public LLEditMenuHandler
 public:
 	struct Params : public LLInitParam::Block<Params, LLFolderViewFolder::Params>
 	{
-		Mandatory<LLPanel*> parent_panel;
-		Optional<LLUUID>	task_id;
+		Mandatory<LLPanel*>	    parent_panel;
+		Optional<LLUUID>        task_id;
+		Optional<std::string>   title;
 	};
 	LLFolderView(const Params&);
 	virtual ~LLFolderView( void );
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 8097985ade..ec83a1fd6d 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -118,6 +118,7 @@ BOOL LLInventoryPanel::postBuild()
 						   0);
 		LLFolderView::Params p;
 		p.name = getName();
+		p.title = getLabel();
 		p.rect = folder_rect;
 		p.parent_panel = this;
 		p.tool_tip = p.name;
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index dedd1afcde..c14812ca17 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -1575,6 +1575,7 @@ void LLPanelObjectInventory::reset()
 	LLRect dummy_rect(0, 1, 1, 0);
 	LLFolderView::Params p;
 	p.name = "task inventory";
+	p.title = "task inventory";
 	p.task_id = getTaskUUID();
 	p.parent_panel = this;
 	p.tool_tip= p.name;
diff --git a/indra/newview/llplacesinventorypanel.cpp b/indra/newview/llplacesinventorypanel.cpp
index f1e450a083..ed0fb54051 100644
--- a/indra/newview/llplacesinventorypanel.cpp
+++ b/indra/newview/llplacesinventorypanel.cpp
@@ -92,6 +92,7 @@ BOOL LLPlacesInventoryPanel::postBuild()
 			0);
 		LLPlacesFolderView::Params p;
 		p.name = getName();
+		p.title = getLabel();
 		p.rect = folder_rect;
 		p.parent_panel = this;
 		mFolders = (LLFolderView*)LLUICtrlFactory::create<LLPlacesFolderView>(p);
-- 
cgit v1.2.3