diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-22 16:12:41 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-22 16:12:41 -0700 |
| commit | 18b7ab0018695e261dbc5058d76f9d371958b034 (patch) | |
| tree | 9b4baa5a5ca563ace1b06ac6b3df9fd9c0a0d0f7 /indra/newview/llfolderview.h | |
| parent | 60c4621500e478d66a8bdc3a1c80573be2860fee (diff) | |
| parent | be139dfb957e1b0d3c59110284c43630d3b57d23 (diff) | |
Weekly automated merge from viewer 2.0
Diffstat (limited to 'indra/newview/llfolderview.h')
| -rw-r--r-- | indra/newview/llfolderview.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h index 38255b3cea..42390dfd17 100644 --- a/indra/newview/llfolderview.h +++ b/indra/newview/llfolderview.h @@ -93,8 +93,9 @@ class LLFolderView : public LLFolderViewFolder, public LLEditMenuHandler public: struct Params : public LLInitParam::Block<Params, LLFolderViewFolder::Params> { - Mandatory<LLPanel*> parent_panel; - Optional<LLUUID> task_id; + Mandatory<LLPanel*> parent_panel; + Optional<LLUUID> task_id; + Optional<std::string> title; }; LLFolderView(const Params&); virtual ~LLFolderView( void ); |