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/llui/llbutton.cpp | |
parent | c2601ec9c574ac3bd7a7f4001bc08572483028a6 (diff) | |
parent | 1a093beb7f69e6911f34cb12d71502aa7a05982e (diff) |
merge
Diffstat (limited to 'indra/llui/llbutton.cpp')
-rwxr-xr-x | indra/llui/llbutton.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index ed12f686a1..913793803c 100755 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -252,7 +252,7 @@ LLButton::LLButton(const LLButton::Params& p) if (mImageUnselected.isNull()) { - llwarns << "Button: " << getName() << " with no image!" << llendl; + LL_WARNS() << "Button: " << getName() << " with no image!" << LL_ENDL; } if (p.click_callback.isProvided()) @@ -591,7 +591,7 @@ BOOL LLButton::handleHover(S32 x, S32 y, MASK mask) // We only handle the click if the click both started and ended within us getWindow()->setCursor(UI_CURSOR_ARROW); - LL_DEBUGS("UserInput") << "hover handled by " << getName() << llendl; + LL_DEBUGS("UserInput") << "hover handled by " << getName() << LL_ENDL; } return TRUE; } @@ -816,7 +816,7 @@ void LLButton::draw() else { // no image - lldebugs << "No image for button " << getName() << llendl; + LL_DEBUGS() << "No image for button " << getName() << LL_ENDL; // draw it in pink so we can find it gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, LLColor4::pink1 % alpha, FALSE); } @@ -1039,7 +1039,7 @@ void LLButton::setImageUnselected(LLPointer<LLUIImage> image) mImageUnselected = image; if (mImageUnselected.isNull()) { - llwarns << "Setting default button image for: " << getName() << " to NULL" << llendl; + LL_WARNS() << "Setting default button image for: " << getName() << " to NULL" << LL_ENDL; } } |