1 files changed, 7 insertions, 8 deletions

diff --git a/linden/indra/newview/llfloaterbump.cpp b/linden/indra/newview/llfloaterbump.cpp
index 4508702..d340112 100644
--- a/linden/indra/newview/llfloaterbump.cpp
+++ b/linden/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,9 +82,9 @@ void LLFloaterBump::show(void *contents)
         if (!list) return;
         list->deleteAllItems();
 
-        if (gMeanCollisionList.isEmpty())
+        if (gMeanCollisionList.empty())
         {
-                LLString none_detected = sInstance->childGetText("none_detected");
+                LLString none_detected = sInstance->getString("none_detected");
                 LLSD row;
                 row["columns"][0]["value"] = none_detected;
                 row["columns"][0]["font"] = "SansSerifBold";
@@ -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);
                 }
         }
@@ -151,7 +150,7 @@ void LLFloaterBump::add(LLScrollListCtrl* list, LLMeanCollisionData* mcd)
         }
 
         // All above action strings are in XML file
-        LLUIString text = sInstance->childGetText(action);
+        LLUIString text = sInstance->getUIString(action);
         text.setArg("[TIME]", time);
         text.setArg("[FIRST]", mcd->mFirstName);
         text.setArg("[LAST]", mcd->mLastName);