diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llpanelplace.cpp | 22 |
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 @@ | |||
4 | * | 4 | * |
5 | * Copyright (c) 2004-2007, Linden Research, Inc. | 5 | * Copyright (c) 2004-2007, Linden Research, Inc. |
6 | * | 6 | * |
7 | * Second Life Viewer Source Code | ||
7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
@@ -51,7 +52,7 @@ | |||
51 | #include "llweb.h" | 52 | #include "llweb.h" |
52 | 53 | ||
53 | //static | 54 | //static |
54 | LLLinkedList<LLPanelPlace> LLPanelPlace::sAllPanels; | 55 | std::list<LLPanelPlace*> LLPanelPlace::sAllPanels; |
55 | 56 | ||
56 | LLPanelPlace::LLPanelPlace() | 57 | LLPanelPlace::LLPanelPlace() |
57 | : LLPanel("Places Panel"), | 58 | : LLPanel("Places Panel"), |
@@ -59,13 +60,13 @@ LLPanelPlace::LLPanelPlace() | |||
59 | mPosGlobal(), | 60 | mPosGlobal(), |
60 | mAuctionID(0) | 61 | mAuctionID(0) |
61 | { | 62 | { |
62 | sAllPanels.addData(this); | 63 | sAllPanels.push_back(this); |
63 | } | 64 | } |
64 | 65 | ||
65 | 66 | ||
66 | LLPanelPlace::~LLPanelPlace() | 67 | LLPanelPlace::~LLPanelPlace() |
67 | { | 68 | { |
68 | sAllPanels.removeData(this); | 69 | sAllPanels.remove(this); |
69 | } | 70 | } |
70 | 71 | ||
71 | 72 | ||
@@ -158,10 +159,9 @@ void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **) | |||
158 | msg->getUUID("Data", "ParcelID", parcel_id); | 159 | msg->getUUID("Data", "ParcelID", parcel_id); |
159 | 160 | ||
160 | // look up all panels which have this avatar | 161 | // look up all panels which have this avatar |
161 | LLPanelPlace *self = NULL; | 162 | for (panel_list_t::iterator iter = sAllPanels.begin(); iter != sAllPanels.end(); ++iter) |
162 | |||
163 | for (self = sAllPanels.getFirstData(); self; self = sAllPanels.getNextData()) | ||
164 | { | 163 | { |
164 | LLPanelPlace* self = *iter; | ||
165 | if (self->mParcelID != parcel_id) | 165 | if (self->mParcelID != parcel_id) |
166 | { | 166 | { |
167 | continue; | 167 | continue; |
@@ -193,16 +193,16 @@ void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **) | |||
193 | self->mDescEditor->setText(desc); | 193 | self->mDescEditor->setText(desc); |
194 | 194 | ||
195 | LLString info; | 195 | LLString info; |
196 | snprintf(buffer, sizeof(buffer), "Traffic: %.0f, Area: %d sq. m.", dwell, actual_area); /*Flawfinder: ignore*/ | 196 | snprintf(buffer, sizeof(buffer), "Traffic: %.0f, Area: %d sq. m.", dwell, actual_area); /* Flawfinder: ignore */ |
197 | info.append(buffer); | 197 | info.append(buffer); |
198 | if (flags & DFQ_FOR_SALE) | 198 | if (flags & DFQ_FOR_SALE) |
199 | { | 199 | { |
200 | snprintf(buffer, sizeof(buffer), ", For Sale for L$%d", sale_price); /*Flawfinder: ignore*/ | 200 | snprintf(buffer, sizeof(buffer), ", For Sale for L$%d", sale_price); /* Flawfinder: ignore */ |
201 | info.append(buffer); | 201 | info.append(buffer); |
202 | } | 202 | } |
203 | if (auction_id != 0) | 203 | if (auction_id != 0) |
204 | { | 204 | { |
205 | snprintf(buffer, sizeof(buffer), ", Auction ID %010d", auction_id); /*Flawfinder: ignore*/ | 205 | snprintf(buffer, sizeof(buffer), ", Auction ID %010d", auction_id); /* Flawfinder: ignore */ |
206 | info.append(buffer); | 206 | info.append(buffer); |
207 | } | 207 | } |
208 | self->mInfoEditor->setText(info); | 208 | self->mInfoEditor->setText(info); |
@@ -218,7 +218,7 @@ void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **) | |||
218 | rating = LLViewerRegion::accessToString(SIM_ACCESS_MATURE); | 218 | rating = LLViewerRegion::accessToString(SIM_ACCESS_MATURE); |
219 | } | 219 | } |
220 | 220 | ||
221 | snprintf(buffer, sizeof(buffer), "%s %d, %d, %d (%s)", /*Flawfinder: ignore*/ | 221 | snprintf(buffer, sizeof(buffer), "%s %d, %d, %d (%s)", /* Flawfinder: ignore */ |
222 | sim_name, region_x, region_y, region_z, rating); | 222 | sim_name, region_x, region_y, region_z, rating); |
223 | self->mLocationEditor->setText(buffer); | 223 | self->mLocationEditor->setText(buffer); |
224 | 224 | ||
@@ -281,7 +281,7 @@ void LLPanelPlace::callbackAuctionWebPage(S32 option, void* data) | |||
281 | if (0 == option) | 281 | if (0 == option) |
282 | { | 282 | { |
283 | char url[256]; /*Flawfinder: ignore*/ | 283 | char url[256]; /*Flawfinder: ignore*/ |
284 | snprintf(url, sizeof(url), "%s%010d", AUCTION_URL, self->mAuctionID); /*Flawfinder: ignore*/ | 284 | snprintf(url, sizeof(url), "%s%010d", AUCTION_URL, self->mAuctionID); /* Flawfinder: ignore */ |
285 | 285 | ||
286 | llinfos << "Loading auction page " << url << llendl; | 286 | llinfos << "Loading auction page " << url << llendl; |
287 | 287 | ||