diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-18 15:12:51 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-18 15:12:51 -0700 |
| commit | 616b1e8ec1c14f04661a42c2c4cbf6410bdfac38 (patch) | |
| tree | 5fa0a136a5a0f9465ea3ded91dab4058e7426067 /indra/newview | |
| parent | c5283f63ab6571a3f48f30cc4eb2dbab3f0633ce (diff) | |
Arrows in wave vector ctrl now match world and clouds. North at the top and East to the right.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpaneleditwater.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llpaneleditwater.cpp b/indra/newview/llpaneleditwater.cpp index 5d7c6f3943..40d84d74bd 100644 --- a/indra/newview/llpaneleditwater.cpp +++ b/indra/newview/llpaneleditwater.cpp @@ -143,9 +143,9 @@ void LLPanelSettingsWaterMainTab::refresh() getChild<LLUICtrl>(FIELD_WATER_FOG_DENSITY)->setValue(mWaterSettings->getWaterFogDensity()); getChild<LLUICtrl>(FIELD_WATER_UNDERWATER_MOD)->setValue(mWaterSettings->getFogMod()); mTxtNormalMap->setValue(mWaterSettings->getNormalMapID()); - LLVector2 vect2 = mWaterSettings->getWave1Dir(); + LLVector2 vect2 = mWaterSettings->getWave1Dir() * -1.0; // Flip so that north and east are + getChild<LLUICtrl>(FIELD_WATER_WAVE1_XY)->setValue(vect2.getValue()); - vect2 = mWaterSettings->getWave2Dir(); + vect2 = mWaterSettings->getWave2Dir() * -1.0; // Flip so that north and east are + getChild<LLUICtrl>(FIELD_WATER_WAVE2_XY)->setValue(vect2.getValue()); LLVector3 vect3 = mWaterSettings->getNormalScale(); getChild<LLUICtrl>(FIELD_WATER_NORMAL_SCALE_X)->setValue(vect3[0]); @@ -188,6 +188,7 @@ void LLPanelSettingsWaterMainTab::onNormalMapChanged() void LLPanelSettingsWaterMainTab::onLargeWaveChanged() { LLVector2 vect(getChild<LLUICtrl>(FIELD_WATER_WAVE1_XY)->getValue()); + vect *= -1.0; // Flip so that north and east are - LL_WARNS("LAPRAS") << "Changing Large Wave from " << mWaterSettings->getWave1Dir() << " -> " << vect << LL_ENDL; mWaterSettings->setWave1Dir(vect); setIsDirty(); @@ -196,6 +197,7 @@ void LLPanelSettingsWaterMainTab::onLargeWaveChanged() void LLPanelSettingsWaterMainTab::onSmallWaveChanged() { LLVector2 vect(getChild<LLUICtrl>(FIELD_WATER_WAVE2_XY)->getValue()); + vect *= -1.0; // Flip so that north and east are - LL_WARNS("LAPRAS") << "Changing Small Wave from " << mWaterSettings->getWave2Dir() << " -> " << vect << LL_ENDL; mWaterSettings->setWave2Dir(vect); setIsDirty(); |