diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-03-19 20:49:02 +0200 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-03-19 20:49:02 +0200 |
| commit | ab23ae02291708ee703630b01982412d85417a1a (patch) | |
| tree | e1391aa678a2aa2ade5a370e9c24a0b205fef830 | |
| parent | 6583a6d648d2ad71d52a4bc47c0b009a71a3bf41 (diff) | |
Implemented normal task EXT-6379 ([TRUNCATION] [EN XUI REDESIGN] - Receiving Landmarks).
- Button order was fixed in changeset dd44dac25177. It was an implemetation of EXT-5906 (Reverse buttons order in the inventory offers). That changeset
was included in cumulative diff at https://codereview.productengine.com/secondlife/r/52/ and already made its way into viewer 2-0.
- This changeset removes inventory offer button truncation in IM in German locale by increasing default width of IM floater and decreasing distance between buttons.
Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/77/
--HG--
branch : product-engine
| -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" |