diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-07-15 12:31:08 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-15 12:31:08 -0700 |
| commit | 5d85dad85f07ea23b3a2892276d8ac591a966864 (patch) | |
| tree | 97aa94cc757e24239f8b13c0cedb3e4a543fff06 /indra/newview/llsidetray.h | |
| parent | 4339600d43601f07d01c676cce5da17c2758c4cb (diff) | |
Reverted changeset 2bb10eae42bf
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 406cdc9055..3a8d308425 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<LLUIImage*> tab_btn_image_normal, - tab_btn_image_selected; + Optional<bool> collapsed; + Optional<std::string> tab_btn_image_normal; + Optional<std::string> tab_btn_image_selected; - Optional<S32> default_button_width, - default_button_height, - default_button_margin; + Optional<S32> default_button_width; + Optional<S32> default_button_height; + Optional<S32> default_button_margin; Params(); }; @@ -68,7 +68,7 @@ public: static LLSideTray* getInstance (); static bool instanceCreated (); protected: - LLSideTray(const Params& params); + LLSideTray(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; |