diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2010-11-05 13:30:20 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2010-11-05 13:30:20 -0700 |
| commit | 447dc782fd4d490387fd98e9fb41135038512767 (patch) | |
| tree | b7875f5dd54d4068d777adbe90a3dd36b99a38eb /indra/newview/llfloaterbump.cpp | |
| parent | d5d4a065275d1db1093111222f29942ee171f81c (diff) | |
| parent | 124a59263184391b0b4ec418c532b7a715e9b5a3 (diff) | |
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llfloaterbump.cpp')
| -rw-r--r-- | indra/newview/llfloaterbump.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llfloaterbump.cpp b/indra/newview/llfloaterbump.cpp index a02b67f08e..61cf4dad93 100644 --- a/indra/newview/llfloaterbump.cpp +++ b/indra/newview/llfloaterbump.cpp @@ -82,7 +82,7 @@ void LLFloaterBump::onOpen(const LLSD& key) void LLFloaterBump::add(LLScrollListCtrl* list, LLMeanCollisionData* mcd) { - if (mcd->mFirstName.empty() || list->getItemCount() >= 20) + if (mcd->mFullName.empty() || list->getItemCount() >= 20) { return; } @@ -120,8 +120,7 @@ void LLFloaterBump::add(LLScrollListCtrl* list, LLMeanCollisionData* mcd) // All above action strings are in XML file LLUIString text = getString(action); text.setArg("[TIME]", timeStr); - text.setArg("[FIRST]", mcd->mFirstName); - text.setArg("[LAST]", mcd->mLastName); + text.setArg("[NAME]", mcd->mFullName); LLSD row; row["id"] = mcd->mPerp; |