Second Life viewer sources 1.15.0.2

1 files changed, 11 insertions, 11 deletions

diff --git a/linden/indra/newview/llpanelplace.cpp b/linden/indra/newview/llpanelplace.cpp
index f373e99..a9f11cc 100644
--- a/linden/indra/newview/llpanelplace.cpp
+++ b/linden/indra/newview/llpanelplace.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2004-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
@@ -51,7 +52,7 @@
 #include "llweb.h"
 
 //static
-LLLinkedList<LLPanelPlace> LLPanelPlace::sAllPanels;
+std::list<LLPanelPlace*> LLPanelPlace::sAllPanels;
 
 LLPanelPlace::LLPanelPlace()
 :       LLPanel("Places Panel"),
@@ -59,13 +60,13 @@ LLPanelPlace::LLPanelPlace()
         mPosGlobal(),
         mAuctionID(0)
 {
-        sAllPanels.addData(this);
+        sAllPanels.push_back(this);
 }
 
 
 LLPanelPlace::~LLPanelPlace()
 {
-        sAllPanels.removeData(this);
+        sAllPanels.remove(this);
 }
 
 
@@ -158,10 +159,9 @@ void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **)
         msg->getUUID("Data", "ParcelID", parcel_id);
 
         // look up all panels which have this avatar
-        LLPanelPlace *self = NULL;
-
-        for (self = sAllPanels.getFirstData(); self; self = sAllPanels.getNextData())
+        for (panel_list_t::iterator iter = sAllPanels.begin(); iter != sAllPanels.end(); ++iter)
         {
+                LLPanelPlace* self = *iter;
                 if (self->mParcelID != parcel_id)
                 {
                         continue;
@@ -193,16 +193,16 @@ void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **)
                 self->mDescEditor->setText(desc);
 
                 LLString info;
-                snprintf(buffer, sizeof(buffer), "Traffic: %.0f, Area: %d sq. m.", dwell, actual_area);         /*Flawfinder: ignore*/
+                snprintf(buffer, sizeof(buffer), "Traffic: %.0f, Area: %d sq. m.", dwell, actual_area);                 /* Flawfinder: ignore */
                 info.append(buffer);
                 if (flags & DFQ_FOR_SALE)
                 {
-                        snprintf(buffer, sizeof(buffer), ", For Sale for L$%d", sale_price);            /*Flawfinder: ignore*/
+                        snprintf(buffer, sizeof(buffer), ", For Sale for L$%d", sale_price);                    /* Flawfinder: ignore */
                         info.append(buffer);
                 }
                 if (auction_id != 0)
                 {
-                        snprintf(buffer, sizeof(buffer), ", Auction ID %010d", auction_id);             /*Flawfinder: ignore*/
+                        snprintf(buffer, sizeof(buffer), ", Auction ID %010d", auction_id);                     /* Flawfinder: ignore */
                         info.append(buffer);
                 }
                 self->mInfoEditor->setText(info);
@@ -218,7 +218,7 @@ void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **)
                         rating = LLViewerRegion::accessToString(SIM_ACCESS_MATURE);
                 }
 
-                snprintf(buffer, sizeof(buffer), "%s %d, %d, %d (%s)",          /*Flawfinder: ignore*/
+                snprintf(buffer, sizeof(buffer), "%s %d, %d, %d (%s)",                  /* Flawfinder: ignore */
                         sim_name, region_x, region_y, region_z, rating);
                 self->mLocationEditor->setText(buffer);
 
@@ -281,7 +281,7 @@ void LLPanelPlace::callbackAuctionWebPage(S32 option, void* data)
         if (0 == option)
         {
                 char url[256];          /*Flawfinder: ignore*/
-                snprintf(url, sizeof(url), "%s%010d", AUCTION_URL, self->mAuctionID);           /*Flawfinder: ignore*/
+                snprintf(url, sizeof(url), "%s%010d", AUCTION_URL, self->mAuctionID);                   /* Flawfinder: ignore */
 
                 llinfos << "Loading auction page " << url << llendl;