diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-27 13:01:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-27 13:01:55 -0500 |
| commit | 3ef1a5a5d2334a0cd498e959b983e0cdf626eaef (patch) | |
| tree | a461ec6fc7412cff158635afffb0c4336fcac470 /indra/newview/llsidetray.cpp | |
| parent | 3c1cafeac1312ec37ba80853e1b04e5768c20738 (diff) | |
| parent | 3eba59e963d87f54e1b33b0a34de3fe37e67ebe1 (diff) | |
merge changes for beta fixes
Diffstat (limited to 'indra/newview/llsidetray.cpp')
| -rw-r--r-- | indra/newview/llsidetray.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index aef665a35c..19d1bdee86 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -498,8 +498,8 @@ private: LLSideTray::Params::Params() : collapsed("collapsed",false), - tab_btn_image_normal("tab_btn_image",LLUI::getUIImage("sidebar_tab_left.tga")), - tab_btn_image_selected("tab_btn_image_selected",LLUI::getUIImage("button_enabled_selected_32x128.tga")), + tab_btn_image_normal("tab_btn_image",LLUI::getUIImage("taskpanel/TaskPanel_Tab_Off.png")), + tab_btn_image_selected("tab_btn_image_selected",LLUI::getUIImage("taskpanel/TaskPanel_Tab_Selected.png")), default_button_width("tab_btn_width",32), default_button_height("tab_btn_height",32), default_button_margin("tab_btn_margin",0) |