aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-06-05 02:19:12 -0700
committerJacek Antonelli2010-06-19 02:43:30 -0500
commitfa004431e6dc454f1ceacace1234c39bb19f7d89 (patch)
tree51dd85d9c162284a8a3160293aae5459b72f81a2 /linden/indra/newview/skins
parentMake sure we only create menus once per session (diff)
downloadmeta-impy-fa004431e6dc454f1ceacace1234c39bb19f7d89.zip
meta-impy-fa004431e6dc454f1ceacace1234c39bb19f7d89.tar.gz
meta-impy-fa004431e6dc454f1ceacace1234c39bb19f7d89.tar.bz2
meta-impy-fa004431e6dc454f1ceacace1234c39bb19f7d89.tar.xz
Rewrote the radar code to fix some basic issues
i.e. avatars stuck as typing, appearing multiple times, or spamming the chat notify (also added a ban button while I was there)
Diffstat (limited to 'linden/indra/newview/skins')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_radar.xml32
1 files changed, 17 insertions, 15 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
index 1f1749e..969ddd8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
@@ -22,28 +22,22 @@
22 [NAME] has entered the sim ([DISTANCE]m) 22 [NAME] has entered the sim ([DISTANCE]m)
23 </string> 23 </string>
24 <string name="avatars_in_singular"> 24 <string name="avatars_in_singular">
25 avatar in 25 [COUNT] avatar in
26 </string> 26 </string>
27 <string name="avatars_in_plural"> 27 <string name="avatars_in_plural">
28 avatars in 28 [COUNT] avatars in
29 </string>
30 <string name="unknown_avatar">
31 (Unknown)
29 </string> 32 </string>
30 33
31 <text name="lblAvatarCount" 34 <text name="avatar_count"
32 bottom="-20" left="10" height="16" width="220" 35 bottom="-20" left="10" height="16" width="220"
33 h_pad="0" halign="left" v_pad="0" follows="left|top" 36 h_pad="0" halign="left" v_pad="0" follows="left|top"
34 bg_visible="false" border_drop_shadow_visible="false" 37 bg_visible="false" border_drop_shadow_visible="false"
35 border_visible="false" drop_shadow_visible="true" 38 border_visible="false" drop_shadow_visible="true"
36 font="SansSerifSmall" mouse_opaque="true"> 39 font="SansSerifSmall" mouse_opaque="true">
37 0 40 0 avatars in
38 </text>
39
40 <text name="avatars_in"
41 bottom="-20" left="27" height="16" width="220"
42 h_pad="0" halign="left" v_pad="0"
43 bg_visible="false" border_drop_shadow_visible="false"
44 border_visible="false" drop_shadow_visible="true" follows="left|top"
45 font="SansSerifSmall" mouse_opaque="true" >
46 avatars in
47 </text> 41 </text>
48 42
49 <slider name="near_me_range" label="" control_name="NearMeRange" 43 <slider name="near_me_range" label="" control_name="NearMeRange"
@@ -111,9 +105,13 @@
111 bottom="-160" left="1" height="160" width="198" 105 bottom="-160" left="1" height="160" width="198"
112 follows="left|top|right|bottom" 106 follows="left|top|right|bottom"
113 border="false" mouse_opaque="true"> 107 border="false" mouse_opaque="true">
108
109 <button name="cam_btn" label="Cam To"
110 bottom="-22" left="-85" height="20" width="80"
111 follows="top|right" tool_tip="" />
114 112
115 <button name="freeze_btn" label="Freeze..." 113 <button name="freeze_btn" label="Freeze..."
116 bottom="-22" left="-85" height="20" width="80" 114 bottom_delta="-22" left="-85" height="20" width="80"
117 follows="top|right" tool_tip="" /> 115 follows="top|right" tool_tip="" />
118 116
119 <button name="eject_btn" label="Eject..." 117 <button name="eject_btn" label="Eject..."
@@ -132,7 +130,11 @@
132 bottom_delta="-22" left_delta="0" height="20" width="80" 130 bottom_delta="-22" left_delta="0" height="20" width="80"
133 follows="top|right" tool_tip="" /> 131 follows="top|right" tool_tip="" />
134 132
135 <button name="estate_eject_btn" label="Kick..." 133 <!--<button name="estate_eject_btn" label="Kick..."
134 bottom_delta="-22" left_delta="0" height="20" width="80"
135 follows="top|right" tool_tip="" />-->
136
137 <button name="estate_ban_btn" label="Ban..."
136 bottom_delta="-22" left_delta="0" height="20" width="80" 138 bottom_delta="-22" left_delta="0" height="20" width="80"
137 follows="top|right" tool_tip="" /> 139 follows="top|right" tool_tip="" />
138 140