diff options
| author | Richard Linden <none@none> | 2010-07-09 14:26:56 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-07-09 14:26:56 -0700 |
| commit | 1f79bee86ee65a2eb3800db6be1853dd79d7a49d (patch) | |
| tree | da6b0df3f35ede4037a3e0bf36cf4c6d07dd4a28 /indra/newview/llsidetray.h | |
| parent | 419bfb16fdd9b79d32736fd80652685a07f9e39f (diff) | |
EXT-8237 FIX Opening up Edit Outfit- Add More->Shirt causes FPS to drop from 60fps to 18fps for a really long time
EXT-8235 FIX HUGE long delay when reopening and/or closing edit outfit sidepanel if "Add More..." is active
EXT-7695 FIX UI lockup after add wearable, right click av -> Change Outfit
reviewed by Vir
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; |