Second Life viewer sources 1.15.0.2

1 files changed, 16 insertions, 19 deletions

diff --git a/linden/indra/newview/llfloateravatarpicker.cpp b/linden/indra/newview/llfloateravatarpicker.cpp
index cb9af67..6989084 100644
--- a/linden/indra/newview/llfloateravatarpicker.cpp
+++ b/linden/indra/newview/llfloateravatarpicker.cpp
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2003-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -43,7 +44,7 @@
 const S32 MIN_WIDTH = 200;
 const S32 MIN_HEIGHT = 340;
 const LLRect FLOATER_RECT(0, 380, 240, 0);
-const char FLOATER_TITLE[] = "Choose Person";
+const char FLOATER_TITLE[] = "Choose Resident";
 
 // static
 LLFloaterAvatarPicker* LLFloaterAvatarPicker::sInstance = NULL;
@@ -108,9 +109,7 @@ BOOL LLFloaterAvatarPicker::postBuild()
 
         if (mListNames)
         {
-                LLScrollListItem* row = new LLScrollListItem( TRUE, NULL, LLUUID::null );
-                row->addColumn("No results", LLFontGL::sSansSerif);
-                mListNames->addItem(row);
+                mListNames->addSimpleElement("No results");
         }
 
         mInventoryPanel = (LLInventoryPanel*)this->getCtrlByNameAndType("Inventory Panel", WIDGET_TYPE_INVENTORY_PANEL);
@@ -188,11 +187,12 @@ void LLFloaterAvatarPicker::onList(LLUICtrl* ctrl, void* userdata)
         }
         
         std::vector<LLScrollListItem*> items = self->mListNames->getAllSelected();
-        std::vector<LLScrollListItem*>::iterator itor;
-        for (itor = items.begin(); itor != items.end(); ++itor)
+        for (std::vector<LLScrollListItem*>::iterator iter = items.begin();
+                 iter != items.end(); ++iter)
         {
-                self->mAvatarNames.push_back((*itor)->getColumn(0)->getText());
-                self->mAvatarIDs.push_back((*itor)->getUUID());
+                LLScrollListItem* item = *iter;
+                self->mAvatarNames.push_back(item->getColumn(0)->getText());
+                self->mAvatarIDs.push_back(item->getUUID());
                 self->childSetEnabled("Select", TRUE);
         }
 }
@@ -256,10 +256,7 @@ void LLFloaterAvatarPicker::find()
         if (mListNames)
         {
                 mListNames->deleteAllItems();   
-        
-                LLScrollListItem* row = new LLScrollListItem( TRUE, NULL, LLUUID::null );
-                row->addColumn("Searching...", LLFontGL::sSansSerif);
-                mListNames->addItem(row);
+                mListNames->addSimpleElement("Searching...");
         }
         
         childSetEnabled("Select", FALSE);
@@ -324,23 +321,23 @@ void LLFloaterAvatarPicker::processAvatarPickerReply(LLMessageSystem* msg, void*
                         msg->getStringFast(_PREHASH_Data,_PREHASH_FirstName, DB_FIRST_NAME_BUF_SIZE, first_name, i);
                         msg->getStringFast(_PREHASH_Data,_PREHASH_LastName,     DB_LAST_NAME_BUF_SIZE, last_name, i);
                 
-                        LLScrollListItem* row = new LLScrollListItem( TRUE, NULL, avatar_id );
-
+                        LLString avatar_name;
                         if (avatar_id.isNull())
                         {
                                 self->childSetTextArg("NotFound", "[TEXT]", self->childGetText("Edit"));
-                                LLString msg = self->childGetValue("NotFound").asString();
-                                row->addColumn(msg, LLFontGL::sSansSerif);
+                                avatar_name = self->childGetValue("NotFound").asString();
                                 self->mListNames->setEnabled(FALSE);
                         }
                         else
                         {
-                                LLString buffer = LLString(first_name) + " " + last_name;
-                                row->addColumn(buffer, LLFontGL::sSansSerif);
+                                avatar_name = LLString(first_name) + " " + last_name;
                                 self->mListNames->setEnabled(TRUE);
                                 found_one = TRUE;
                         }
-                        self->mListNames->addItem(row); 
+                        LLSD element;
+                        element["id"] = avatar_id; // value
+                        element["columns"][0]["value"] = avatar_name;
+                        self->mListNames->addElement(element);
                 }
         
                 if (found_one)