diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/llfloaterbump.cpp | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llfloaterbump.cpp')
| -rw-r--r-- | indra/newview/llfloaterbump.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llfloaterbump.cpp b/indra/newview/llfloaterbump.cpp index ce2d56612c..98540f3c5e 100644 --- a/indra/newview/llfloaterbump.cpp +++ b/indra/newview/llfloaterbump.cpp @@ -84,7 +84,7 @@ void LLFloaterBump::show(void *contents) if (gMeanCollisionList.empty()) { - LLString none_detected = sInstance->getString("none_detected"); + std::string none_detected = sInstance->getString("none_detected"); LLSD row; row["columns"][0]["value"] = none_detected; row["columns"][0]["font"] = "SansSerifBold"; @@ -110,8 +110,7 @@ void LLFloaterBump::add(LLScrollListCtrl* list, LLMeanCollisionData* mcd) new LLFloaterBump(); } - if (!mcd->mFirstName[0] - || list->getItemCount() >= 20) + if (mcd->mFirstName.empty() || list->getItemCount() >= 20) { return; } @@ -123,9 +122,9 @@ void LLFloaterBump::add(LLScrollListCtrl* list, LLMeanCollisionData* mcd) // it's daylight savings time there. timep = utc_to_pacific_time(mcd->mTime, gPacificDaylightTime); - LLString time = llformat("[%d:%02d]", timep->tm_hour, timep->tm_min); + std::string time = llformat("[%d:%02d]", timep->tm_hour, timep->tm_min); - LLString action; + std::string action; switch(mcd->mType) { case MEAN_BUMP: |