aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index c7afd46..5482255 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,10 @@
1 1
22008-11-23 McCabe Maxsted <hakushakukun@gmail.com> 22008-11-23 McCabe Maxsted <hakushakukun@gmail.com>
3 3
4 * linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml:
5 Moved 'Offer Teleport' in IM to be on the left side.
6
7
4 * linden/indra/newview/skins/default/xui/en-us/panel_groups.xml: 8 * linden/indra/newview/skins/default/xui/en-us/panel_groups.xml:
5 Switched Invite and Leave buttons in group panel. 9 Switched Invite and Leave buttons in group panel.
6 10
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index c3058c4..076598c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -36,9 +36,12 @@
36 </string> 36 </string>
37 <button bottom="-40" follows="left|top" height="20" label="Profile..." left="5" 37 <button bottom="-40" follows="left|top" height="20" label="Profile..." left="5"
38 name="profile_callee_btn" width="80" /> 38 name="profile_callee_btn" width="80" />
39 <button bottom_delta="0" follows="left|top" font="SansSerif"
40 halign="center" bottom ="-40" height="20" label="Offer Teleport" left_delta="85"
41 mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
39 <button bottom="-40" follows="left|top" halign="center" height="20" 42 <button bottom="-40" follows="left|top" halign="center" height="20"
40 image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" 43 image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
41 label="Call" left_delta="85" name="start_call_btn" width="100" /> 44 label="Call" left_delta="107" name="start_call_btn" width="100" />
42 <button bottom="-40" follows="left|top" halign="center" height="20" 45 <button bottom="-40" follows="left|top" halign="center" height="20"
43 image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" 46 image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
44 label="End Call" left_delta="0" name="end_call_btn" pad_right="10" 47 label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
@@ -51,9 +54,6 @@
51 image_unselected="icn_speaker_dark.tga" label="" left_delta="56" 54 image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
52 name="mute_btn" tool_tip="Mute voice" width="25" /> 55 name="mute_btn" tool_tip="Mute voice" width="25" />
53 </panel> 56 </panel>
54 <button bottom_delta="0" follows="right|top" font="SansSerif"
55 halign="center" bottom ="-40" height="20" label="Offer Teleport" right="-5"
56 mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
57 <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" 57 <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
58 bottom="30" embedded_items="false" enabled="false" 58 bottom="30" embedded_items="false" enabled="false"
59 follows="left|top|right|bottom" font="SansSerif" height="221" left="5" 59 follows="left|top|right|bottom" font="SansSerif" height="221" left="5"