Backported LL's version of VWR-2681 from 1.23

11 files changed, 457 insertions, 239 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 9a6749b..cce09e2 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4982,7 +4982,18 @@
       <string>Boolean</string>
       <key>Value</key>
       <integer>1</integer>
-  </map>
+    </map>
+    <key>NearMeRange</key>
+            <map>
+              <key>Comment</key>
+              <string>Search radius for nearby avatars</string>
+              <key>Persist</key>
+              <integer>1</integer>
+              <key>Type</key>
+              <string>F32</string>
+              <key>Value</key>
+              <integer>20</integer>
+    </map>
     <key>NewCacheLocation</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/llfloateravatarpicker.cpp b/linden/indra/newview/llfloateravatarpicker.cpp
index 97d2de9..0bdabdd 100644
--- a/linden/indra/newview/llfloateravatarpicker.cpp
+++ b/linden/indra/newview/llfloateravatarpicker.cpp
@@ -34,6 +34,7 @@
 
 #include "message.h"
 
+#include "llagent.h"
 #include "llbutton.h"
 #include "llfocusmgr.h"
 #include "llinventoryview.h"
@@ -42,7 +43,8 @@
 #include "llscrolllistctrl.h"
 #include "lltextbox.h"
 #include "lluictrlfactory.h"
-#include "llagent.h"
+#include "llviewercontrol.h"
+#include "llworld.h"
 
 const S32 MIN_WIDTH = 200;
 const S32 MIN_HEIGHT = 340;
@@ -58,6 +60,8 @@ LLFloaterAvatarPicker* LLFloaterAvatarPicker::show(callback_t callback,
                                                                                                    BOOL allow_multiple,
                                                                                                    BOOL closeOnSelect)
 {
+        // TODO: This class should not be a singleton as it's used in multiple places
+        // and therefore can't be used simultaneously. -MG
         if (!sInstance)
         {
                 sInstance = new LLFloaterAvatarPicker();
@@ -77,6 +81,7 @@ LLFloaterAvatarPicker* LLFloaterAvatarPicker::show(callback_t callback,
                 sInstance->setAllowMultiple(allow_multiple);
         }
         
+        sInstance->mNearMeListComplete = FALSE;
         sInstance->mCloseOnSelect = closeOnSelect;
         return sInstance;
 }
@@ -97,39 +102,58 @@ BOOL LLFloaterAvatarPicker::postBuild()
 
         childSetAction("Find", onBtnFind, this);
         childDisable("Find");
+        childSetAction("Refresh", onBtnRefresh, this);
+        childSetCommitCallback("near_me_range", onRangeAdjust, this);
 
-        mListNames = getChild<LLScrollListCtrl>("Names");
-        childSetDoubleClickCallback("Names",onBtnAdd);
-        childSetCommitCallback("Names", onList, this);
-        childDisable("Names");
+        childSetDoubleClickCallback("SearchResults", onBtnSelect);
+        childSetDoubleClickCallback("NearMe", onBtnSelect);
+        childSetCommitCallback("SearchResults", onList, this);
+        childSetCommitCallback("NearMe", onList, this);
+        childDisable("SearchResults");
 
-        childSetAction("Select", onBtnAdd, this);
+        childSetAction("Select", onBtnSelect, this);
         childDisable("Select");
 
-        childSetAction("Close", onBtnClose, this);
+        childSetAction("Cancel", onBtnClose, this);
 
         childSetFocus("Edit");
 
-        if (mListNames)
+        LLPanel* search_panel = getChild<LLPanel>("SearchPanel");
+        if (search_panel)
         {
-                mListNames->addCommentText(std::string("No results")); // *TODO: Translate
+                // Start searching when Return is pressed in the line editor.
+                search_panel->setDefaultBtn("Find");
         }
 
-        mInventoryPanel = getChild<LLInventoryPanel>("Inventory Panel");
-        if(mInventoryPanel)
-        {
-                mInventoryPanel->setFilterTypes(LLInventoryType::NIT_CALLCARD);
-                mInventoryPanel->setFollowsAll();
-                mInventoryPanel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
-                mInventoryPanel->openDefaultFolderForType(LLAssetType::AT_CALLINGCARD);
-                mInventoryPanel->setSelectCallback(LLFloaterAvatarPicker::onSelectionChange, this);
-        }
-        
+        getChild<LLScrollListCtrl>("SearchResults")->addCommentText(getString("no_results"));
+
+        LLInventoryPanel* inventory_panel = getChild<LLInventoryPanel>("InventoryPanel");
+        inventory_panel->setFilterTypes(0x1 << LLInventoryType::IT_CALLINGCARD);
+        inventory_panel->setFollowsAll();
+        inventory_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
+        inventory_panel->openDefaultFolderForType(LLAssetType::AT_CALLINGCARD);
+        inventory_panel->setSelectCallback(LLFloaterAvatarPicker::onCallingCardSelectionChange, this);
+
+        childSetTabChangeCallback("ResidentChooserTabs", "SearchPanel",                 onTabChanged, this);
+        childSetTabChangeCallback("ResidentChooserTabs", "CallingCardsPanel",   onTabChanged, this);
+        childSetTabChangeCallback("ResidentChooserTabs", "NearMePanel",                 onTabChanged, this);
+
         setAllowMultiple(FALSE);
 
         return TRUE;
 }
 
