diff options
| author | Eric Tulla <tulla@lindenlab.com> | 2009-10-16 20:11:51 +0000 |
|---|---|---|
| committer | Eric Tulla <tulla@lindenlab.com> | 2009-10-16 20:11:51 +0000 |
| commit | 850c0f1e33ed5188b5346a7aeb3099ca29e0d2d0 (patch) | |
| tree | 107b7c906cc689987f43c61c90fc74cd2cfe6306 /indra/newview/llfolderview.h | |
| parent | adaae9e082fb9200e2ea1c7cbc6e26cb5de35fa1 (diff) | |
Merge of latest avatar pipeline working branch into viewer2.0 branch.
Result of: (NO CONFLICTS)
svn merge -r 135985:136503 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-11 .
Diffstat (limited to 'indra/newview/llfolderview.h')
| -rw-r--r-- | indra/newview/llfolderview.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h index 69c0c5b132..c95dc6e5bd 100644 --- a/indra/newview/llfolderview.h +++ b/indra/newview/llfolderview.h @@ -104,8 +104,6 @@ public: Mandatory<LLPanel*> parent_panel; Optional<LLUUID> task_id; }; - LLFolderView( const std::string& name, LLUIImagePtr root_folder_icon, const LLRect& rect, - const LLUUID& source_id, LLPanel *parent_view ); LLFolderView(const Params&); virtual ~LLFolderView( void ); |