diff options
| author | Chuck Linden <chuck@lindenlab.com> | 2010-02-18 11:13:54 -0500 |
|---|---|---|
| committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-18 11:13:54 -0500 |
| commit | 1ca9c1dcfef3a935be30a5322c91d5e3df523a98 (patch) | |
| tree | 50aa5ccc5924d4296454dd3e8dcee7edddaf520b /indra/newview/llnearbychathandler.cpp | |
| parent | 1ae70e112a466a6ed5baf4e05c1771218c78b2f5 (diff) | |
| parent | 9dfff8c6d2a54e3f6e069c26cc8753dc9331aec1 (diff) | |
Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
| -rw-r--r-- | indra/newview/llnearbychathandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp index 29e3c66684..3c390c0281 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -282,7 +282,7 @@ void LLNearbyChatScreenChannel::showToastsBottom() gFloaterView->sendChildToBack(toast); } - bottom = toast->getRect().mTop; + bottom = toast->getRect().mTop - toast->getTopPad(); } } } |