Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/lljoystickbutton.cpp
View File

@@ -119,7 +119,7 @@ void LLJoystick::updateSlop()
break;
default:
llerrs << "LLJoystick::LLJoystick() - bad switch case" << llendl;
LL_ERRS() << "LLJoystick::LLJoystick() - bad switch case" << LL_ENDL;
break;
}
@@ -129,7 +129,7 @@ void LLJoystick::updateSlop()
BOOL LLJoystick::handleMouseDown(S32 x, S32 y, MASK mask)
{
//llinfos << "joystick mouse down " << x << ", " << y << llendl;
//LL_INFOS() << "joystick mouse down " << x << ", " << y << LL_ENDL;
mLastMouse.set(x, y);
mFirstMouse.set(x, y);
@@ -141,7 +141,7 @@ BOOL LLJoystick::handleMouseDown(S32 x, S32 y, MASK mask)
BOOL LLJoystick::handleMouseUp(S32 x, S32 y, MASK mask)
{
// llinfos << "joystick mouse up " << x << ", " << y << llendl;
// LL_INFOS() << "joystick mouse up " << x << ", " << y << LL_ENDL;
if( hasMouseCapture() )
{
@@ -265,7 +265,7 @@ void LLJoystickAgentTurn::onHeldDown()
F32 time = getElapsedHeldDownTime();
updateSlop();
//llinfos << "move forward/backward (and/or turn)" << llendl;
//LL_INFOS() << "move forward/backward (and/or turn)" << LL_ENDL;
S32 dx = mLastMouse.mX - mFirstMouse.mX + mInitialOffset.mX;
S32 dy = mLastMouse.mY - mFirstMouse.mY + mInitialOffset.mY;
@@ -393,7 +393,7 @@ void LLJoystickAgentSlide::onMouseUp()
void LLJoystickAgentSlide::onHeldDown()
{
//llinfos << "slide left/right (and/or move forward/backward)" << llendl;
//LL_INFOS() << "slide left/right (and/or move forward/backward)" << LL_ENDL;
updateSlop();
@@ -592,7 +592,7 @@ F32 LLJoystickCameraRotate::getOrbitRate()
if( time < NUDGE_TIME )
{
F32 rate = ORBIT_NUDGE_RATE + time * (1 - ORBIT_NUDGE_RATE)/ NUDGE_TIME;
//llinfos << rate << llendl;
//LL_INFOS() << rate << LL_ENDL;
return rate;
}
else
@@ -852,7 +852,7 @@ void LLJoystickCameraZoom::updateSlop()
break;
default:
llerrs << "LLJoystick::LLJoystick() - bad switch case" << llendl;
LL_ERRS() << "LLJoystick::LLJoystick() - bad switch case" << LL_ENDL;
break;
}
@@ -866,7 +866,7 @@ F32 LLJoystickCameraZoom::getOrbitRate()
if( time < NUDGE_TIME )
{
F32 rate = ORBIT_NUDGE_RATE + time * (1 - ORBIT_NUDGE_RATE)/ NUDGE_TIME;
// llinfos << "rate " << rate << " time " << time << llendl;
// LL_INFOS() << "rate " << rate << " time " << time << LL_ENDL;
return rate;
}
else