diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterconversationpreview.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_conversation_preview.xml | 28 |
2 files changed, 2 insertions, 28 deletions
diff --git a/indra/newview/llfloaterconversationpreview.cpp b/indra/newview/llfloaterconversationpreview.cpp index 9ea35fcbad..dbcf154ef2 100644 --- a/indra/newview/llfloaterconversationpreview.cpp +++ b/indra/newview/llfloaterconversationpreview.cpp @@ -65,8 +65,6 @@ BOOL LLFloaterConversationPreview::postBuild() std::string title = getString("Title", args); setTitle(title); - getChild<LLLineEditor>("description")->setValue(name); - LLLogChat::loadChatHistory(file, mMessages, true); mCurrentPage = mMessages.size() / mPageSize; diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml index d74c2c252d..825a88e4e1 100644 --- a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml @@ -14,41 +14,17 @@ name="Title"> CONVERSATION: [NAME] </floater.string> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="19" - layout="topleft" - left="10" - name="desc txt" - top="22" - width="90"> - Description: - </text> - <line_editor - border_style="line" - border_thickness="1" - enabled="false" - follows="left|top|right" - font="SansSerif" - height="22" - layout="topleft" - left_pad="0" - max_length_bytes="127" - name="description" - width="296" /> <chat_history font="SansSerifSmall" follows="all" visible="true" - height="310" + height="330" name="chat_history" notify_unread_msg="false" parse_highlights="true" parse_urls="true" left="5" + top_pad="25" width="390"> </chat_history> <text |