diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2013-01-10 00:14:46 +0000 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2013-01-10 00:14:46 +0000 |
| commit | 8b836f776a69b81b08e7f6429ee707f56825c51a (patch) | |
| tree | f94907ae89eca02975bb783200536e246d5b5f4d /indra/newview | |
| parent | 386e918583fe25532f401c6b50c49632d7410d39 (diff) | |
gcc fixes
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterjoystick.cpp | 22 | ||||
| -rw-r--r-- | indra/newview/llvosky.cpp | 2 |
2 files changed, 15 insertions, 9 deletions
diff --git a/indra/newview/llfloaterjoystick.cpp b/indra/newview/llfloaterjoystick.cpp index e2813a8272..ab7fc1cf3f 100644 --- a/indra/newview/llfloaterjoystick.cpp +++ b/indra/newview/llfloaterjoystick.cpp @@ -42,14 +42,20 @@ #include "llviewerjoystick.h" #include "llcheckboxctrl.h" -static LLTrace::Measurement<> sJoystickAxes[6] = +static LLTrace::Measurement<> sJoystickAxis1("Joystick axis 1"), + sJoystickAxis2("Joystick axis 2"), + sJoystickAxis3("Joystick axis 3"), + sJoystickAxis4("Joystick axis 4"), + sJoystickAxis5("Joystick axis 5"), + sJoystickAxis6("Joystick axis 6"); +static LLTrace::Measurement<>* sJoystickAxes[6] = { - LLTrace::Measurement<>("Joystick axis 1"), - LLTrace::Measurement<>("Joystick axis 2"), - LLTrace::Measurement<>("Joystick axis 3"), - LLTrace::Measurement<>("Joystick axis 4"), - LLTrace::Measurement<>("Joystick axis 5"), - LLTrace::Measurement<>("Joystick axis 6") + &sJoystickAxis1, + &sJoystickAxis2, + &sJoystickAxis3, + &sJoystickAxis4, + &sJoystickAxis5, + &sJoystickAxis6 }; LLFloaterJoystick::LLFloaterJoystick(const LLSD& data) @@ -71,7 +77,7 @@ void LLFloaterJoystick::draw() for (U32 i = 0; i < 6; i++) { F32 value = joystick->getJoystickAxis(i); - sJoystickAxes[i].sample(value * gFrameIntervalSeconds.value()); + sJoystickAxes[i]->sample(value * gFrameIntervalSeconds.value()); if (mAxisStatsBar[i]) { F32 minbar, maxbar; diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index 31358df85f..82de61cda2 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -2146,7 +2146,7 @@ void LLVOSky::updateFog(const F32 distance) // get the water param manager variables float water_fog_density = LLWaterParamManager::getInstance()->getFogDensity(); - LLColor4 water_fog_color = LLDrawPoolWater::sWaterFogColor.mV; + LLColor4 water_fog_color(LLDrawPoolWater::sWaterFogColor.mV); // adjust the color based on depth. We're doing linear approximations float depth_scale = gSavedSettings.getF32("WaterGLFogDepthScale"); |