summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.h
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-11-04 16:13:07 -0800
committerRick Pasetto <rick@lindenlab.com>2009-11-04 16:13:07 -0800
commite1c5abce9309a89bd9993264bca8dadadf882c6f (patch)
tree81e1f91811b207abd4dfe4c82db31583d92df212 /indra/newview/llinventorypanel.h
parent33eac5dc0a1dfc0624dcfc75bec35155fbb9c917 (diff)
parent0bd2567bf5648808a95c7826581199bb371597cb (diff)
merge with remote repo
Diffstat (limited to 'indra/newview/llinventorypanel.h')
-rw-r--r--indra/newview/llinventorypanel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 997678a478..9f74fad5c1 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -122,7 +122,7 @@ public:
// Call this method to set the selection.
void openAllFolders();
- void openDefaultFolderForType(LLAssetType::EType);
+ void openDefaultFolderForType(LLFolderType::EType);
void setSelection(const LLUUID& obj_id, BOOL take_keyboard_focus);
void setSelectCallback(const LLFolderView::signal_t::slot_type& cb) { if (mFolders) mFolders->setSelectCallback(cb); }
void clearSelection();