diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-10-19 13:47:15 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-10-19 13:47:15 -0700 |
| commit | 42e397e155239932a75fa694dc77d9dd952e3c09 (patch) | |
| tree | 1d3cb00d99a585879facf6dce5b7133dbd8ad6da /indra/newview/llfloaterbump.cpp | |
| parent | a63b83775120f7ebe3bafb897da70e4e41bda6a4 (diff) | |
| parent | c683151587067cb2758206432610d4ff4884036e (diff) | |
Merged from 2.3.0-beta1 tag in viewer-development
Diffstat (limited to 'indra/newview/llfloaterbump.cpp')
| -rw-r--r-- | indra/newview/llfloaterbump.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llfloaterbump.cpp b/indra/newview/llfloaterbump.cpp index af98453c3c..61cf4dad93 100644 --- a/indra/newview/llfloaterbump.cpp +++ b/indra/newview/llfloaterbump.cpp @@ -45,7 +45,6 @@ LLFloaterBump::LLFloaterBump(const LLSD& key) : LLFloater(key) { if(gNoRender) return; - //LLUICtrlFactory::getInstance()->buildFloater(this, "floater_bumps.xml"); } @@ -83,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; } @@ -121,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; |