summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2010-03-19 17:54:23 -0400
committerbrad kittenbrink <brad@lindenlab.com>2010-03-19 17:54:23 -0400
commit4b6b0fda9dae6bb35353b4a6280ce0e36af7798b (patch)
tree43e8b2b9b8785f02fa60bc2e022c527880fc7f5a /indra/newview/llchathistory.cpp
parent241988c4086e85fc34cd4344b6483d4224385be7 (diff)
parent25a8ccd36427cb2e30dd140ac1fa1fa6639b5de4 (diff)
Merge llqtwebkit package fix take 3 with viewer-2-0 tip.
Diffstat (limited to 'indra/newview/llchathistory.cpp')
-rw-r--r--indra/newview/llchathistory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index ac60fe6ba6..ffa24a0c15 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -776,7 +776,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
button->getRect().mBottom));
button->setAutoResize(true);
button->autoResize();
- offset += 2 * HPAD + button->getRect().getWidth();
+ offset += HPAD + button->getRect().getWidth();
button->setFollowsNone();
}
}