diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2013-01-08 19:59:27 +0200 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2013-01-08 19:59:27 +0200 |
| commit | df5378cf38b0e8325ae41be8af772e30cb815dd4 (patch) | |
| tree | d85bb961e4e8983a887d4aad9e8808e1b2a118ea /indra/newview | |
| parent | 3cf2d8e9eac215024bc216958b0920e61aa25de1 (diff) | |
CHUI-611 Fixed! Text in torn off message panel not wrapping correctly with size of conversation panel
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_container.xml | 30 |
2 files changed, 9 insertions, 23 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 82563b8736..38528f18f0 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -162,7 +162,7 @@ BOOL LLFloaterIMContainer::postBuild() setTabContainer(getChild<LLTabContainer>("im_box_tab_container")); mStubPanel = getChild<LLPanel>("stub_panel"); - mStubTextBox = getChild<LLTextBox>("stub_textbox_2"); + mStubTextBox = getChild<LLTextBox>("stub_textbox"); mStubTextBox->setURLClickedCallback(boost::bind(&LLFloaterIMContainer::returnFloaterToHost, this)); mConversationsStack = getChild<LLLayoutStack>("conversations_stack"); diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index 951665552f..12c1676127 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -161,32 +161,18 @@ <text type="string" clip_partial="false" - follows="left|top" + follows="left|top|right" layout="topleft" - left="20" - right="-20" - name="stub_textbox_1" - top="30" - height="20" - valign="center" - wrap="true"> - This conversation is in a separate window. - </text> - <text - type="string" - clip_partial="false" - follows="left|top" - layout="topleft" - left="20" - right="-20" - name="stub_textbox_2" - top="60" - height="20" + left="15" + right="-15" + name="stub_textbox" + top="25" + height="40" valign="center" parse_urls="true" wrap="true"> - [secondlife:/// Bring it back.] - </text> + This conversation is in a separate window. [secondlife:/// Bring it back.] + </text> </panel> </panel_container> </layout_panel> |