diff options
| author | James Cook <james@lindenlab.com> | 2008-07-18 17:50:25 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2008-07-18 17:50:25 +0000 |
| commit | ed386ae547c225e352c39e8d14921572ee534b0b (patch) | |
| tree | f67ff767edfc07900c0c8c16cd4439eb38d05be0 /indra/newview/lltoolbrush.cpp | |
| parent | 292627c09df6085c985a189edd5df06d3ca1eb47 (diff) | |
merge support-featurettes-snapshot-merge-2 for QAR-754, includes:
* featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4)
* gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3)
* featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771)
* snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3)
Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry
* QAR-590 Merge Lock Request for Support Sprint
* QAR-627 Merge snapshot improvements
* QAR-686 Merge Lock request for Featurettes
Diffstat (limited to 'indra/newview/lltoolbrush.cpp')
| -rw-r--r-- | indra/newview/lltoolbrush.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/indra/newview/lltoolbrush.cpp b/indra/newview/lltoolbrush.cpp index 1b006822c1..b644e43a64 100644 --- a/indra/newview/lltoolbrush.cpp +++ b/indra/newview/lltoolbrush.cpp @@ -154,7 +154,7 @@ void LLToolBrushLand::modifyLandAtPointGlobal(const LLVector3d &pos_global, regionp->forceUpdate(); // tell the simulator what we've done - F32 seconds = 1.0f / gFPSClamped; + F32 seconds = (1.0f / gFPSClamped) * gSavedSettings.getF32("LandBrushForce"); F32 x_pos = (F32)pos_region.mV[VX]; F32 y_pos = (F32)pos_region.mV[VY]; U8 brush_size = (U8)mBrushIndex; @@ -242,7 +242,7 @@ void LLToolBrushLand::modifyLandInSelectionGlobal() min_region.clamp(0.f, regionp->getWidth()); max_region.clamp(0.f, regionp->getWidth()); - F32 seconds = 1.0f; + F32 seconds = gSavedSettings.getF32("LandBrushForce"); LLSurface &land = regionp->getLand(); char action = E_LAND_LEVEL; @@ -251,21 +251,23 @@ void LLToolBrushLand::modifyLandInSelectionGlobal() case 0: // // average toward mStartingZ action = E_LAND_LEVEL; - seconds = 1.f; + seconds *= 0.25f; break; case 1: action = E_LAND_RAISE; + seconds *= 0.25f; break; case 2: action = E_LAND_LOWER; + seconds *= 0.25f; break; case 3: action = E_LAND_SMOOTH; - seconds = 10.f; + seconds *= 5.0f; break; case 4: action = E_LAND_NOISE; - seconds = 0.5f; + seconds *= 0.5f; break; case 5: action = E_LAND_REVERT; |