+void LLFloaterAvatarPicker::onTabChanged(void* userdata, bool from_click)
+{
+        LLFloaterAvatarPicker* self = (LLFloaterAvatarPicker*)userdata;
+        if (!self)
+        {
+                return;
+        }
+        
+        self->childSetEnabled("Select", self->visibleItemsSelected());
+}
+
 // Destroys the object
 LLFloaterAvatarPicker::~LLFloaterAvatarPicker()
 {
@@ -144,22 +168,50 @@ void LLFloaterAvatarPicker::onBtnFind(void* userdata)
         if(self) self->find();
 }
 
-void LLFloaterAvatarPicker::onBtnAdd(void* userdata)
+static void getSelectedAvatarData(const LLScrollListCtrl* from, std::vector<std::string>& avatar_names, std::vector<LLUUID>& avatar_ids)
+{
+        std::vector<LLScrollListItem*> items = from->getAllSelected();
+        for (std::vector<LLScrollListItem*>::iterator iter = items.begin(); iter != items.end(); ++iter)
+        {
+                LLScrollListItem* item = *iter;
+                if (item->getUUID().notNull())
+                {
+                        avatar_names.push_back(item->getColumn(0)->getValue().asString());
+                        avatar_ids.push_back(item->getUUID());
+                }
+        }
+}
+
+void LLFloaterAvatarPicker::onBtnSelect(void* userdata)
 {
         LLFloaterAvatarPicker* self = (LLFloaterAvatarPicker*)userdata;
 
         if(self->mCallback)
         {
-                self->mCallback(self->mAvatarNames, self->mAvatarIDs, self->mCallbackUserdata);
-        }
-        if (self->mInventoryPanel)
-        {
-                self->mInventoryPanel->setSelection(LLUUID::null, FALSE);
-        }
-        if (self->mListNames)
-        {
-                self->mListNames->deselectAllItems(TRUE);
+                LLPanel* active_panel = self->childGetVisibleTab("ResidentChooserTabs");
+
+                if(active_panel == self->getChild<LLPanel>("CallingCardsPanel"))
+                {
+                        self->mCallback(self->mSelectedInventoryAvatarNames, self->mSelectedInventoryAvatarIDs, self->mCallbackUserdata);
+                }
+                else if(active_panel == self->getChild<LLPanel>("SearchPanel"))
+                {
+                        std::vector<std::string>        avatar_names;
+                        std::vector<LLUUID>                     avatar_ids;
+                        getSelectedAvatarData(self->getChild<LLScrollListCtrl>("SearchResults"), avatar_names, avatar_ids);
+                        self->mCallback(avatar_names, avatar_ids, self->mCallbackUserdata);
+                }
+                else if(active_panel == self->getChild<LLPanel>("NearMePanel"))
+                {
+                        std::vector<std::string>        avatar_names;
+                        std::vector<LLUUID>                     avatar_ids;
+                        getSelectedAvatarData(self->getChild<LLScrollListCtrl>("NearMe"), avatar_names, avatar_ids);
+                        self->mCallback(avatar_names, avatar_ids, self->mCallbackUserdata);
+                }
         }
+        self->getChild<LLInventoryPanel>("InventoryPanel")->setSelection(LLUUID::null, FALSE);
+        self->getChild<LLScrollListCtrl>("SearchResults")->deselectAllItems(TRUE);
+        self->getChild<LLScrollListCtrl>("NearMe")->deselectAllItems(TRUE);
         if(self->mCloseOnSelect)
         {
                 self->mCloseOnSelect = FALSE;
@@ -167,68 +219,61 @@ void LLFloaterAvatarPicker::onBtnAdd(void* userdata)
         }
 }
 
+void LLFloaterAvatarPicker::onBtnRefresh(void* userdata)
+{
+        LLFloaterAvatarPicker* self = (LLFloaterAvatarPicker*)userdata;
+        if (!self)
+        {
+                return;
+        }
+        
+        self->getChild<LLScrollListCtrl>("NearMe")->deleteAllItems();
+        self->getChild<LLScrollListCtrl>("NearMe")->addCommentText(self->getString("searching"));
+        self->mNearMeListComplete = FALSE;
+}
+
 void LLFloaterAvatarPicker::onBtnClose(void* userdata)
 {
         LLFloaterAvatarPicker* self = (LLFloaterAvatarPicker*)userdata;
         if(self) self->close();
 }
 
+void LLFloaterAvatarPicker::onRangeAdjust(LLUICtrl* source, void* data)
+{
+        LLFloaterAvatarPicker::onBtnRefresh(data);
+}
+
 void LLFloaterAvatarPicker::onList(LLUICtrl* ctrl, void* userdata)
 {
         LLFloaterAvatarPicker* self = (LLFloaterAvatarPicker*)userdata;
-        if (!self)
-        {
-                return;
-        }
-
-        self->mAvatarIDs.clear();
-        self->mAvatarNames.clear();
-
-        if (!self->mListNames)
-        {
-                return;
-        }
-        
-        std::vector<LLScrollListItem*> items =
-                self->mListNames->getAllSelected();
-        for (
-                std::vector<LLScrollListItem*>::iterator iter = items.begin();
-                iter != items.end();
-                ++iter)
+        if (self)
         {
-                LLScrollListItem* item = *iter;
-                self->mAvatarNames.push_back(item->getColumn(0)->getValue().asString());
-                self->mAvatarIDs.push_back(item->getUUID());
-                self->childSetEnabled("Select", TRUE);
+                self->childSetEnabled("Select", self->visibleItemsSelected());
         }
 }
 
 // static callback for inventory picker (select from calling cards)
