diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-04 15:14:54 -0800 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-04 15:14:54 -0800 |
| commit | fa3b57bd9f0afcf2d38dae27d4b9765624baf758 (patch) | |
| tree | ff083f4e4eec5d6d4e9191f34cae6450e0a318ac /indra/newview/llfolderview.h | |
| parent | 0e63920569302a4f6afcbc0feb28ff379e4a4bac (diff) | |
| parent | b806edf4ac47d18e1a43fb8dbb5fbcad8d13192f (diff) | |
Merge the work lost in 49c9461937df back into the tree
Diffstat (limited to 'indra/newview/llfolderview.h')
| -rw-r--r-- | indra/newview/llfolderview.h | 2 |
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(); |