diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-10-04 15:10:12 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-10-04 15:10:12 -0700 |
| commit | 4716969716245ea832400dd087c93a514770cd63 (patch) | |
| tree | 3efbf5bf9197e7ab2c22507456d7f3bc99ed3c17 /indra | |
| parent | fc6c3fbe4271dcd9b64bdfd417514dc97ad7dd75 (diff) | |
EXP-1293 Nearby chat toasts no longer appear
EXP-1294 Nearby chat floater doesn't accommodate existing chat history when expanded
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llnearbychatbar.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_chat_bar.xml | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp index dbe30e1847..cba4fafe42 100644 --- a/indra/newview/llnearbychatbar.cpp +++ b/indra/newview/llnearbychatbar.cpp @@ -53,6 +53,8 @@ S32 LLNearbyChatBar::sLastSpecialChatChannel = 0; +const S32 EXPANDED_HEIGHT = 300; + // legacy callback glue void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel); @@ -448,13 +450,15 @@ BOOL LLNearbyChatBar::postBuild() // Register for font change notifications LLViewerChat::setFontChangedCallback(boost::bind(&LLNearbyChatBar::onChatFontChange, this, _1)); + mExpandedHeight = getMinHeight() + EXPANDED_HEIGHT; + return TRUE; } void LLNearbyChatBar::applyRectControl() { LLFloater::applyRectControl(); - if (getRect().getHeight() > getMinHeight()) + if (getRect().getHeight() > getMinHeight()) { getChildView("nearby_chat")->setVisible(true); mExpandedHeight = getRect().getHeight(); diff --git a/indra/newview/skins/default/xui/en/floater_chat_bar.xml b/indra/newview/skins/default/xui/en/floater_chat_bar.xml index 9d61c94eb1..6977e29b78 100644 --- a/indra/newview/skins/default/xui/en/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/en/floater_chat_bar.xml @@ -2,7 +2,7 @@ <floater height="60" layout="topleft" - legacy_header_height="20" + legacy_header_height="25" single_instance="true" title="Nearby chat" save_rect="true" @@ -38,7 +38,7 @@ text_pad_left="5" text_pad_right="25" tool_tip="Press Enter to say, Ctrl+Enter to shout" - top="0" + top="2" width="335" /> <output_monitor auto_update="true" @@ -49,14 +49,14 @@ left_pad="-24" mouse_opaque="true" name="chat_zone_indicator" - top="4" + top="6" visible="true" width="20" /> <button follows="right" is_toggle="true" width="20" - top="0" + top="2" layout="topleft" left_pad="12" image_disabled="ComboButton_UpOff" |