Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

De-uglify graphics preferences

Browse Source
This commit is contained in:
Siana Gearz
2012-08-12 20:52:57 +02:00
parent 039f665af1
commit ee0bd9ee76
5 changed files with 37 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/lltabcontainer.cpp
View File

@@ -751,7 +751,7 @@ void LLTabContainer::addTabPanel(LLPanel* child,
else
{
tab_panel_top = getRect().getHeight() - getTopBorderHeight();
tab_panel_bottom = (TABCNTR_TAB_HEIGHT - TABCNTR_BUTTON_PANEL_OVERLAP); // Run to the edge, covering up the border
tab_panel_bottom = (TABCNTR_TAB_HEIGHT + LLPANEL_BORDER_WIDTH*2 - TABCNTR_BUTTON_PANEL_OVERLAP); // Run to the edge, covering up the border
}
}
else

2
indra/newview/llpaneldisplay.cpp
View File

@@ -1178,7 +1178,7 @@ void LLPanelDisplay::updateMeterText(LLUICtrl* ctrl, void* user_data)
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
// toggle the two text boxes based on whether we have 2 or 3 digits
F32 val = slider->getValueF32();
bool two_digits = val < 100;
m1->setVisible(two_digits);

14
indra/newview/skins/default/xui/en-us/floater_preferences.xml
View File

@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-666" can_close="true" can_drag_on_left="false" can_minimize="true"
<floater can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="false" can_tear_off="true" default_tab_group="1" enabled="true"
height="510" left="330" min_height="213" min_width="324"
height="494" left="330" min_height="213" min_width="324"
mouse_opaque="true" name="Preferences" title="Preferences" width="620">
<button bottom="-505" enabled="true" follows="right|bottom" font="SansSerif"
<button bottom="4" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="OK" label_selected="OK" left="335"
mouse_opaque="true" name="OK" scale_image="true" width="90" />
<button bottom="-505" enabled="true" follows="right|bottom" font="SansSerif"
<button bottom="4" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="Cancel" label_selected="Cancel"
left_delta="93" mouse_opaque="true" name="Cancel" scale_image="true"
width="90" />
<button bottom="-505" enabled="true" follows="right|bottom" font="SansSerif"
<button bottom="4" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="Apply" label_selected="Apply"
left_delta="93" mouse_opaque="true" name="Apply" scale_image="true"
width="90" />
<button bottom="-505" enabled="true" follows="left|bottom" font="SansSerif"
<button bottom="4" enabled="true" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="About" label_selected="About" left="9"
mouse_opaque="true" name="About..." scale_image="true" width="90" />
<button bottom="-505" enabled="true" follows="left|bottom" font="SansSerif"
<button bottom="4" enabled="true" follows="left|bottom" font="SansSerif"
halign="center" height="20"
help_url="http://secondlife.com/app/help/technical/preferences.php"
label="Help" label_selected="Help" left_delta="93" mouse_opaque="true"

25
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -4816,31 +4816,6 @@ Put it in a web page to give others easy access to this location or try it out y
</form>
</notification>
<notification
icon="alertmodal.tga"
name="GraphicsPreferencesHelp"
type="alertmodal">
This panel controls window size and resolution and the quality of the client&apos;s graphics. The Preferences &gt; Graphics interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. You may also customize your graphics settings by checking the Custom checkbox and manipulating the following settings:
Shaders: Enable or disable various types of pixel shaders.
Reflection Detail: Sets the types of objects that water can reflect.
Avatar Rendering: Sets options that affect how the client renders avatars.
Draw Distance: Affects how far out from your viewpoint objects will be rendered in the scene.
Max Particle Count: Sets the maximum number of particles you are able to see on your screen at once.
Post Process Quality: Sets the resolution with which Glow is rendered.
Mesh Detail: Sets the amount of detail or number of triangles used in rendering certain objects. A higher value takes longer to render, but makes these objects appear with more detail.
Lighting Detail: Selects what types of lights you would like to render.
Terrain Detail: Sets the amount of detail you would like to see for the terrain texture.
</notification>
<notification
icon="alertmodal.tga"
name="WLSavePresetAlert"

