diff options
author | Richard Linden <none@none> | 2013-07-30 19:15:46 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-07-30 19:15:46 -0700 |
commit | 5762c1d0d727f0050aefe7126ab2d5280bebfb9b (patch) | |
tree | 78bdcc931460dfc45d35cd1707ddf1afdf049a2e /indra/newview/llviewerwindow.cpp | |
parent | 4cca9ba279f908f206fa5e32adccf1038f05cc7f (diff) | |
parent | 910874a7e32bdfc456474e2d0ee84d190be3011e (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rwxr-xr-x | indra/newview/llviewerwindow.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 10e354f2e3..4ec9485aee 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -76,7 +76,6 @@ #include "message.h" #include "object_flags.h" #include "lltimer.h" -#include "timing.h" #include "llviewermenu.h" #include "lltooltip.h" #include "llmediaentry.h" @@ -3025,7 +3024,7 @@ void LLViewerWindow::updateUI() if( !handled ) { - lldebugst(LLERR_USER_INPUT) << "hover not handled by mouse captor" << llendl; + LL_DEBUGS("UserInput") << "hover not handled by mouse captor" << llendl; } } else |