diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-03-19 14:57:38 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-03-19 14:57:38 -0400 |
| commit | a2bfe92369bb7a19a02c31a8f8b16646cb95c6dc (patch) | |
| tree | 2229262e3d66f51d0b9cac1a820f37fdef6048ac /indra/newview | |
| parent | 08d210c7e9db8688f41619dd370500d2fd22b40d (diff) | |
| parent | 0f620c10013ccac37986bf8583e4a18c41749a92 (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 4 |
2 files changed, 3 insertions, 3 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(); } } diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 25016e0673..422e50f035 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -13,7 +13,7 @@ can_minimize="true" can_close="true" visible="false" - width="360" + width="385" can_resize="true" min_width="250" min_height="190"> @@ -22,7 +22,7 @@ default_tab_group="2" follows="all" height="320" - width="360" + width="385" layout="topleft" orientation="horizontal" name="im_panels" |