57
indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel bottom="-449" height="438" label="Graphics" name="Display panel" width="517">
<panel border="true" bottom="-449" height="438" label="Graphics" name="Display panel" width="517">
<check_box bottom="-23" height="16" initial_value="false" label="Run viewer in a window" left="10" name="windowed mode" width="120" tool_tip="If unchecked, viewer will display full-screen when logged in."/>
<text bottom="-62" height="12" name="WindowSizeLabel">Window Size:</text>
<button bottom_delta="4" height="20" left="-210" label="Reset to Defaults" tool_tip="Reset to recommended graphics settings" name="Defaults" width="200"/>
<text bottom="-62" left="10" height="12" name="WindowSizeLabel">Window Size:</text>
<combo_box bottom="-67" height="18" left="165" name="windowsize combo" width="150">
<combo_item name="800x600" value="800 x 600">800x600</combo_item>
<combo_item name="720x480" value="720 x 480">720x480 (NTSC)</combo_item>
@@ -20,11 +21,9 @@
<combo_item name="8:5(Widescreen)" value="1.6">16:10 (Widescreen PC)</combo_item>
<combo_item name="16:9(Widescreen)" value="1.7777777">16:9 (Widescreen TV)</combo_item>
</combo_box>
<button bottom_delta="-20" height="20" label="Default" tool_tip="Reset to recommended graphics settings" left="355" name="Defaults" scale_image="true" width="100"/>
<check_box bottom="-44" control_name="FullScreenAutoDetectAspectRatio" height="16" initial_value="false" label="Auto-detect ratio" left="350" name="aspect_auto_detect" width="256"/>
<tab_container follows="all" bottom="0" border="false" left="0" height="360" width="518" name="graphics_tab" tab_position="bottom">
<panel border="true" bottom="-439" height="438" label="Main" left="102" name="Main" width="517">
<button bottom="327" height="18" label="?" left="470" name="GraphicsPreferencesHelpButton" width="22"/>
<tab_container follows="all" bottom="0" border="false" left="2" height="360" right="-2" name="graphics_tab" tab_position="bottom">
<panel border="true" bottom="-439" height="438" label="Main" left="102" name="Main" width="517">
<text bottom="330" height="12" left="10" name="QualityText">Quality &amp; Performance:</text>
<text bottom_delta="0" height="12" left="135" name="FasterText">Faster</text>
<text bottom_delta="-16" height="12" left_delta="23" name="ShadersPrefText">Low</text>
@@ -39,7 +38,7 @@
<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="UltraDivet" width="2"/>
-->
<slider bottom_delta="0" control_name="RenderQualityPerformance" increment="1" initial_val="0" left="165" max_val="3" min_val="0" name="QualityPerformanceSelection" show_text="false" width="150" />
<check_box bottom_delta="-5" control_name="RenderCustomSettings" label="Custom" left="395" initial_value="true" name="CustomSettings"/>
<check_box bottom_delta="-10" control_name="RenderCustomSettings" label="Custom" left="410" initial_value="true" name="CustomSettings"/>
<!--view_border bevel_style="none" bottom="-395" height="280" left="5" name="GraphicsBorder" width="485"/-->
<text bottom="300" height="12" left="10" name="ShadersText">Shaders:</text>
<check_box bottom_delta="-23" control_name="RenderTransparentWater" height="16" initial_value="true" label="Transparent water" left="10" name="TransparentWater"/>
@@ -74,35 +73,35 @@
<slider bottom_delta="-20" left="5" control_name="RenderAvatarPhysicsLODFactor" increment="0.1" label=" Avatar Physics:" label_width="79" max_val="1" min_val="0" name="AvatarPhysicsDetail" show_text="false" width="160"/>
<text bottom_delta="-2" left="170" height="12" name="AvatarPhysicsDetailText">Off</text>
<text bottom="299" left="470" height="12" name="DrawDistanceMeterText1">m</text>
<text bottom="299" left="470" height="12" name="DrawDistanceMeterText2">m</text>
<slider bottom="295" left="215" control_name="RenderFarClip" decimal_digits="0" height="16" increment="8" initial_val="160" label="Draw Distance:" label_width="101" max_val="1024" min_val="64" name="DrawDistance" width="262"/>
<slider bottom_delta="-15" control_name="RenderMaxPartCount" decimal_digits="0" height="16" increment="256" initial_val="4096" label="Max. Particle Count:" label_width="101" max_val="8192" min_val="0" name="MaxParticleCount" width="262"/>
<slider bottom_delta="-15" control_name="RenderAvatarMaxVisible" decimal_digits="0" increment="1" initial_val="35" label="Max non-impostors" label_width="101" max_val="50" min_val="1" name="AvatarMaxVisible" width="250"/>
<slider bottom_delta="-25" control_name="RenderGlowResolutionPow" decimal_digits="0" height="16" increment="1" initial_val="8" label="Post Process Quality:" label_width="101" max_val="9" min_val="8" name="RenderPostProcess" show_text="false" width="226"/>
<text bottom_delta="-15" height="12" left="215" name="MeshDetailText">Level of Detail:</text>
<slider bottom_delta="-20" control_name="RenderVolumeLODFactor" increment="0.09375" label=" Objects:" label_width="79" max_val="2" min_val="0.5" name="ObjectMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-20" control_name="RenderFlexTimeFactor" increment="0.1" label=" Flexiprims:" label_width="79" max_val="1" min_val="0" name="FlexibleMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-20" control_name="RenderTreeLODFactor" increment="0.125" label=" Trees:" label_width="79" max_val="1" min_val="0" name="TreeMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-20" control_name="RenderAvatarLODFactor" increment="0.125" label=" Avatars:" label_width="79" max_val="1" min_val="0" name="AvatarMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-20" control_name="RenderTerrainLODFactor" increment="0.125" label=" Terrain:" label_width="79" max_val="2" min_val="1" name="TerrainMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-20" control_name="WLSkyDetail" decimal_digits="0" increment="8" label=" Sky:" label_width="79" max_val="128" min_val="16" name="SkyMeshDetail" show_text="false" width="223"/>
<text bottom_delta="100" left_delta="229" height="12" name="ObjectMeshDetailText">Low</text>
<text bottom_delta="-20" height="12" name="FlexibleMeshDetailText">Low</text>
<text bottom_delta="-20" height="12" name="TreeMeshDetailText">Low</text>
<text bottom_delta="-20" height="12" name="AvatarMeshDetailText">Low</text>
<text bottom_delta="-20" height="12" name="TerrainMeshDetailText">Low</text>
<text bottom_delta="-20" height="12" name="SkyMeshDetailText">Low</text>
<text bottom_delta="-30" height="12" left="230" name="AvatarRenderingText">Avatar Rendering:</text>
<text bottom="284" left="460" height="12" name="DrawDistanceMeterText1">m</text>
<text bottom="284" left="470" height="12" name="DrawDistanceMeterText2">m</text>
<slider bottom="280" left="215" control_name="RenderFarClip" decimal_digits="0" height="16" increment="32" initial_val="160" label="Draw Distance:" label_width="101" max_val="1024" min_val="64" name="DrawDistance" width="262"/>
<slider bottom_delta="-18" control_name="RenderMaxPartCount" decimal_digits="0" height="16" increment="256" initial_val="4096" label="Max. Particle Count:" label_width="101" max_val="8192" min_val="0" name="MaxParticleCount" width="262"/>
<slider bottom_delta="-18" control_name="RenderAvatarMaxVisible" decimal_digits="0" height="16" increment="1" initial_val="35" label="Max. non-impostors:" label_width="101" max_val="50" min_val="1" name="AvatarMaxVisible" width="250"/>
<slider bottom_delta="-18" control_name="RenderGlowResolutionPow" decimal_digits="0" height="16" increment="1" initial_val="8" label="Post Process Quality:" label_width="101" max_val="9" min_val="8" name="RenderPostProcess" show_text="false" width="226"/>
<text bottom_delta="4" height="12" left="444" name="PostProcessText">Low</text>
<text bottom_delta="-25" height="12" left="215" name="MeshDetailText">Level of Detail:</text>
<slider bottom_delta="-22" control_name="RenderVolumeLODFactor" height="16" increment="0.09375" label=" Objects:" label_width="79" max_val="2" min_val="0.5" name="ObjectMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-18" control_name="RenderFlexTimeFactor" height="16" increment="0.1" label=" Flexiprims:" label_width="79" max_val="1" min_val="0" name="FlexibleMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-18" control_name="RenderTreeLODFactor" height="16" increment="0.125" label=" Trees:" label_width="79" max_val="1" min_val="0" name="TreeMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-18" control_name="RenderAvatarLODFactor" height="16" increment="0.125" label=" Avatars:" label_width="79" max_val="1" min_val="0" name="AvatarMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-18" control_name="RenderTerrainLODFactor" height="16" increment="0.125" label=" Terrain:" label_width="79" max_val="2" min_val="1" name="TerrainMeshDetail" show_text="false" width="223"/>
<slider bottom_delta="-18" control_name="WLSkyDetail" height="16" decimal_digits="0" increment="8" label=" Sky:" label_width="79" max_val="128" min_val="16" name="SkyMeshDetail" show_text="false" width="223"/>
<text bottom_delta="90" left_delta="229" height="12" name="ObjectMeshDetailText">Low</text>
<text bottom_delta="-18" height="12" name="FlexibleMeshDetailText">Low</text>
<text bottom_delta="-18" height="12" name="TreeMeshDetailText">Low</text>
<text bottom_delta="-18" height="12" name="AvatarMeshDetailText">Low</text>
<text bottom_delta="-18" height="12" name="TerrainMeshDetailText">Low</text>
<text bottom_delta="-18" height="12" name="SkyMeshDetailText">Low</text>
<text bottom_delta="-25" height="12" left="230" name="AvatarRenderingText">Avatar Rendering:</text>
<check_box bottom_delta="-20" control_name="RenderUseImpostors" initial_value="true" label="Avatar impostors" name="AvatarImpostors"/>
<check_box bottom_delta="-16" control_name="RenderAvatarVP" initial_value="true" label="Hardware skinning" name="AvatarVertexProgram"/>
<check_box bottom_delta="-16" control_name="RenderAvatarCloth" initial_value="true" label="Avatar cloth" name="AvatarCloth"/>
<text bottom_delta="53" height="12" left="395" name="TerrainDetailText">Terrain detail:</text>
<text bottom_delta="50" height="12" left="395" name="TerrainDetailText">Terrain detail:</text>
<radio_group bottom_delta="-44" control_name="RenderTerrainDetail" draw_border="false" height="38" name="TerrainDetailRadio" width="321">
<radio_item bottom="-15" height="16" left="3" name="0" width="315">Low</radio_item>
<radio_item bottom="-31" height="16" name="2" width="315">High</radio_item>
</radio_group>
<text bottom="-106" height="12" left="444" name="PostProcessText">Low</text>
</panel>
<panel border="true" bottom="-400" height="244" left="50" name="Hardware" label="Hardware" width="500">
<check_box bottom="-22" control_name="RenderAnisotropic" height="16" initial_value="false" label="Anisotropic Filtering (slower when enabled)" left="5" name="ani" width="256"/>