Set can_edit_text attribute to true for draw distance, particle count, and imposter count. Also increased the draw distance range to 1024 from 512 and changed the increments from 8 to 4 as better defaults

4 files changed, 15 insertions, 68 deletions

diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index 15b4615..a5c0d97 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -267,9 +267,6 @@ BOOL LLPanelDisplay::postBuild()
 
         // Object detail slider
         mCtrlDrawDistance = getChild<LLSliderCtrl>("DrawDistance");
-        mDrawDistanceMeterText1 = getChild<LLTextBox>("DrawDistanceMeterText1");
-        mDrawDistanceMeterText2 = getChild<LLTextBox>("DrawDistanceMeterText2");
-        mCtrlDrawDistance->setCommitCallback(&LLPanelDisplay::updateMeterText);
         mCtrlDrawDistance->setCallbackUserData(this);
 
         // Object detail slider
@@ -636,8 +633,6 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
         llassert(mAvatarText != NULL);
         llassert(mLightingText != NULL);
         llassert(mTerrainText != NULL);
-        llassert(mDrawDistanceMeterText1 != NULL);
-        llassert(mDrawDistanceMeterText2 != NULL);
         llassert(mAvatarCountText != NULL);
 
         // enable/disable the states
@@ -684,16 +679,8 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
         mAvatarText->setVisible(!isHidden);
         mLightingText->setVisible(!isHidden);
         mTerrainText->setVisible(!isHidden);
-        mDrawDistanceMeterText1->setVisible(!isHidden);
-        mDrawDistanceMeterText2->setVisible(!isHidden);
         mAvatarCountText->setVisible(!isHidden);
 
-        // hide one meter text if we're making things visible
-        if(!isHidden)
-        {
-                updateMeterText(mCtrlDrawDistance, this);
-        }
-
         mMeshDetailText->setVisible(!isHidden);
 
         mCtrlAvatarMaxVisible->setVisible(!isHidden);
@@ -998,22 +985,6 @@ void LLPanelDisplay::updateSliderText(LLUICtrl* ctrl, void* user_data)
         }
 }
 
-void LLPanelDisplay::updateMeterText(LLUICtrl* ctrl, void* user_data)
-{
-        // get our UI widgets
-        LLPanelDisplay* panel = (LLPanelDisplay*)user_data;
-        LLSliderCtrl* slider = (LLSliderCtrl*) ctrl;
-
-        LLTextBox* m1 = panel->getChild<LLTextBox>("DrawDistanceMeterText1");
-        LLTextBox* m2 = panel->getChild<LLTextBox>("DrawDistanceMeterText2");
-
-        // toggle the two text boxes based on whether we have 1 or two digits
-        F32 val = slider->getValueF32();
-        bool two_digits = val < 100;
-        m1->setVisible(two_digits);
-        m2->setVisible(!two_digits);
-}
-
 // static
 void LLPanelDisplay::onImpostorsEnable(LLUICtrl* ctrl, void* user_data)
 {
diff --git a/linden/indra/newview/llpaneldisplay.h b/linden/indra/newview/llpaneldisplay.h
index e92cd2f..d7727e7 100644
--- a/linden/indra/newview/llpaneldisplay.h
+++ b/linden/indra/newview/llpaneldisplay.h
@@ -128,8 +128,6 @@ protected:
         LLTextBox               *mAvatarText;
         LLTextBox               *mTerrainText;
         LLTextBox               *mLightingText;
-        LLTextBox               *mDrawDistanceMeterText1;
-        LLTextBox               *mDrawDistanceMeterText2;
 
         LLTextBox               *mMeshDetailText;
         LLTextBox               *mLODFactorText;
@@ -194,7 +192,6 @@ protected:
         static void onCommitWindowedMode(LLUICtrl* ctrl, void *data);
         static void onApplyResolution(LLUICtrl* ctrl, void* data);
         static void updateSliderText(LLUICtrl* ctrl, void* user_data);
-        static void updateMeterText(LLUICtrl* ctrl, void* user_data);
         static void onImpostorsEnable(LLUICtrl* ctrl, void* user_data);
 
         /// callback for defaults
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 72a6438..bd7886c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -237,35 +237,21 @@
              radio_style="false" width="256" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
        bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-       font="SansSerifSmall" h_pad="0" halign="left" height="12" left_delta="0"
+       font="SansSerifSmall" h_pad="0" halign="left" height="12" left_delta="0" 
        mouse_opaque="true" name="AvatarCountText" v_pad="0" width="128">
     Max. non-imposters:
   </text>
-  <slider bottom_delta="-20" can_edit_text="false" control_name="RenderAvatarMaxVisible"
+  <slider bottom_delta="-20" can_edit_text="true" control_name="RenderAvatarMaxVisible"
        decimal_digits="0" enabled="true" follows="left|top" height="16"
-       increment="1" initial_val="35" label=""
+       increment="1" initial_val="35" label="" 
        label_width="0" left_delta="0" max_val="50" min_val="0" mouse_opaque="true"
        name="AvatarMaxVisible" show_text="true" width="100" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="457" mouse_opaque="true" name="DrawDistanceMeterText1" v_pad="0"
-             width="128">
-                m
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="463" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0"
-             width="128">
-                m
-        </text>
-        <slider bottom="-135" can_edit_text="false" control_name="RenderFarClip"
+        <slider bottom="-135" can_edit_text="true" control_name="RenderFarClip"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
-             increment="8" initial_val="160" label="Draw distance:"
-             label_width="140" left="215" max_val="512" min_val="32" mouse_opaque="true"
-             name="DrawDistance" show_text="true" width="255" />
-        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount"
+             increment="4" initial_val="160" label="Draw distance (meters):"
+             label_width="140" left="215" max_val="1024" min_val="32" mouse_opaque="true"
+             name="DrawDistance" show_text="true" width="262" />
+        <slider bottom_delta="-20" can_edit_text="true" control_name="RenderMaxPartCount"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
              increment="256" initial_val="4096"
              label="Max. particle count:" label_width="140" left_delta="0"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
index 3849efd..c7769cc 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
@@ -3,24 +3,17 @@
      follows="right|bottom" height="67" left="0" mouse_opaque="true"
      name="windlight_remote" use_bounding_rect="true" width="182">
         <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="67" left="0" width="182" />
-        <slider bottom="-20" can_edit_text="false" control_name="RenderFarClip"
+        <slider bottom="-20" can_edit_text="true" control_name="RenderFarClip"
        decimal_digits="0" enabled="true" height="18"
-       increment="8" initial_val="160" label="Draw distance:"
-       label_width="78" left="6" max_val="512" min_val="32" mouse_opaque="true"
-       name="DrawDistance" show_text="true" width="170" />
-  <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount"
+       increment="4" initial_val="160" label="Draw distance:"
+       label_width="74" left="4" max_val="1024" min_val="32" mouse_opaque="true"
+       name="DrawDistance" show_text="true" width="174" />
+  <slider bottom_delta="-20" can_edit_text="true" control_name="RenderMaxPartCount"
        decimal_digits="0" enabled="true" follows="left|top" height="18"
        increment="256" initial_val="4096"
-       label="Max. particles:" label_width="78" left_delta="0"
+       label="Max. particles:" label_width="74" left_delta="0"
        max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount"
-       show_text="true" width="176" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-14" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="170" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0"
-             width="8">
-    m
-  </text>
+       show_text="true" width="174" />
         <panel bottom="13" filename="panel_windlight_controls.xml" left="0" width="182" />
   <string name="atmosphere">
     Atmosphere