diff options
Diffstat (limited to 'indra/newview/llfloaterbump.cpp')
| -rw-r--r-- | indra/newview/llfloaterbump.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/llfloaterbump.cpp b/indra/newview/llfloaterbump.cpp index 3f6ed92868..2cf1f555ea 100644 --- a/indra/newview/llfloaterbump.cpp +++ b/indra/newview/llfloaterbump.cpp @@ -37,13 +37,12 @@ #include "llscrolllistctrl.h" #include "llvieweruictrlfactory.h" +#include "llviewermessage.h" #include "llappviewer.h" // gPacificDaylightTime ///---------------------------------------------------------------------------- /// Local function declarations, constants, enums, and typedefs ///---------------------------------------------------------------------------- -extern LLLinkedList<LLMeanCollisionData> gMeanCollisionList; - LLFloaterBump* LLFloaterBump::sInstance = NULL; ///---------------------------------------------------------------------------- @@ -83,7 +82,7 @@ void LLFloaterBump::show(void *contents) if (!list) return; list->deleteAllItems(); - if (gMeanCollisionList.isEmpty()) + if (gMeanCollisionList.empty()) { LLString none_detected = sInstance->getString("none_detected"); LLSD row; @@ -93,10 +92,10 @@ void LLFloaterBump::show(void *contents) } else { - for (LLMeanCollisionData* mcd = gMeanCollisionList.getFirstData(); - mcd; - mcd = gMeanCollisionList.getNextData()) + for (mean_collision_list_t::iterator iter = gMeanCollisionList.begin(); + iter != gMeanCollisionList.end(); ++iter) { + LLMeanCollisionData *mcd = *iter; LLFloaterBump::add(list, mcd); } } |