Moved radar back into llfloatermap.cpp, it works

2 files changed, 31 insertions, 17 deletions

diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index 42cb0ac..38499d3 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -160,6 +160,7 @@
 <MapAvatar value="0, 255, 0, 255" />                    <!-- Your avatar's glyph color -->
 <MapFriend value="255, 255, 0, 255" />                  <!-- Your friends' glyph color -->
 <MapMuted value="128, 128, 128, 255" />                 <!-- Muted avatars' glyph color -->
+<MapSelected value="255, 0, 0, 255" />                 <!-- Selected avatars' glyph color -->
   
   <!-- MINI-MAP -->
 <NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
index c10367d..3408c76 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -10,31 +10,41 @@
   <panel name="RadarPanel" label="Radar"
          background_visible="true" bg_alpha_color="NetMapBackgroundColor"
          left="2" top="196" right="196" height="120"
-         follows="left|right|bottom" border="true" mouse_opaque="true">
+         follows="left|right|bottom" border="false" mouse_opaque="true">
 
     <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-          bottom="-20" drop_shadow_visible="true" follows="left|top"
-          font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-          mouse_opaque="true" name="InstructSelectResident" v_pad="0"
-          width="220">
-      Select nearby resident:
+       bottom="-20" drop_shadow_visible="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+       mouse_opaque="true" name="lblAvatarCount" v_pad="0"
+       width="220">
+      0
     </text>
-    <slider bottom_delta="-20" left="10" follows="left|top" width="175" height="15"
-         name="near_me_range" label="Range" control_name="NearMeRange"
+    <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        bottom="-20" drop_shadow_visible="true" follows="left|top"
+        font="SansSerifSmall" h_pad="0" halign="left" height="16" left="27"
+        mouse_opaque="true" name="avatars_in" v_pad="0"
+        width="220">
+      Avatars in
+    </text>
+    <slider bottom_delta="0" left_delta="55" follows="left|top" width="110" height="15"
+         name="near_me_range" label="" control_name="NearMeRange"
          min_val="5" max_val="256" increment="1" initial_val="96" decimal_digits="0" />
     <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-         bottom_delta="0" left="185" drop_shadow_visible="true" follows="left|top"
+         bottom_delta="0" left="190" drop_shadow_visible="true" follows="left|top"
          font="SansSerifSmall" h_pad="0" halign="left" height="15"
          mouse_opaque="true" name="meters" v_pad="0"
          width="40">
       Meters
     </text>
-    <scroll_list bottom_delta="-100" width="96" height="100" left="10"
-         follows="left|top|bottom|right" draw_border="true" draw_heading="false"
-         draw_stripes="true" column_padding="5" sort_column="0" mouse_opaque="true"
-         background_visible="true" multi_select="false" name="RadarList"  />
-    <button bottom_delta="100" follows="top|right" height="22" label="IM/Call"
-         left="-90" name="im_btn" tool_tip="Open Instant Message session"
+    <scroll_list bottom_delta="-166" width="96" height="160" left="10"
+         follows="left|top|bottom|right" draw_border="false" draw_heading="true"
+         draw_stripes="true" column_padding="5" sort_column="1" mouse_opaque="true"
+         background_visible="true" multi_select="false" name="RadarList">
+      <column name="avatar_name" label="Name" dynamicwidth="true" />
+      <column name="avatar_distance" label="Dist." width="55" />
+    </scroll_list>
+    <button bottom="-45" follows="top|right" height="22" label="IM/Call"
+         left="-85" name="im_btn" tool_tip="Open Instant Message session"
          width="80" />
     <button bottom_delta="-25" follows="top|right" height="22" label="Profile"
          left_delta="0" name="profile_btn"
@@ -45,11 +55,14 @@
     <button bottom_delta="-25" follows="top|right" height="22" label="Track"
          left_delta="0" name="track_btn"
          tool_tip="Create a beacon to track this avatar" width="80" />
-    <button bottom_delta="-35" follows="top|right" height="22" label="Invite..."
+    <button bottom_delta="-30" follows="top|right" height="22" label="Invite..."
          left_delta="0" name="invite_btn"
          tool_tip="Remove this person from your friends list" width="80" />
-    <button bottom_delta="-35" follows="top|right" height="22" label="Add..."
+    <button bottom_delta="-30" follows="top|right" height="22" label="Add..."
          left_delta="0" name="add_btn" tool_tip="Offer friendship to a resident"
          width="80" />
+    <string name="no_one_near">
+      No avatars within range
+    </string>
   </panel>
 </floater>