-void LLFloaterAvatarPicker::onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data)
+void LLFloaterAvatarPicker::onCallingCardSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data)
 {
         LLFloaterAvatarPicker* self = (LLFloaterAvatarPicker*)data;
         if (self)
         {
-                self->doSelectionChange( items, user_action, data );
+                self->doCallingCardSelectionChange( items, user_action, data );
         }
 }
 
 // Callback for inventory picker (select from calling cards)
-void LLFloaterAvatarPicker::doSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data)
+void LLFloaterAvatarPicker::doCallingCardSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data)
 {
-        if (!mListNames)
+        bool panel_active = (childGetVisibleTab("ResidentChooserTabs") == getChild<LLPanel>("CallingCardsPanel"));
+        
+        mSelectedInventoryAvatarIDs.clear();
+        mSelectedInventoryAvatarNames.clear();
+        
+        if (panel_active)
         {
-                return;
-        }
-
-        std::vector<LLScrollListItem*> search_items = mListNames->getAllSelected();
-        if ( search_items.size() == 0 )
-        {       // Nothing selected in the search results
-                mAvatarIDs.clear();
-                mAvatarNames.clear();
                 childSetEnabled("Select", FALSE);
         }
-        BOOL first_calling_card = TRUE;
 
         std::deque<LLFolderViewItem*>::const_iterator item_it;
         for (item_it = items.begin(); item_it != items.end(); ++item_it)
@@ -237,26 +282,97 @@ void LLFloaterAvatarPicker::doSelectionChange(const std::deque<LLFolderViewItem*
                 if (listenerp->getInventoryType() == LLInventoryType::IT_CALLINGCARD)
                 {
                         LLInventoryItem* item = gInventory.getItem(listenerp->getUUID());
-
                         if (item)
                         {
-                                if ( first_calling_card )
-                                {       // Have a calling card selected, so clear anything from the search panel
-                                        first_calling_card = FALSE;
-                                        mAvatarIDs.clear();
-                                        mAvatarNames.clear();
-                                        mListNames->deselectAllItems();
-                                }
-
-                                // Add calling card info to the selected avatars
-                                mAvatarIDs.push_back(item->getCreatorUUID());
-                                mAvatarNames.push_back(listenerp->getName());
-                                childSetEnabled("Select", TRUE);
+                                mSelectedInventoryAvatarIDs.push_back(item->getCreatorUUID());
+                                mSelectedInventoryAvatarNames.push_back(listenerp->getName());
                         }
                 }
         }
+
+        if (panel_active)
+        {
+                childSetEnabled("Select", visibleItemsSelected());
+        }
 }
 
