summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.h
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-11-05 09:27:10 -0800
committerRick Pasetto <rick@lindenlab.com>2009-11-05 09:27:10 -0800
commit270629a3fe453e75c0ffeb780419ad3e27eeaa34 (patch)
tree5bb2f6f3e6871bc0285ed5b34a0166fd25074d68 /indra/newview/llfolderview.h
parenta0bbe8d8eb98aaba1dc55c7cbcb70d58125781ce (diff)
parent6f6d1314e6f1fe12391391172bffa52c9c08e380 (diff)
merge from remote repo
Diffstat (limited to 'indra/newview/llfolderview.h')
-rw-r--r--indra/newview/llfolderview.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index ebfb4efde2..0bd65b5f90 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -192,7 +192,7 @@ public:
void propertiesSelectedItems( void );
// change the folder type
- void changeType(LLInventoryModel *model, LLAssetType::EType new_folder_type);
+ void changeType(LLInventoryModel *model, LLFolderType::EType new_folder_type);
void autoOpenItem(LLFolderViewFolder* item);
void closeAutoOpenedFolders();