aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index ef0eddc..37ac5ea 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
12009-10-13 McCabe Maxsted <hakushakukun@gmail.com> 12009-10-13 McCabe Maxsted <hakushakukun@gmail.com>
2 2
3 * Added history button for group chat as well.
4
5 modified: linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
6
7
3 * Disable IM history button for Linux and Mac users. 8 * Disable IM history button for Linux and Mac users.
4 9
5 modified: linden/indra/newview/llimpanel.cpp 10 modified: linden/indra/newview/llimpanel.cpp
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index 1156e9d..2e97d64 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -54,6 +54,8 @@
54 image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" 54 image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
55 label="End Call" left_delta="0" name="end_call_btn" pad_right="12" 55 label="End Call" left_delta="0" name="end_call_btn" pad_right="12"
56 visible="false" width="92" /> 56 visible="false" width="92" />
57 <button bottom="-20" follows="left|top" halign="center" height="20" label="History" left_delta="97"
58 name="history_btn" visible="true" width="85" />
57 <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" 59 <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
58 label_selected="&gt; &gt;" left="143" name="toggle_active_speakers_btn" 60 label_selected="&gt; &gt;" left="143" name="toggle_active_speakers_btn"
59 right="176" 61 right="176"