VWR-2331: Terraform tool variable "strength".

Contributing authors: Gigs Taggart, Aimee Trescothick, Which Linden.

5 files changed, 53 insertions, 6 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index e31c149..fa0d21e 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4164,6 +4164,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LandBrushForce</key>
+    <map>
+      <key>Comment</key>
+      <string>Multiplier for land modification brush force.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>1.0</real>
+    </map>
     <key>Language</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index 97150e3..8d4d6e2 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -54,6 +54,7 @@
 #include "llpanelvolume.h"
 #include "llpanelpermissions.h"
 #include "llselectmgr.h"
+#include "llslider.h"
 #include "llstatusbar.h"
 #include "lltabcontainer.h"
 #include "lltextbox.h"
@@ -106,6 +107,7 @@ void click_popup_rotate_reset(void*);
 void click_popup_rotate_right(void*);
 void click_popup_dozer_mode(LLUICtrl *, void *user);
 void click_popup_dozer_size(LLUICtrl *, void *user);
+void commit_slider_dozer_force(LLUICtrl *, void*);
 void click_dozer_size(LLUICtrl *, void*);
 void click_apply_to_selection(void*);
 void commit_radio_zoom(LLUICtrl *, void*);
@@ -308,6 +310,12 @@ BOOL	LLFloaterTools::postBuild()
         childSetAction("button apply to selection",click_apply_to_selection,  (void*)0);
         mCheckShowOwners = getChild<LLCheckBoxCtrl>("checkbox show owners");
         childSetValue("checkbox show owners",gSavedSettings.getBOOL("ShowParcelOwners"));
+
+        mSliderDozerForce = getChild<LLSlider>("slider force");
+        childSetCommitCallback("slider force",commit_slider_dozer_force,  (void*)0);
+        // the setting stores the actual force multiplier, but the slider is logarithmic, so we convert here
+        childSetValue( "slider force", log10(gSavedSettings.getF32("LandBrushForce")));
+
         childSetAction("button more", click_show_more, this);
         childSetAction("button less", click_show_more, this);
         mTab = getChild<LLTabContainer>("Object Info Tabs");
@@ -741,6 +749,11 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
         {
                 mCheckShowOwners        ->setVisible( land_visible );
         }
+        if (mSliderDozerForce)
+        {
+                mSliderDozerForce       ->setVisible( land_visible );
+                childSetVisible("Force:", land_visible);
+        }
 
         //
         // More panel visibility
@@ -939,6 +952,16 @@ void click_dozer_size(LLUICtrl *ctrl, void *user)
         gSavedSettings.setS32("RadioLandBrushSize", size);
 }
 
+void commit_slider_dozer_force(LLUICtrl *ctrl, void*)
+{
+        // the slider is logarithmic, so we exponentiate to get the actual force multiplier
+        F32 dozer_force = pow(10.f, (F32)ctrl->getValue().asReal());
+        gSavedSettings.setF32("LandBrushForce", dozer_force);
+}
+
+
+
+
 void click_apply_to_selection(void* user)
 {
         LLToolBrushLand::getInstance()->modifyLandInSelectionGlobal();
diff --git a/linden/indra/newview/llfloatertools.h b/linden/indra/newview/llfloatertools.h
index b0a804b..a75aa87 100644
--- a/linden/indra/newview/llfloatertools.h
+++ b/linden/indra/newview/llfloatertools.h
@@ -48,6 +48,7 @@ class LLPanelContents;
 class LLPanelFace;
 class LLPanelLandInfo;
 class LLComboBox;
+class LLSlider;
 class LLParcelSelection;
 class LLObjectSelection;
 
@@ -167,6 +168,7 @@ public:
         LLCheckBoxCtrl  *mRadioDozerSmooth;
         LLCheckBoxCtrl  *mRadioDozerNoise;
         LLCheckBoxCtrl  *mRadioDozerRevert;
+        LLSlider                *mSliderDozerForce;
 
         LLComboBox              *mComboDozerSize;
         LLButton                *mBtnApplyToSelection;
diff --git a/linden/indra/newview/lltoolbrush.cpp b/linden/indra/newview/lltoolbrush.cpp
index 89cb0b6..fdd7b66 100644
--- a/linden/indra/newview/lltoolbrush.cpp
+++ b/linden/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;
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index db176b3..3ae37ea 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -278,7 +278,16 @@
                         Large
                 </combo_item>
         </combo_box>
-        <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="center"
+        <volume_slider bottom_delta="-19" follows="left|top" height="16" hidden="false" increment="0.1"
+         initial_val="0.00" left="155" max_val="2.0" min_val="-1.0"
+             mouse_opaque="true" name="slider force" width="70" />      
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="4" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             left="118" mouse_opaque="true" name="Force:" v_pad="0" width="128">
+                  Force:
+        </text>    
+        <button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
              height="16" label="Apply to selection" label_selected="Apply to selection"
              left="118" mouse_opaque="true" name="button apply to selection"
              scale_image="TRUE" tool_tip="Modify Selected Land" width="134" />