diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:48:56 -0800 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:48:56 -0800 |
commit | e0efa1dfa236f8a52a88212298b6e5113ef8f07a (patch) | |
tree | 9a94d26d308981d2070129147b9ba751118bdd76 /indra/newview/llnearbychathandler.cpp | |
parent | ef9b7c5b36c7521c4519e682aa312c4c25c31c2f (diff) | |
parent | 890ec637d41330a2a91d23b09b6aaaf49738d19a (diff) |
Automated merge with ssh://hg.lindenlab.com/q/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(); } } } |