aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-11-05 18:15:57 -0700
committerMcCabe Maxsted2010-11-05 18:16:18 -0700
commitc250b9391b38df920babb24b9b8a2c3bcab76ceb (patch)
treeae6b2d2bd163af1767588201674267f5abc7c5b2 /linden/indra
parentChanged nickname highlight nick settings from 'nick#' to 'HighlightNickname#'... (diff)
downloadmeta-impy-c250b9391b38df920babb24b9b8a2c3bcab76ceb.zip
meta-impy-c250b9391b38df920babb24b9b8a2c3bcab76ceb.tar.gz
meta-impy-c250b9391b38df920babb24b9b8a2c3bcab76ceb.tar.bz2
meta-impy-c250b9391b38df920babb24b9b8a2c3bcab76ceb.tar.xz
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
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/llpaneldisplay.cpp29
-rw-r--r--linden/indra/newview/llpaneldisplay.h3
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml30
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml21
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()
267 267
268 // Object detail slider 268 // Object detail slider
269 mCtrlDrawDistance = getChild<LLSliderCtrl>("DrawDistance"); 269 mCtrlDrawDistance = getChild<LLSliderCtrl>("DrawDistance");
270 mDrawDistanceMeterText1 = getChild<LLTextBox>("DrawDistanceMeterText1");
271 mDrawDistanceMeterText2 = getChild<LLTextBox>("DrawDistanceMeterText2");
272 mCtrlDrawDistance->setCommitCallback(&LLPanelDisplay::updateMeterText);
273 mCtrlDrawDistance->setCallbackUserData(this); 270 mCtrlDrawDistance->setCallbackUserData(this);
274 271
275 // Object detail slider 272 // Object detail slider
@@ -636,8 +633,6 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
636 llassert(mAvatarText != NULL); 633 llassert(mAvatarText != NULL);
637 llassert(mLightingText != NULL); 634 llassert(mLightingText != NULL);
638 llassert(mTerrainText != NULL); 635 llassert(mTerrainText != NULL);
639 llassert(mDrawDistanceMeterText1 != NULL);
640 llassert(mDrawDistanceMeterText2 != NULL);
641 llassert(mAvatarCountText != NULL); 636 llassert(mAvatarCountText != NULL);
642 637
643 // enable/disable the states 638 // enable/disable the states
@@ -684,16 +679,8 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
684 mAvatarText->setVisible(!isHidden); 679 mAvatarText->setVisible(!isHidden);
685 mLightingText->setVisible(!isHidden); 680 mLightingText->setVisible(!isHidden);
686 mTerrainText->setVisible(!isHidden); 681 mTerrainText->setVisible(!isHidden);
687 mDrawDistanceMeterText1->setVisible(!isHidden);
688 mDrawDistanceMeterText2->setVisible(!isHidden);
689 mAvatarCountText->setVisible(!isHidden); 682 mAvatarCountText->setVisible(!isHidden);
690 683
691 // hide one meter text if we're making things visible
692 if(!isHidden)
693 {
694 updateMeterText(mCtrlDrawDistance, this);
695 }
696
697 mMeshDetailText->setVisible(!isHidden); 684 mMeshDetailText->setVisible(!isHidden);
698 685
699 mCtrlAvatarMaxVisible->setVisible(!isHidden); 686 mCtrlAvatarMaxVisible->setVisible(!isHidden);
@@ -998,22 +985,6 @@ void LLPanelDisplay::updateSliderText(LLUICtrl* ctrl, void* user_data)
998 } 985 }
999} 986}
1000 987
1001void LLPanelDisplay::updateMeterText(LLUICtrl* ctrl, void* user_data)
1002{
1003 // get our UI widgets
1004 LLPanelDisplay* panel = (LLPanelDisplay*)user_data;
1005 LLSliderCtrl* slider = (LLSliderCtrl*) ctrl;
1006
1007 LLTextBox* m1 = panel->getChild<LLTextBox>("DrawDistanceMeterText1");
1008 LLTextBox* m2 = panel->getChild<LLTextBox>("DrawDistanceMeterText2");
1009
1010 // toggle the two text boxes based on whether we have 1 or two digits
1011 F32 val = slider->getValueF32();
1012 bool two_digits = val < 100;
1013 m1->setVisible(two_digits);
1014 m2->setVisible(!two_digits);
1015}
1016
1017// static 988// static
1018void LLPanelDisplay::onImpostorsEnable(LLUICtrl* ctrl, void* user_data) 989void LLPanelDisplay::onImpostorsEnable(LLUICtrl* ctrl, void* user_data)
1019{ 990{
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:
128 LLTextBox *mAvatarText; 128 LLTextBox *mAvatarText;
129 LLTextBox *mTerrainText; 129 LLTextBox *mTerrainText;
130 LLTextBox *mLightingText; 130 LLTextBox *mLightingText;
131 LLTextBox *mDrawDistanceMeterText1;
132 LLTextBox *mDrawDistanceMeterText2;
133 131
134 LLTextBox *mMeshDetailText; 132 LLTextBox *mMeshDetailText;
135 LLTextBox *mLODFactorText; 133 LLTextBox *mLODFactorText;
@@ -194,7 +192,6 @@ protected:
194 static void onCommitWindowedMode(LLUICtrl* ctrl, void *data); 192 static void onCommitWindowedMode(LLUICtrl* ctrl, void *data);
195 static void onApplyResolution(LLUICtrl* ctrl, void* data); 193 static void onApplyResolution(LLUICtrl* ctrl, void* data);
196 static void updateSliderText(LLUICtrl* ctrl, void* user_data); 194 static void updateSliderText(LLUICtrl* ctrl, void* user_data);
197 static void updateMeterText(LLUICtrl* ctrl, void* user_data);
198 static void onImpostorsEnable(LLUICtrl* ctrl, void* user_data); 195 static void onImpostorsEnable(LLUICtrl* ctrl, void* user_data);
199 196
200 /// callback for defaults 197 /// 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 @@
237 radio_style="false" width="256" /> 237 radio_style="false" width="256" />
238 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 238 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
239 bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" 239 bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
240 font="SansSerifSmall" h_pad="0" halign="left" height="12" left_delta="0" 240 font="SansSerifSmall" h_pad="0" halign="left" height="12" left_delta="0"
241 mouse_opaque="true" name="AvatarCountText" v_pad="0" width="128"> 241 mouse_opaque="true" name="AvatarCountText" v_pad="0" width="128">
242 Max. non-imposters: 242 Max. non-imposters:
243 </text> 243 </text>
244 <slider bottom_delta="-20" can_edit_text="false" control_name="RenderAvatarMaxVisible" 244 <slider bottom_delta="-20" can_edit_text="true" control_name="RenderAvatarMaxVisible"
245 decimal_digits="0" enabled="true" follows="left|top" height="16" 245 decimal_digits="0" enabled="true" follows="left|top" height="16"
246 increment="1" initial_val="35" label="" 246 increment="1" initial_val="35" label=""
247 label_width="0" left_delta="0" max_val="50" min_val="0" mouse_opaque="true" 247 label_width="0" left_delta="0" max_val="50" min_val="0" mouse_opaque="true"
248 name="AvatarMaxVisible" show_text="true" width="100" /> 248 name="AvatarMaxVisible" show_text="true" width="100" />
249 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 249 <slider bottom="-135" can_edit_text="true" control_name="RenderFarClip"
250 bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
251 font="SansSerifSmall" h_pad="0" halign="left" height="12"
252 left="457" mouse_opaque="true" name="DrawDistanceMeterText1" v_pad="0"
253 width="128">
254 m
255 </text>
256 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
257 bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
258 font="SansSerifSmall" h_pad="0" halign="left" height="12"
259 left="463" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0"
260 width="128">
261 m
262 </text>
263 <slider bottom="-135" can_edit_text="false" control_name="RenderFarClip"
264 decimal_digits="0" enabled="true" follows="left|top" height="16" 250 decimal_digits="0" enabled="true" follows="left|top" height="16"
265 increment="8" initial_val="160" label="Draw distance:" 251 increment="4" initial_val="160" label="Draw distance (meters):"
266 label_width="140" left="215" max_val="512" min_val="32" mouse_opaque="true" 252 label_width="140" left="215" max_val="1024" min_val="32" mouse_opaque="true"
267 name="DrawDistance" show_text="true" width="255" /> 253 name="DrawDistance" show_text="true" width="262" />
268 <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount" 254 <slider bottom_delta="-20" can_edit_text="true" control_name="RenderMaxPartCount"
269 decimal_digits="0" enabled="true" follows="left|top" height="16" 255 decimal_digits="0" enabled="true" follows="left|top" height="16"
270 increment="256" initial_val="4096" 256 increment="256" initial_val="4096"
271 label="Max. particle count:" label_width="140" left_delta="0" 257 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 @@
3 follows="right|bottom" height="67" left="0" mouse_opaque="true" 3 follows="right|bottom" height="67" left="0" mouse_opaque="true"
4 name="windlight_remote" use_bounding_rect="true" width="182"> 4 name="windlight_remote" use_bounding_rect="true" width="182">
5 <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="67" left="0" width="182" /> 5 <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="67" left="0" width="182" />
6 <slider bottom="-20" can_edit_text="false" control_name="RenderFarClip" 6 <slider bottom="-20" can_edit_text="true" control_name="RenderFarClip"
7 decimal_digits="0" enabled="true" height="18" 7 decimal_digits="0" enabled="true" height="18"
8 increment="8" initial_val="160" label="Draw distance:" 8 increment="4" initial_val="160" label="Draw distance:"
9 label_width="78" left="6" max_val="512" min_val="32" mouse_opaque="true" 9 label_width="74" left="4" max_val="1024" min_val="32" mouse_opaque="true"
10 name="DrawDistance" show_text="true" width="170" /> 10 name="DrawDistance" show_text="true" width="174" />
11 <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount" 11 <slider bottom_delta="-20" can_edit_text="true" control_name="RenderMaxPartCount"
12 decimal_digits="0" enabled="true" follows="left|top" height="18" 12 decimal_digits="0" enabled="true" follows="left|top" height="18"
13 increment="256" initial_val="4096" 13 increment="256" initial_val="4096"
14 label="Max. particles:" label_width="78" left_delta="0" 14 label="Max. particles:" label_width="74" left_delta="0"
15 max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount" 15 max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount"
16 show_text="true" width="176" /> 16 show_text="true" width="174" />
17 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
18 bottom="-14" drop_shadow_visible="true" enabled="true" follows="left|top"
19 font="SansSerifSmall" h_pad="0" halign="left" height="12"
20 left="170" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0"
21 width="8">
22 m
23 </text>
24 <panel bottom="13" filename="panel_windlight_controls.xml" left="0" width="182" /> 17 <panel bottom="13" filename="panel_windlight_controls.xml" left="0" width="182" />
25 <string name="atmosphere"> 18 <string name="atmosphere">
26 Atmosphere 19 Atmosphere