diff options
author | Richard Linden <none@none> | 2013-08-12 20:07:41 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-08-12 20:07:41 -0700 |
commit | b8d49dab9afddf196618d66b1a409cdf7d2d53ba (patch) | |
tree | 535eb32ba4f17c87c0853cda9223c37a4940fea1 /indra/newview/llfloaterbump.cpp | |
parent | c2601ec9c574ac3bd7a7f4001bc08572483028a6 (diff) | |
parent | 1a093beb7f69e6911f34cb12d71502aa7a05982e (diff) |
merge
Diffstat (limited to 'indra/newview/llfloaterbump.cpp')
-rwxr-xr-x | indra/newview/llfloaterbump.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterbump.cpp b/indra/newview/llfloaterbump.cpp index eeb81085bb..ad44c509d9 100755 --- a/indra/newview/llfloaterbump.cpp +++ b/indra/newview/llfloaterbump.cpp @@ -110,8 +110,8 @@ void LLFloaterBump::add(LLScrollListCtrl* list, LLMeanCollisionData* mcd) action = "physical_object_collide"; break; default: - llinfos << "LLFloaterBump::add unknown mean collision type " - << mcd->mType << llendl; + LL_INFOS() << "LLFloaterBump::add unknown mean collision type " + << mcd->mType << LL_ENDL; return; } |