+void LLFloaterAvatarPicker::populateNearMe()
+{
+        BOOL all_loaded = TRUE;
+        BOOL empty = TRUE;
+        LLScrollListCtrl* near_me_scroller = getChild<LLScrollListCtrl>("NearMe");
+        near_me_scroller->deleteAllItems();
+
+        std::vector<LLUUID> avatar_ids;
+        LLWorld::getInstance()->getAvatars(&avatar_ids, NULL, gAgent.getPositionGlobal(), gSavedSettings.getF32("NearMeRange"));
+        for(U32 i=0; i<avatar_ids.size(); i++)
+        {
+                LLUUID& av = avatar_ids[i];
+                if(av == gAgent.getID()) continue;
+                LLSD element;
+                element["id"] = av; // value
+                std::string fullname;
+                if(!gCacheName->getFullName(av, fullname))
+                {
+                        element["columns"][0]["value"] = LLCacheName::getDefaultName();
+                        all_loaded = FALSE;
+                }                       
+                else
+                {
+                        element["columns"][0]["value"] = fullname;
+                }
+                near_me_scroller->addElement(element);
+                empty = FALSE;
+        }
+
+        if (empty)
+        {
+                childDisable("NearMe");
+                childDisable("Select");
+                near_me_scroller->addCommentText(getString("no_one_near"));
+        }
+        else 
+        {
+                childEnable("NearMe");
+                childEnable("Select");
+                near_me_scroller->selectFirstItem();
+                onList(near_me_scroller, this);
+                near_me_scroller->setFocus(TRUE);
+        }
+
+        if (all_loaded)
+        {
+                mNearMeListComplete = TRUE;
+        }
+}
+
+void LLFloaterAvatarPicker::draw()
+{
+        LLFloater::draw();
+        if (!mNearMeListComplete && childGetVisibleTab("ResidentChooserTabs") == getChild<LLPanel>("NearMePanel"))
+        {
+                populateNearMe();
+        }
+}
+
+BOOL LLFloaterAvatarPicker::visibleItemsSelected() const
+{
+        LLPanel* active_panel = childGetVisibleTab("ResidentChooserTabs");
+
+        if(active_panel == getChild<LLPanel>("SearchPanel"))
+        {
+                return getChild<LLScrollListCtrl>("SearchResults")->getFirstSelectedIndex() >= 0;
+        }
+        else if(active_panel == getChild<LLPanel>("CallingCardsPanel"))
+        {
+                return mSelectedInventoryAvatarIDs.size() > 0;
+        }
+        else if(active_panel == getChild<LLPanel>("NearMePanel"))
+        {
+                return getChild<LLScrollListCtrl>("NearMe")->getFirstSelectedIndex() >= 0;
+        }
+        return FALSE;
+}
 
 void LLFloaterAvatarPicker::find()
 {
@@ -276,11 +392,8 @@ void LLFloaterAvatarPicker::find()
 
         gAgent.sendReliableMessage();
 
-        if (mListNames)
-        {
-                mListNames->deleteAllItems();   
-                mListNames->addCommentText(std::string("Searching..."));  // *TODO: Translate
-        }
+        getChild<LLScrollListCtrl>("SearchResults")->deleteAllItems();
+        getChild<LLScrollListCtrl>("SearchResults")->addCommentText(getString("searching"));
         
         childSetEnabled("Select", FALSE);
         mResultsReturned = FALSE;
@@ -288,15 +401,9 @@ void LLFloaterAvatarPicker::find()
 
 void LLFloaterAvatarPicker::setAllowMultiple(BOOL allow_multiple)
 {
-        mAllowMultiple = allow_multiple;
-        if (mInventoryPanel)
-        {
-                mInventoryPanel->setAllowMultiSelect(mAllowMultiple);
-        }
-        if (mListNames)
-        {
-                mListNames->setAllowMultipleSelection(mAllowMultiple);
-        }
+        getChild<LLScrollListCtrl>("SearchResults")->setAllowMultipleSelection(allow_multiple);
+        getChild<LLInventoryPanel>("InventoryPanel")->setAllowMultiSelect(allow_multiple);
+        getChild<LLScrollListCtrl>("NearMe")->setAllowMultipleSelection(allow_multiple);
 }
 
 // static 
@@ -324,52 +431,48 @@ void LLFloaterAvatarPicker::processAvatarPickerReply(LLMessageSystem* msg, void*
                 return;
         }
 
-        if (!self->mResultsReturned)
-        {
-                // clear "Searching" label on first results
-                if (self->mListNames)
-                {
-                        self->mListNames->deleteAllItems();
-                }
-        }
+        LLScrollListCtrl* search_results = self->getChild<LLScrollListCtrl>("SearchResults");
+
+        // clear "Searching" label on first results
+        search_results->deleteAllItems();
+
         self->mResultsReturned = TRUE;
 
-        if (self->mListNames)
-        {
-                BOOL found_one = FALSE;
-                S32 num_new_rows = msg->getNumberOfBlocks("Data");
-                for (S32 i = 0; i < num_new_rows; i++)
-                {                       
-                        msg->getUUIDFast(  _PREHASH_Data,_PREHASH_AvatarID,     avatar_id, i);
-                        msg->getStringFast(_PREHASH_Data,_PREHASH_FirstName, first_name, i);
-                        msg->getStringFast(_PREHASH_Data,_PREHASH_LastName,     last_name, i);
-                
-                        std::string avatar_name;
-                        if (avatar_id.isNull())
-                        {
-                                LLStringUtil::format_map_t map;
-                                map["[TEXT]"] = self->childGetText("Edit");
-                                avatar_name = self->getString("NotFound", map);
-                                self->mListNames->setEnabled(FALSE);
-                        }
-                        else
-                        {
-                                avatar_name = first_name + " " + last_name;
-                                self->mListNames->setEnabled(TRUE);
-                                found_one = TRUE;
-                        }
-                        LLSD element;
-                        element["id"] = avatar_id; // value
-                        element["columns"][0]["value"] = avatar_name;
-                        self->mListNames->addElement(element);
-                }
+        BOOL found_one = FALSE;
+        S32 num_new_rows = msg->getNumberOfBlocks("Data");
+        for (S32 i = 0; i < num_new_rows; i++)
+        {                       
+                msg->getUUIDFast(  _PREHASH_Data,_PREHASH_AvatarID,     avatar_id, i);
+                msg->getStringFast(_PREHASH_Data,_PREHASH_FirstName, first_name, i);
+                msg->getStringFast(_PREHASH_Data,_PREHASH_LastName,     last_name, i);
         
-                if (found_one)
+                std::string avatar_name;
+                if (avatar_id.isNull())
                 {
-                        self->mListNames->selectFirstItem();
-                        self->onList(self->mListNames, self);
-                        self->mListNames->setFocus(TRUE);
+                        LLStringUtil::format_map_t map;
+                        map["[TEXT]"] = self->childGetText("Edit");
+                        avatar_name = self->getString("not_found", map);
+                        search_results->setEnabled(FALSE);
+                        self->childDisable("Select");
                 }
+                else
+                {
+                        avatar_name = first_name + " " + last_name;
+                        search_results->setEnabled(TRUE);
+                        found_one = TRUE;
+                }
+                LLSD element;
+                element["id"] = avatar_id; // value
+                element["columns"][0]["value"] = avatar_name;
+                search_results->addElement(element);
+        }
+
+        if (found_one)
+        {
+                self->childEnable("Select");
+                search_results->selectFirstItem();
+                self->onList(search_results, self);
+                search_results->setFocus(TRUE);
         }
 }
 
@@ -377,32 +480,23 @@ void LLFloaterAvatarPicker::processAvatarPickerReply(LLMessageSystem* msg, void*
 void LLFloaterAvatarPicker::editKeystroke(LLLineEditor* caller, void* user_data)
 {
         LLFloaterAvatarPicker* self = (LLFloaterAvatarPicker*)user_data;
-        if (caller->getText().size() >= 3)
-        {
-                self->childSetEnabled("Find",TRUE);
-        }
-        else
-        {
-                self->childSetEnabled("Find",FALSE);
-        }
+        self->childSetEnabled("Find", caller->getText().size() >= 3);
 }
 
 // virtual
 BOOL LLFloaterAvatarPicker::handleKeyHere(KEY key, MASK mask)
 {
-        if (key == KEY_RETURN
-                && mask == MASK_NONE)
+        if (key == KEY_RETURN && mask == MASK_NONE)
         {
                 if (childHasFocus("Edit"))
                 {
                         onBtnFind(this);
-                        return TRUE;
                 }
                 else
                 {
-                        onBtnAdd(this);
-                        return TRUE;
+                        onBtnSelect(this);
                 }
+                return TRUE;
         }
         else if (key == KEY_ESCAPE && mask == MASK_NONE)
         {
diff --git a/linden/indra/newview/llfloateravatarpicker.h b/linden/indra/newview/llfloateravatarpicker.h
index 005eff0..1ab0f7c 100644
--- a/linden/indra/newview/llfloateravatarpicker.h
+++ b/linden/indra/newview/llfloateravatarpicker.h
@@ -36,14 +36,6 @@
 
 #include <vector>
 
-class LLUICtrl;
-class LLTextBox;
-class LLLineEditor;
-class LLButton;
-class LLScrollListCtrl;
-class LLMessageSystem;
-class LLInventoryPanel;
-class LLFolderViewItem;
 
 class LLFloaterAvatarPicker : public LLFloater
 {
@@ -57,47 +49,47 @@ public:
                                                                            BOOL closeOnSelect = FALSE);
         virtual BOOL postBuild();
 
-        static void processAvatarPickerReply(LLMessageSystem* msg, void**);
-        static void editKeystroke(LLLineEditor* caller, void* user_data);
+        static void processAvatarPickerReply(class LLMessageSystem* msg, void**);
 
-protected:
-        static void* createInventoryPanel(void* userdata);
+private:
+
+        static void editKeystroke(class LLLineEditor* caller, void* user_data);
 
         static void onBtnFind(void* userdata);
-        static void onBtnAdd(void* userdata);
+        static void onBtnSelect(void* userdata);
+        static void onBtnRefresh(void* userdata);
+        static void onRangeAdjust(LLUICtrl* source, void* data);
         static void onBtnClose(void* userdata);
-        static void onList(LLUICtrl* ctrl, void* userdata);
+        static void onList(class LLUICtrl* ctrl, void* userdata);
+        static void onTabChanged(void* userdata, bool from_click);
         
-                   void doSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data);
-        static void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data);
+                   void doCallingCardSelectionChange(const std::deque<class LLFolderViewItem*> &items, BOOL user_action, void* data);
+        static void onCallingCardSelectionChange(const std::deque<class LLFolderViewItem*> &items, BOOL user_action, void* data);
+
+        void populateNearMe();
+        BOOL visibleItemsSelected() const; // Returns true if any items in the current tab are selected.
 
         void find();
         void setAllowMultiple(BOOL allow_multiple);
 
+        virtual void draw();
         virtual BOOL handleKeyHere(KEY key, MASK mask);
 
-protected:
-        LLScrollListCtrl*       mListNames;
-        LLInventoryPanel*       mInventoryPanel;
-        
-        std::vector<LLUUID>                             mAvatarIDs;
-        std::vector<std::string>                mAvatarNames;
-        BOOL                            mAllowMultiple;
+        std::vector<LLUUID>                             mSelectedInventoryAvatarIDs;
+        std::vector<std::string>                mSelectedInventoryAvatarNames;
         LLUUID                          mQueryID;
         BOOL                            mResultsReturned;
+        BOOL                            mNearMeListComplete;
         BOOL                            mCloseOnSelect;
 
         void (*mCallback)(const std::vector<std::string>& name, const std::vector<LLUUID>& id, void* userdata);
         void* mCallbackUserdata;
 
-protected:
         static LLFloaterAvatarPicker* sInstance;
 
-protected:
         // do not call these directly
         LLFloaterAvatarPicker();
         virtual ~LLFloaterAvatarPicker();
 };
 
-
 #endif
diff --git a/linden/indra/newview/llfloatergodtools.cpp b/linden/indra/newview/llfloatergodtools.cpp
index 7d54ecf..4b44793 100644
--- a/linden/indra/newview/llfloatergodtools.cpp
+++ b/linden/indra/newview/llfloatergodtools.cpp
@@ -1344,8 +1344,8 @@ void LLPanelRequestTools::refresh()
         list->operateOnAll(LLCtrlListInterface::OP_DELETE);
         list->addSimpleElement(SELECTION);
         list->addSimpleElement(AGENT_REGION);
-        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->mActiveRegionList.begin();
-                 iter != LLWorld::getInstance()->mActiveRegionList.end(); ++iter)
+        for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
                 LLViewerRegion* regionp = *iter;
                 std::string name = regionp->getName();
