diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-08 05:19:19 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-08 05:19:19 +0000 |
| commit | f26f7e3e29019abf3a10f6925e30baca19eb4e2d (patch) | |
| tree | 071fd0d451b482c9dd8376479b968da4aa099a78 /indra/newview/llsidetray.cpp | |
| parent | c5d100a9e4595c0d3bc685e0d6a2972ef228013d (diff) | |
merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> viewer-2-0
Also:
* Moved media remote shortcut to Communicate menu
* Changed mini map menu to toggle instead of show
Diffstat (limited to 'indra/newview/llsidetray.cpp')
| -rw-r--r-- | indra/newview/llsidetray.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index b7c4c74891..53b88ba430 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -45,7 +45,6 @@ #include "llfloater.h" //for gFloaterView #include "lliconctrl.h"//for Home tab icon #include "llwindow.h"//for SetCursor -#include "llbottomtray.h"//for reshape //#include "llscrollcontainer.h" @@ -733,9 +732,6 @@ void LLSideTray::setPanelRect () panel_width+=mMaxBarWidth; S32 panel_height = parent_rect.getHeight()-fake_top_offset; - if(gBottomTray) - panel_height -= gBottomTray->getRect().getHeight(); - LLRect panel_rect; panel_rect.setLeftTopAndSize( parent_rect.mRight-panel_width, parent_rect.mTop-fake_top_offset, panel_width, panel_height); setRect(panel_rect); |