diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-14 16:49:11 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-14 16:49:11 -0700 |
| commit | fc2bd1cce2e6c213fa682b9768d435a4e394a95e (patch) | |
| tree | dba1adbac8c96a093a0dfd5f54b7eccd65bf2233 /indra/newview/llnearbychathandler.cpp | |
| parent | 4c6f04c50225a4a5494974c3a6e13bee76cfbb6f (diff) | |
| parent | cf98cdf69f481dd473363d4a80a80f27e96f87e8 (diff) | |
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
| -rw-r--r-- | indra/newview/llnearbychathandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp index 573985b76e..3faf190618 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -29,7 +29,6 @@ #include "llagentdata.h" // for gAgentID #include "llnearbychathandler.h" -#include "llbottomtray.h" #include "llchatitemscontainerctrl.h" #include "llfirstuse.h" #include "llfloaterscriptdebug.h" @@ -374,7 +373,7 @@ void LLNearbyChatScreenChannel::arrangeToasts() if (!getParent()) { - // connect to floater snap region to get resize events + // connect to floater snap region just to get resize events, we don't care about being a proper widget floater_snap_region->addChild(this); setFollows(FOLLOWS_ALL); } @@ -384,11 +383,12 @@ void LLNearbyChatScreenChannel::arrangeToasts() LLRect channel_rect; floater_snap_region->localRectToOtherView(floater_snap_region->getLocalRect(), &channel_rect, gFloaterView); + channel_rect.mLeft += 10; channel_rect.mRight = channel_rect.mLeft + 300; S32 channel_bottom = channel_rect.mBottom; - S32 bottom = channel_bottom; + S32 bottom = channel_bottom + 10; S32 margin = gSavedSettings.getS32("ToastGap"); //sort active toasts |