@@ -1405,8 +1405,8 @@ void LLPanelRequestTools::onClickRequest(void* data)
         else
         {
                 // find region by name
-                for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->mActiveRegionList.begin();
-                         iter != LLWorld::getInstance()->mActiveRegionList.end(); ++iter)
+                for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                         iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
                 {
                         LLViewerRegion* regionp = *iter;
                         if(dest == regionp->getName())
diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp
index 7506004..2b51948 100644
--- a/linden/indra/newview/llglsandbox.cpp
+++ b/linden/indra/newview/llglsandbox.cpp
@@ -271,7 +271,7 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
         {
                 std::vector<LLDrawable*> potentials;
                                 
-                for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
                         iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
                 {
                         LLViewerRegion* region = *iter;
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 9d92576..cedabf7 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -257,8 +257,8 @@ void LLNetMap::draw()
                 // figure out where agent is
                 S32 region_width = llround(LLWorld::getInstance()->getRegionWidthInMeters());
 
-                for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->mActiveRegionList.begin();
-                         iter != LLWorld::getInstance()->mActiveRegionList.end(); ++iter)
+                for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                                iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
                 {
                         LLViewerRegion* regionp = *iter;
                         // Find x and y position relative to camera's center.
@@ -374,8 +374,8 @@ void LLNetMap::draw()
                 LLVector3 pos_map;
 
                 // Draw avatars
-                for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->mActiveRegionList.begin();
-                         iter != LLWorld::getInstance()->mActiveRegionList.end(); ++iter)
+                for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                                iter != LLWorld::getInstance()->getRegionList().end(); ++iter) 
                 {
                         LLViewerRegion* regionp = *iter;
                         const LLVector3d& origin_global = regionp->getOriginGlobal();
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index 9b85fec..78398bb 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -1115,7 +1115,7 @@ void LLViewerObjectList::generatePickList(LLCamera &camera)
 
                 std::vector<LLDrawable*> pick_drawables;
 
-                for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
                         iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
                 {
                         LLViewerRegion* region = *iter;
diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp
index 04f9e25..9ee789a 100644
--- a/linden/indra/newview/llworld.cpp
+++ b/linden/indra/newview/llworld.cpp
@@ -951,7 +951,7 @@ void LLWorld::updateWaterObjects()
 
 void LLWorld::shiftRegions(const LLVector3& offset)
 {
-        for (region_list_t::iterator i = getRegionList().begin(); i != getRegionList().end(); ++i)
+        for (region_list_t::const_iterator i = getRegionList().begin(); i != getRegionList().end(); ++i)
         {
                 LLViewerRegion* region = *i;
                 region->updateRenderMatrix();
@@ -1137,8 +1137,8 @@ void send_agent_pause()
         gAgentPauseSerialNum++;
         gMessageSystem->addU32Fast(_PREHASH_SerialNum, gAgentPauseSerialNum);
 
-        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->mActiveRegionList.begin();
-                 iter != LLWorld::getInstance()->mActiveRegionList.end(); ++iter)
+        for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
+                 iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
                 LLViewerRegion* regionp = *iter;
                 gMessageSystem->sendReliable(regionp->getHost());
@@ -1167,8 +1167,8 @@ void send_agent_resume()
         gMessageSystem->addU32Fast(_PREHASH_SerialNum, gAgentPauseSerialNum);
         
 
-        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->mActiveRegionList.begin();
-                 iter != LLWorld::getInstance()->mActiveRegionList.end(); ++iter)
+        for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
+                 iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
                 LLViewerRegion* regionp = *iter;
                 gMessageSystem->sendReliable(regionp->getHost());
@@ -1180,6 +1180,62 @@ void send_agent_resume()
         LLAppViewer::instance()->resumeMainloopTimeout();
 }
 
+static LLVector3d unpackLocalToGlobalPosition(U32 compact_local, const LLVector3d& region_origin)
+{
+        LLVector3d pos_global;
+        LLVector3 pos_local;
+        U8 bits;
+
+        bits = compact_local & 0xFF;
+        pos_local.mV[VZ] = F32(bits) * 4.f;
+        compact_local >>= 8;
+
+        bits = compact_local & 0xFF;
+        pos_local.mV[VY] = (F32)bits;
+        compact_local >>= 8;
+
+        bits = compact_local & 0xFF;
+        pos_local.mV[VX] = (F32)bits;
+
+        pos_global.setVec( pos_local );
+        pos_global += region_origin;
+        return pos_global;
+}
+
+void LLWorld::getAvatars(std::vector<LLUUID>* avatar_ids, std::vector<LLVector3d>* positions, const LLVector3d& relative_to, F32 radius) const
+{
+        if(avatar_ids != NULL)
+        {
+                avatar_ids->clear();
+        }
+        if(positions != NULL)
+        {
+                positions->clear();
+        }
+        for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
+                iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+        {
+                LLViewerRegion* regionp = *iter;
+                const LLVector3d& origin_global = regionp->getOriginGlobal();
+                S32 count = regionp->mMapAvatars.count();
+                for (S32 i = 0; i < count; i++)
+                {
+                        LLVector3d pos_global = unpackLocalToGlobalPosition(regionp->mMapAvatars.get(i), origin_global);
+                        if(dist_vec(pos_global, relative_to) <= radius)
+                        {
+                                if(positions != NULL)
+                                {
+                                        positions->push_back(pos_global);
+                                }
+                                if(avatar_ids != NULL)
+                                {
+                                        avatar_ids->push_back(regionp->mMapAvatarIDs.get(i));
+                                }
+                        }
+                }
+        }
+}
+
 
 LLHTTPRegistration<LLEstablishAgentCommunication>
         gHTTPRegistrationEstablishAgentCommunication(
diff --git a/linden/indra/newview/llworld.h b/linden/indra/newview/llworld.h
index 7e50bc4..460809a 100644
--- a/linden/indra/newview/llworld.h
+++ b/linden/indra/newview/llworld.h
@@ -1,6 +1,11 @@
 /** 
  * @file llworld.h
- * @brief Initial test structure to organize viewer regions
+ * @brief Collection of viewer regions in the vacinity of the user.
+ *
+ * Represents the whole world, so far as 3D functionality is conserned.
+ * Always contains the region that the user's avatar is in along with
+ * neighboring regions. As the user crosses region boundaries, new
+ * regions are added to the world and distant ones are rolled up.
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
@@ -146,12 +151,18 @@ public:
 
 public:
         typedef std::list<LLViewerRegion*> region_list_t;
-        
-        region_list_t   mActiveRegionList;
+        const region_list_t& getRegionList() const { return mActiveRegionList; }
 
-        region_list_t& getRegionList() { return mActiveRegionList; }
+        // Returns lists of avatar IDs and their world-space positions within a given distance of a point.
+        // All arguments are optional. Given containers will be emptied and then filled.
+        // Not supplying origin or radius input returns data on all avatars in the known regions.
+        void getAvatars(
+                std::vector<LLUUID>* avatar_ids = NULL,
+                std::vector<LLVector3d>* positions = NULL, 
+                const LLVector3d& relative_to = LLVector3d(), F32 radius = FLT_MAX) const;
 
 private:
+        region_list_t   mActiveRegionList;
         region_list_t   mRegionList;
         region_list_t   mVisibleRegionList;
         region_list_t   mCulledRegionList;
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 0406520..87b810c 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -608,7 +608,7 @@ void LLPipeline::restoreGL()
                 LLViewerShaderMgr::instance()->setShaders();
         }
 
-        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+        for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
                         iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
                 LLViewerRegion* region = *iter;
@@ -758,7 +758,7 @@ void LLPipeline::dirtyPoolObjectTextures(const std::set<LLViewerImage*>& texture
         }
         
         LLOctreeDirtyTexture dirty(textures);
-        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+        for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
                         iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
                 LLViewerRegion* region = *iter;
@@ -1149,7 +1149,7 @@ void LLPipeline::updateMove()
         {
                 LLFastTimer ot(LLFastTimer::FTM_OCTREE_BALANCE);
 
-                for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
                         iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
                 {
                         LLViewerRegion* region = *iter;
@@ -1226,7 +1226,7 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl
         gGL.setColorMask(false, false);
         LLGLDepthTest depth(GL_TRUE, GL_FALSE);
 
-        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+        for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
                         iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
                 LLViewerRegion* region = *iter;
@@ -1609,7 +1609,7 @@ void LLPipeline::shiftObjects(const LLVector3 &offset)
         }
         mShiftList.resize(0);
 
-        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+        for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
                         iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
                 LLViewerRegion* region = *iter;
@@ -2591,7 +2591,7 @@ void LLPipeline::renderDebug()
         gGL.setColorMask(true, false);
 
         // Debug stuff.
-        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+        for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
                         iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
                 LLViewerRegion* region = *iter;
@@ -4037,7 +4037,7 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector3& start,
 
         sPickAvatar = FALSE; //LLToolMgr::getInstance()->inBuildMode() ? FALSE : TRUE;
         
-        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+        for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
                         iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
                 LLViewerRegion* region = *iter;
@@ -4094,7 +4094,7 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector3& start,
 
                 //check against avatars
                 sPickAvatar = TRUE;
-                for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
                                 iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
                 {
                         LLViewerRegion* region = *iter;
@@ -4171,7 +4171,7 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInHUD(const LLVector3& start, co
 {
         LLDrawable* drawable = NULL;
 
-        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+        for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
                         iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
                 LLViewerRegion* region = *iter;
@@ -4234,7 +4234,7 @@ void LLPipeline::resetVertexBuffers()
 {
         sRenderBump = gSavedSettings.getBOOL("RenderObjectBump");
 
-        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+        for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
                         iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
                 LLViewerRegion* region = *iter;
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
index 8e3f822..49b7cb5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
@@ -1,42 +1,96 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-380" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="380" left="400" min_height="340" min_width="200"
-     mouse_opaque="true" name="avatarpicker" title="Choose Resident" width="240">
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-40" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-             mouse_opaque="true" name="instruct_search_resident_name" v_pad="0"
-             width="220">
-                Type part of the resident&apos;s name:
-        </text>
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-16"
-             follows="left|top|right" font="SansSerifSmall" height="16" left="12"
-             max_length="254" mouse_opaque="true" name="Edit" select_on_focus="false"
-             width="132" />
-        <button bottom_delta="-3" follows="top|right" font="SansSerif" halign="center"
-             height="20" label="Find" label_selected="Find" left_delta="140"
-             mouse_opaque="true" name="Find" scale_image="TRUE" width="80" />
-        <scroll_list background_visible="true" bottom_delta="-164" column_padding="5"
-             draw_border="true" draw_heading="false" draw_stripes="true"
-             follows="left|top|right" height="156" left="12" mouse_opaque="true"
-             multi_select="false" name="Names" width="220" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-             mouse_opaque="true" name="Or select their calling card:" v_pad="0"
-             width="220">
-                Or select a calling card:
-        </text>
-        <inventory_panel allow_multi_select="false" border="true" bottom_delta="-100"
-             follows="left|top|right|bottom" height="100" left="12" mouse_opaque="true"
-             name="Inventory Panel" sort_order="AvatarPickerSortOrder" width="220" />
-        <button bottom_delta="-28" follows="left|bottom" font="SansSerif" halign="center"
-             height="20" label="Close" label_selected="Close" mouse_opaque="true"
-             name="Close" right="230" scale_image="TRUE" width="105" />
-        <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
-             height="20" label="Select" label_selected="Select" mouse_opaque="true"
-             name="Select" right="119" scale_image="TRUE" width="105" />
-        <string name="NotFound">
+     can_resize="true" height="350" left="400" min_height="200" min_width="250"
+     mouse_opaque="true" name="avatarpicker" title="Choose Resident" width="250">
+
+        <tab_container bottom="30" follows="left|right|top|bottom" height="300" left="4"
+             name="ResidentChooserTabs" tab_position="top" tab_width="65" width="240">
+                <panel name="SearchPanel" label="Search"
+                        border="true" bottom="0" height="150" left="6" width="120"
+                        mouse_opaque="true">
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-24" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+                             mouse_opaque="true" name="InstructSearchResidentName" v_pad="0"
+                             width="220">
+                                Type part of the resident&apos;s name:
+                        </text>
+                        <line_editor bevel_style="in" border_style="line"
+                             border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top|right"
+                             font="SansSerifSmall" height="16" left="10" right="-120"
+                             max_length="254" mouse_opaque="true" name="Edit"
+                             width="132" />
+                        <button bottom_delta="-3" follows="top|right" font="SansSerif" halign="center"
+                             height="20" label="Find" label_selected="Find" left_delta="20" right="-10"
+                             mouse_opaque="true" name="Find" scale_image="TRUE" width="80" />
+                        <scroll_list background_visible="true" bottom_delta="-95" column_padding="5"
+                             draw_border="true" draw_heading="false" draw_stripes="true"
+                             follows="left|top|right|bottom" height="90" left="10" mouse_opaque="true"
+                             multi_select="false" name="SearchResults" width="100" />
+                </panel>
+
+                <panel name="CallingCardsPanel" label="Calling Cards"
+                        border="true" bottom="0" height="150" left="0" width="120" 
+                        mouse_opaque="true">
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-24" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+                             mouse_opaque="true" name="InstructSelectCallingCard" v_pad="0"
+                             width="220">
+                                Select a calling card:
+                        </text>
+                        <inventory_panel allow_multi_select="false" border="true" bottom_delta="-117"
+                             follows="left|top|right|bottom" height="110" left="10" mouse_opaque="true"
+                             name="InventoryPanel" sort_order="AvatarPickerSortOrder" width="100" />
+                </panel>
+
+    <panel name="NearMePanel" label="Near Me"
+      border="true" bottom="0" height="240" left="6" width="120" mouse_opaque="true">
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom="-24" 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:
+      </text>
+      <button bottom_delta="-3" left_delta="10" width="90" height="20" follows="top|right" 
+           label="Refresh List" label_selected="Refresh List" halign="center"
+           font="SansSerif" mouse_opaque="true" name="Refresh" scale_image="TRUE" />
+      <slider bottom_delta="-20" left="10" follows="left|top" width="175" height="15"
+           name="near_me_range" label="Range" control_name="NearMeRange" 
+           min_val="5" max_val="40" increment="1" initial_val="20" 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"
+           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="-185" width="100" height="175" left="10" 
+           follows="left|top|right|bottom" 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="NearMe"  />
+    </panel>
+
+        </tab_container>
+
+  <button bottom="6" left="10" follows="left|bottom" font="SansSerif" halign="center"
+             width="75" height="20" label="Select" label_selected="Select" mouse_opaque="true"
+             name="Select" scale_image="TRUE" />
+        <button bottom_delta="0" right="230" follows="left|bottom" font="SansSerif" halign="center"
+             width="75" height="20" label="Cancel" label_selected="Cancel" mouse_opaque="true"
+             name="Cancel" scale_image="TRUE" />
+
+        <string name="not_found">
                 &apos;[TEXT]&apos; not found
         </string>
+        <string name="no_one_near">
+                No-one near
+        </string>
+        <string name="no_results">
+                No results
+        </string>
+        <string name="searching">
+                Searching...
+        </string>
 </floater>