livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-611 Fixed! Text in torn off message panel not wrapping correctly with size of conversation panel

meow-7.2.2
AlexanderP ProductEngine 2013-01-08 19:59:27 +02:00
parent 3cf2d8e9ea
commit df5378cf38
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloaterimcontainer.cpp
View File

@ -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");

30
indra/newview/skins/default/xui/en/floater_im_container.xml
View File

@ -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>