From a3ba111e39be0bfa0278dfce66f4608fac7c0aa2 Mon Sep 17 00:00:00 2001 From: Eric Tulla Date: Wed, 30 Sep 2009 16:05:41 +0000 Subject: Cherry pick of simple fix for duplicate inventory folders (one non working) in some inventory panel views. Result of: svn merge -c 134827 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-10 . --- indra/newview/llfloaterinventory.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfloaterinventory.h') diff --git a/indra/newview/llfloaterinventory.h b/indra/newview/llfloaterinventory.h index a40efe020b..1aaac74c87 100644 --- a/indra/newview/llfloaterinventory.h +++ b/indra/newview/llfloaterinventory.h @@ -179,6 +179,7 @@ protected: LLScrollContainer* mScroller; BOOL mAllowMultiSelect; std::string mSortOrderSetting; + bool mHasInventoryConnection; }; class LLFloaterInventory; -- cgit v1.2.3