diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2009-08-20 00:21:14 +0000 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2009-08-20 00:21:14 +0000 |
| commit | 06b079a24b743088ca51eea1a627f0b4e1722458 (patch) | |
| tree | 97d80b66da06aea42ac2c35c318187051cc2b835 /indra/newview/llsidetray.cpp | |
| parent | 6bcf7a6fe64457ad5f1dc2939820e45182476842 (diff) | |
EXT-580 Add Friend button in the IM floater not disabled if already friends
EXT-579 Add Friend from the Im floater opens multiple invitation dialogs
sidebar should be up above bottom tray
reviewed by richard
Diffstat (limited to 'indra/newview/llsidetray.cpp')
| -rw-r--r-- | indra/newview/llsidetray.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index 0558cc3488..9990c22dac 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -34,6 +34,7 @@ #include "lltextbox.h" +#include "llbottomtray.h" #include "llsidetray.h" #include "llviewerwindow.h" #include "llaccordionctrl.h" @@ -650,7 +651,7 @@ void LLSideTray::setPanelRect () if(!mCollapsed) panel_width+=mMaxBarWidth; - S32 panel_height = parent_rect.getHeight()-fake_top_offset; + S32 panel_height = parent_rect.getHeight() - fake_top_offset - LLBottomTray::getInstance()->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); |