4 files changed, 7 insertions, 54 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 894473b..65a6c00 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -551,17 +551,6 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-  <key>RadarSimWide</key>
-  <map>
-    <key>Comment</key>
-    <string>If true, radar shows everyone in the sim</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>0</integer>
-  </map>
   <key>SavedRenderFarClip</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/panelradar.cpp b/linden/indra/newview/panelradar.cpp
index cfaffde..ce91da2 100644
--- a/linden/indra/newview/panelradar.cpp
+++ b/linden/indra/newview/panelradar.cpp
@@ -29,7 +29,6 @@
 
 #include "panelradar.h"
 
-#include "hippoLimits.h"
 #include "llagent.h"
 #include "llchat.h"
 #include "llfloateravatarinfo.h"
@@ -46,7 +45,6 @@
 #include "llregionposition.h"
 #include "roles_constants.h"
 #include "llscrolllistctrl.h"
-#include "llspinctrl.h"
 #include "lltracker.h"
 #include "lluictrlfactory.h"
 #include "llviewercontrol.h"
@@ -79,11 +77,6 @@ BOOL PanelRadar::postBuild()
         childSetCommitCallback("RadarList", onUseRadarList, this);
         mRadarList->setDoubleClickCallback(onClickIM);
 
-        childSetCommitCallback("simwide_checkbox", onCheckSimWide, this);
-
-        // Set max range to max height
-        getChild<LLSpinCtrl>("near_me_range")->setMaxValue(gHippoLimits->getMaxHeight());
-
         childSetAction("im_btn", onClickIM, this);
         childSetAction("profile_btn", onClickProfile, this);
         childSetAction("offer_teleport_btn", onClickOfferTeleport, this);
@@ -223,6 +216,8 @@ void PanelRadar::updateRadarDisplay()
         F32 range = gSavedSettings.getF32("NearMeRange");
         bool notify_chat = gSavedSettings.getBOOL("MiniMapNotifyChatRange");
         bool notify_sim = gSavedSettings.getBOOL("MiniMapNotifySimRange");
+        // We show avatars outside the estate even if you can't manage it in case griefers are lying on the border
+        bool is_manager = gAgent.getRegion()->canManageEstate();
 // [RLVa:KB] - Alternate: Imprudence-1.2.0
         if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
         {
@@ -291,7 +286,7 @@ void PanelRadar::updateRadarDisplay()
                 }
 
                 // Only display avatars in range
-                if (mSimWide || entry->getDistance() <= range)
+                if (is_manager || entry->getDistance() <= range)
                 {
                         // Append typing string
                         std::string typing = "";
@@ -554,28 +549,6 @@ void PanelRadar::onUseRadarList(LLUICtrl* ctrl, void* user_data)
 }
 
 
-// static
-void PanelRadar::onCheckSimWide(LLUICtrl* ctrl, void* user_data)
-{
-        PanelRadar* self = (PanelRadar*)user_data;
-        if (self)
-        {
-                self->updateRangeControls();
-        }
-}
-
-
-void PanelRadar::updateRangeControls()
-{
-        LLSpinCtrl* near_me = getChild<LLSpinCtrl>("near_me_range");
-        if (near_me)
-        {
-                near_me->setEnabled(!gSavedSettings.getBOOL("RadarSimWide"));
-        }
-        mSimWide = gSavedSettings.getBOOL("RadarSimWide");
-}
-
-
 bool PanelRadar::visibleItemsSelected() const
 {
         return (mRadarList->getFirstSelectedIndex() >= 0);
diff --git a/linden/indra/newview/panelradar.h b/linden/indra/newview/panelradar.h
index 4d53b56..59e6aff 100644
--- a/linden/indra/newview/panelradar.h
+++ b/linden/indra/newview/panelradar.h
@@ -77,7 +77,6 @@ private:
         LLScrollListCtrl*   mRadarList;
         LLUUID              mSelectedAvatar;
         F32                                     mSelectedDistance;
-        bool                            mSimWide;
 
         bool visibleItemsSelected() const;
         bool isKickable(const LLUUID& agent_id);
@@ -89,8 +88,6 @@ private:
 
         static void onUseRadarList(LLUICtrl* ctrl, void* user_data);
         static void onRangeChange(LLFocusableElement* focus, void* user_data);
-        static void onCheckSimWide(LLUICtrl* ctrl, void* user_data);
-        void updateRangeControls();
 
         static void onClickProfile(void* user_data);
         static void onClickIM(void* user_data);
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 d02ff0d..603f2d8 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
@@ -40,13 +40,13 @@
     0 avatars in
   </text>
 
-  <spinner name="near_me_range" label="" control_name="NearMeRange"
-          bottom_delta="0" left_delta="66" width="60" height="15"
-          follows="left|top" min_val="5" increment="15"
+  <slider name="near_me_range" label="" control_name="NearMeRange"
+          bottom_delta="0" left_delta="62" width="110" height="15"
+          follows="left|top" min_val="5" max_val="512" increment="1"
           initial_val="96" decimal_digits="0" />
 
   <text name="meters"
-        bottom_delta="0" left="140" height="15" width="40"
+        bottom_delta="0" left="180" height="15" width="40"
         h_pad="0" halign="left" v_pad="0" follows="left|top"
         bg_visible="false" border_drop_shadow_visible="false"
         border_visible="false" drop_shadow_visible="true" 
@@ -54,12 +54,6 @@
     m
   </text>
 
-  <check_box bottom_delta="-1" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Sim-wide" left_delta="20" mouse_opaque="true"
-             name="simwide_checkbox" control_name="RadarSimWide" 
-             radio_style="false" width="100" />
-
   <tab_container name="radar_tab_container"
                  bottom="1" left="0" right="0" height="172"
                  follows="left|right|bottom" border="false"