diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-30 14:26:20 -0400 | 
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-30 14:26:20 -0400 | 
| commit | 04d5a079494c78d86df3ee76da079be1f4a9f406 (patch) | |
| tree | 8b585f8ed525a964c06fe05db4679b6a703777aa /indra | |
| parent | c97ddff395cfe8f8b6164cb3e09eeaa8cf354337 (diff) | |
| parent | 6416ba767fb029ab9d45e0ddea5a97926f17b087 (diff) | |
merge changes for storm-1862
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 7 | 
1 files changed, 4 insertions, 3 deletions
| 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 ca73883e53..82014e8836 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -46,7 +46,7 @@         tab_group="2"         top="0"         height="200" -	     width="254" +	     width="244"         user_resize="true">          <button            height="20" @@ -73,10 +73,11 @@           parse_highlights="true"           parse_urls="true"          left="1" -         width="249"> +         width="238">          </chat_history>          <line_editor           bottom="0" +         left="3"           follows="left|right|bottom"  	 font="SansSerifSmall"           height="20" @@ -84,7 +85,7 @@           layout="bottomleft"           name="chat_editor"           tab_group="3" -         width="249"> +         width="236">          </line_editor>      </layout_panel>    </layout_stack> | 
