summaryrefslogtreecommitdiff
path: root/indra/newview/lltoastimpanel.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-02-23 11:10:13 -0700
committerXiaohong Bao <bao@lindenlab.com>2011-02-23 11:10:13 -0700
commitbfa25219b899636db74bedc258bc763caf91ddf0 (patch)
treed9d82b63d9d5d3d784b4bee852f9caed2c897a71 /indra/newview/lltoastimpanel.cpp
parentbcb5b209d1813681202524362dd186c8b0982357 (diff)
parent01cdeb0cdd8c48b76a229d42ced4e5563cd18c5c (diff)
Automated merge with ssh://hg.lindenlab.com/bao/private-memory-pool
Diffstat (limited to 'indra/newview/lltoastimpanel.cpp')
-rw-r--r--indra/newview/lltoastimpanel.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltoastimpanel.cpp b/indra/newview/lltoastimpanel.cpp
index 1d8b82ec1b..e0cb200ef5 100644
--- a/indra/newview/lltoastimpanel.cpp
+++ b/indra/newview/lltoastimpanel.cpp
@@ -141,7 +141,8 @@ void LLToastIMPanel::spawnNameToolTip()
{
// Spawn at right side of the name textbox.
LLRect sticky_rect = mAvatarName->calcScreenRect();
- S32 icon_x = llmin(sticky_rect.mLeft + mAvatarName->getTextPixelWidth() + 3, sticky_rect.mRight - 16);
+ S32 icon_x =
+ llmin(sticky_rect.mLeft + mAvatarName->getTextPixelWidth() + 3, sticky_rect.mRight);
LLCoordGL pos(icon_x, sticky_rect.mTop);
LLToolTip::Params params;