diff options
| author | Richard Linden <none@none> | 2010-07-27 14:22:14 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-07-27 14:22:14 -0700 |
| commit | 15247f086989a43881d79c1ee5416bb00721eb68 (patch) | |
| tree | e77d629f6d03ed7ca471e77ccefcd9437be82c49 /indra/newview/llsidetray.h | |
| parent | 5d85dad85f07ea23b3a2892276d8ac591a966864 (diff) | |
Backed out changeset: 58571b4e704b
Diffstat (limited to 'indra/newview/llsidetray.h')
| -rw-r--r-- | indra/newview/llsidetray.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llsidetray.h b/indra/newview/llsidetray.h index 3a8d308425..406cdc9055 100644 --- a/indra/newview/llsidetray.h +++ b/indra/newview/llsidetray.h @@ -54,13 +54,13 @@ public: : public LLInitParam::Block<Params, LLPanel::Params> { // initial state - Optional<bool> collapsed; - Optional<std::string> tab_btn_image_normal; - Optional<std::string> tab_btn_image_selected; + Optional<bool> collapsed; + Optional<LLUIImage*> tab_btn_image_normal, + tab_btn_image_selected; - Optional<S32> default_button_width; - Optional<S32> default_button_height; - Optional<S32> default_button_margin; + Optional<S32> default_button_width, + default_button_height, + default_button_margin; Params(); }; @@ -68,7 +68,7 @@ public: static LLSideTray* getInstance (); static bool instanceCreated (); protected: - LLSideTray(Params& params); + LLSideTray(const Params& params); typedef std::vector<LLSideTrayTab*> child_vector_t; typedef child_vector_t::iterator child_vector_iter_t; typedef child_vector_t::const_iterator child_vector_const_iter_t; |