diff options
| author | simon <none@none> | 2014-05-07 15:28:13 -0700 | 
|---|---|---|
| committer | simon <none@none> | 2014-05-07 15:28:13 -0700 | 
| commit | a5568f942b449e48cad71e92acd67eaa22dd5e5d (patch) | |
| tree | f266b99c9663fda8001cbde48aa5a6b1b9d7db68 /indra/newview/lltoolfocus.cpp | |
| parent | 80a134ffcc68b277c10cc79dc9c7ca073148b41e (diff) | |
| parent | dc4c184696b308b8f60fa1dd751b35e22bd47d62 (diff) | |
Merge downstream version 3.7.8 code
Diffstat (limited to 'indra/newview/lltoolfocus.cpp')
| -rwxr-xr-x | indra/newview/lltoolfocus.cpp | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp index 857b0f0714..ee4ec112f8 100755 --- a/indra/newview/lltoolfocus.cpp +++ b/indra/newview/lltoolfocus.cpp @@ -334,7 +334,7 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)  	{  		if (!mValidClickPoint)  		{ -			lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolFocus [invalid point]" << llendl; +			LL_DEBUGS("UserInput") << "hover handled by LLToolFocus [invalid point]" << LL_ENDL;  			gViewerWindow->setCursor(UI_CURSOR_NO);  			gViewerWindow->showCursor();  			return TRUE; @@ -361,7 +361,7 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)  				gViewerWindow->moveCursorToCenter();  			} -			lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolFocus [active]" << llendl; +			LL_DEBUGS("UserInput") << "hover handled by LLToolFocus [active]" << LL_ENDL;  		}  		else if (	gCameraBtnPan ||  					mask == MASK_PAN || @@ -389,7 +389,7 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)  				gViewerWindow->moveCursorToCenter();  			} -			lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPan" << llendl; +			LL_DEBUGS("UserInput") << "hover handled by LLToolPan" << LL_ENDL;  		}  		else if (gCameraBtnZoom)  		{ @@ -421,7 +421,7 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)  				gViewerWindow->moveCursorToCenter();  			} -			lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolZoom" << llendl;		 +			LL_DEBUGS("UserInput") << "hover handled by LLToolZoom" << LL_ENDL;		  		}  	} | 
