diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-03 18:52:55 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-03 18:52:55 -0700 |
| commit | ca8bac23949c361eea2d33198a8211ed1d8f15c3 (patch) | |
| tree | 47dadd0308513c7302c5c5193b66436457d7f7b1 /indra/newview/lltoolbarview.h | |
| parent | daae211fe3e2d1da3623951b1166473c53ce5808 (diff) | |
| parent | edacb7b3363dca6cd28a4ff7ea27154d6a30702f (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/lltoolbarview.h')
| -rw-r--r-- | indra/newview/lltoolbarview.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoolbarview.h b/indra/newview/lltoolbarview.h index b7d3a4033a..dc27fc2ffa 100644 --- a/indra/newview/lltoolbarview.h +++ b/indra/newview/lltoolbarview.h @@ -50,7 +50,7 @@ public: // the user folder for the user specific (saved) settings struct Toolbar : public LLInitParam::Block<Toolbar> { - Mandatory<U32> button_display_mode; + Mandatory<LLToolBarEnums::ButtonType> button_display_mode; Multiple<LLCommandId::Params> commands; Toolbar(); }; @@ -73,7 +73,7 @@ public: bool loadToolbars(bool force_default = false); // return false if load fails static bool loadDefaultToolbars(); - + static void startDragItem( S32 x, S32 y, const LLUUID& uuid); static BOOL handleDragItem( S32 x, S32 y, const LLUUID& uuid, LLAssetType::EType type); static BOOL handleDrop( EDragAndDropType cargo_type, void* cargo_data, const LLUUID& folder_id); |