Added PanelRadar class, refactored from LLFloaterMap.

1 files changed, 4 insertions, 3 deletions

diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 5aaee1a..64f2fa6 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -46,6 +46,7 @@
 #include "llviewercontrol.h"
 #include "llfloateravatarinfo.h"
 #include "llfloatermap.h"
+#include "panelradar.h"
 #include "llfloaterworldmap.h"
 #include "llframetimer.h"
 #include "llmutelist.h"
@@ -358,7 +359,7 @@ void LLNetMap::draw()
                         pos_map = globalPosToView(positions[i], rotate_map);
                         
                         // Save this entry to draw last
-                        if (LLFloaterMap::getSelected() == avatar_ids[i])
+                        if (LLFloaterMap::getInstance()->getRadar()->getSelected() == avatar_ids[i])
                         {
                                 selected = i;
                                 continue;
@@ -370,7 +371,7 @@ void LLNetMap::draw()
                                 {
                                         glyph_color = muted_color;
                                 }
-                                else if (LLFloaterMap::isImpDev(avatar_ids[i]))
+                                else if (PanelRadar::isImpDev(avatar_ids[i]))
                                 {
                                         glyph_color = imp_dev_color;
                                 }
@@ -514,7 +515,7 @@ void LLNetMap::draw()
 
         LLView::draw();
 
-        LLFloaterMap::updateRadar();
+        LLFloaterMap::getInstance()->getRadar()->populateRadar();
 }
 
 void LLNetMap::reshape(S32 width, S32 height, BOOL called_from_parent)