diff --git a/indra/newview/llpanelpresetscamerapulldown.cpp b/indra/newview/llpanelpresetscamerapulldown.cpp
index a5ca23732ab25cade90f6a0f8fc3b38c699fbe38..e8081a6363e4972889073dfbfd4817121a8a4d31 100644
--- a/indra/newview/llpanelpresetscamerapulldown.cpp
+++ b/indra/newview/llpanelpresetscamerapulldown.cpp
@@ -50,7 +50,7 @@ LLPanelPresetsCameraPulldown::LLPanelPresetsCameraPulldown()
{
mCommitCallbackRegistrar.add("Presets.toggleCameraFloater", boost::bind(&LLPanelPresetsCameraPulldown::onViewButtonClick, this, _2));
mCommitCallbackRegistrar.add("PresetsCamera.RowClick", boost::bind(&LLPanelPresetsCameraPulldown::onRowClick, this, _2));
- mCommitCallbackRegistrar.add("CameraPresets.Save", boost::bind(&LLFloaterCamera::onSavePreset));
+ mCommitCallbackRegistrar.add("PresetsCamera.Save", boost::bind(&LLFloaterCamera::onSavePreset));
buildFromFile( "panel_presets_camera_pulldown.xml");
}
diff --git a/indra/newview/llpanelpresetspulldown.cpp b/indra/newview/llpanelpresetspulldown.cpp
index 45d228947dce1b24f19f4633bb471755ae34beff..4380a503aaad99f2a4ec0da390a983edbdc37817 100644
--- a/indra/newview/llpanelpresetspulldown.cpp
+++ b/indra/newview/llpanelpresetspulldown.cpp
@@ -52,7 +52,6 @@ LLPanelPresetsPulldown::LLPanelPresetsPulldown()
mHoverTimer.stop();
mCommitCallbackRegistrar.add("Presets.GoGraphicsPrefs", boost::bind(&LLPanelPresetsPulldown::onGraphicsButtonClick, this, _2));
- mCommitCallbackRegistrar.add("Presets.GoAutofpsPrefs", boost::bind(&LLPanelPresetsPulldown::onAutofpsButtonClick, this, _2));
mCommitCallbackRegistrar.add("Presets.GoLightbox", boost::bind(&LLPanelPresetsPulldown::onLightboxButtonClick, this, _2));
mCommitCallbackRegistrar.add("Presets.RowClick", boost::bind(&LLPanelPresetsPulldown::onRowClick, this, _2));
mCommitCallbackRegistrar.add("Presets.QualityPerformance", boost::bind(&LLPanelPresetsPulldown::onChangeQuality, this, _2));
diff --git a/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml b/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
index 36e022593ce5252b4f8e30c3810465ca87bdfb7a..045a739ceb40bcc614e2c76055f729fa6247d063 100644
--- a/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
@@ -7,354 +7,373 @@
border_visible="false"
border="false"
chrome="true"
- follows="bottom"
- height="420"
+ follows="left|top"
+ height="427"
layout="topleft"
name="presets_camera_pulldown"
width="295">
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- top="4"
- left_delta="5"
- font.style="BOLD"
- name="Camera Presets"
- width="120">
- Camera Presets
- </text>
- <scroll_list
- follows="left|top"
- layout="topleft"
- column_padding="0"
- height="100"
- width="285"
- draw_heading="false"
- draw_stripes="false"
- bg_stripe_color="0.25 0.25 0.25 0.25"
- top_delta="15"
- left_delta="0"
- name="preset_camera_list">
- <scroll_list.columns
- name="icon"
- width="16" />
- <scroll_list.columns
- relative_width="1"
- name="preset_name" />
- <scroll_list.commit_callback
- function="PresetsCamera.RowClick" />
- </scroll_list>
- <view_border
- bevel_style="none"
- follows="top|left"
- height="0"
- layout="topleft"
- left="5"
- name="horiz_separator"
- top_delta="105"
- width="285" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="12"
+ layout="topleft"
+ top="4"
+ left_delta="5"
+ font.style="BOLD"
+ name="Camera Presets"
+ width="120">
+ Camera Presets
+ </text>
+ <scroll_list
+ follows="left|top|right"
+ layout="topleft"
+ column_padding="0"
+ height="100"
+ width="285"
+ draw_heading="false"
+ draw_stripes="false"
+ bg_stripe_color="0.25 0.25 0.25 0.25"
+ top_delta="15"
+ left_delta="0"
+ name="preset_camera_list">
+ <scroll_list.columns
+ name="icon"
+ width="16" />
+ <scroll_list.columns
+ relative_width="1"
+ name="preset_name" />
+ <scroll_list.commit_callback
+ function="PresetsCamera.RowClick" />
+ </scroll_list>
+ <view_border
+ bevel_style="none"
+ follows="top|left|right"
+ height="0"
+ layout="topleft"
+ left="5"
+ name="horiz_separator"
+ top_delta="105"
+ width="285" />
<text
follows="top|left|right"
name="camera_offset_lbl"
height="16"
layout="topleft"
- left="10"
+ left="5"
top_pad="5"
width="100">
- Camera offset:
- </text>
-
- <spinner
- height="20"
- label="X"
- label_width="12"
- follows="top|left"
- left="10"
- name="camera_x"
- top_pad="5"
- min_val="-1e+007"
- max_val="1e+007"
- width="70">
- <spinner.commit_callback
- function="CommitSettings" />
- </spinner>
+ Camera offset:
+ </text>
- <spinner
- height="20"
- label="Y"
- label_width="12"
- follows="top|left"
- name="camera_y"
- left_pad="21"
- min_val="-1e+007"
- max_val="1e+007"
- width="70">
- <spinner.commit_callback
- function="CommitSettings" />
- </spinner>
+ <spinner
+ height="20"
+ label="X"
+ label_width="12"
+ follows="top|left"
+ layout="topleft"
+ left="10"
+ name="camera_x"
+ top_pad="5"
+ min_val="-1e+007"
+ max_val="1e+007"
+ width="70">
+ <spinner.commit_callback
+ function="CommitSettings" />
+ </spinner>
- <spinner
- height="20"
- label="Z"
- label_width="12"
- follows="top|left"
- name="camera_z"
- left_pad="21"
- min_val="-1e+007"
- max_val="1e+007"
- width="70">
- <spinner.commit_callback
- function="CommitSettings" />
- </spinner>
+ <spinner
+ height="20"
+ label="Y"
+ label_width="12"
+ follows="top|left"
+ layout="topleft"
+ name="camera_y"
+ top_delta="0"
+ left_pad="21"
+ min_val="-1e+007"
+ max_val="1e+007"
+ width="70">
+ <spinner.commit_callback
+ function="CommitSettings" />
+ </spinner>
- <button
- follows="top|left|right"
- left_pad="3"
- top_delta="0"
- height="22"
- width="22"
- name="reset_offset_rear"
- image_overlay="Refresh_Off"
- tool_tip="Reset camera offset to default value">
- <button.commit_callback
- function="ResetControl"
- parameter="CameraOffsetRearView" />
- </button>
+ <spinner
+ height="20"
+ label="Z"
+ label_width="12"
+ follows="top|left"
+ layout="topleft"
+ name="camera_z"
+ left_pad="21"
+ min_val="-1e+007"
+ max_val="1e+007"
+ width="70">
+ <spinner.commit_callback
+ function="CommitSettings" />
+ </spinner>
- <text
- follows="top|left|right"
- name="focus_offset_lbl"
- height="16"
+ <button
+ follows="top|left"
layout="topleft"
- left="10"
- top_pad="9"
- width="100">
- Focus offset:
- </text>
+ left_pad="6"
+ top_delta="0"
+ height="22"
+ width="22"
+ name="reset_offset_rear"
+ image_overlay="Refresh_Off"
+ tool_tip="Reset camera offset to default value">
+ <button.commit_callback
+ function="ResetControl"
+ parameter="CameraOffsetRearView" />
+ </button>
- <spinner
- height="20"
- label="X"
- label_width="12"
- follows="top|left"
- left="10"
- name="focus_x"
- top_pad="5"
- min_val="-1e+007"
- max_val="1e+007"
- width="70">
- <spinner.commit_callback
- function="CommitSettings" />
- </spinner>
+ <text
+ follows="top|left|right"
+ name="focus_offset_lbl"
+ height="16"
+ layout="topleft"
+ left="5"
+ top_pad="9"
+ width="100">
+ Focus offset:
+ </text>
- <spinner
- height="20"
- label="Y"
- label_width="12"
- follows="top|left"
- name="focus_y"
- left_pad="21"
- min_val="-1e+007"
- max_val="1e+007"
- width="70">
- <spinner.commit_callback
- function="CommitSettings" />
- </spinner>
+ <spinner
+ height="20"
+ label="X"
+ label_width="12"
+ follows="top|left"
+ layout="topleft"
+ left="10"
+ name="focus_x"
+ top_pad="5"
+ min_val="-1e+007"
+ max_val="1e+007"
+ width="70">
+ <spinner.commit_callback
+ function="CommitSettings" />
+ </spinner>
- <spinner
- height="20"
- label="Z"
- label_width="12"
- follows="top|left"
- name="focus_z"
- left_pad="21"
- min_val="-1e+007"
- max_val="1e+007"
- width="70">
- <spinner.commit_callback
- function="CommitSettings" />
- </spinner>
- <button
- follows="top|left|right"
- left_pad="3"
- top_delta="0"
- height="22"
- width="22"
- name="reset_offset_rear"
- image_overlay="Refresh_Off"
- tool_tip="Reset focus offset to default value">
- <button.commit_callback
- function="ResetControl"
- parameter="FocusOffsetRearView" />
- </button>
+ <spinner
+ height="20"
+ label="Y"
+ label_width="12"
+ follows="top|left"
+ layout="topleft"
+ name="focus_y"
+ left_pad="21"
+ min_val="-1e+007"
+ max_val="1e+007"
+ width="70">
+ <spinner.commit_callback
+ function="CommitSettings" />
+ </spinner>
- <text
- follows="top|left|right"
- name="offset_scale_lbl"
- height="16"
+ <spinner
+ height="20"
+ label="Z"
+ label_width="12"
+ follows="top|left"
+ layout="topleft"
+ name="focus_z"
+ left_pad="21"
+ min_val="-1e+007"
+ max_val="1e+007"
+ width="70">
+ <spinner.commit_callback
+ function="CommitSettings" />
+ </spinner>
+ <button
+ follows="top|left"
layout="topleft"
- left="10"
- top_pad="8"
- width="140">
- Camera offset scale:
- </text>
+ left_pad="6"
+ top_delta="0"
+ height="22"
+ width="22"
+ name="reset_offset_rear"
+ image_overlay="Refresh_Off"
+ tool_tip="Reset focus offset to default value">
+ <button.commit_callback
+ function="ResetControl"
+ parameter="FocusOffsetRearView" />
+ </button>
- <slider
- control_name="CameraOffsetScale"
- follows="top|left|right"
- height="16"
- top_pad="2"
- increment="0.1"
- min_val="-3"
- max_val="5"
- show_text="false"
- layout="topleft"
- left="3"
- name="offset_scale_sld"
- width="196" />
- <spinner
- control_name="CameraOffsetScale"
- height="20"
- follows="top|left|right"
- left_pad="5"
- name="offset_scale_ctrl"
- min_val="-3"
- max_val="5"
- width="58">
- <spinner.commit_callback
- function="CommitSettings" />
- </spinner>
- <button
- follows="top|left|right"
- left_pad="3"
- top_delta="0"
- height="22"
- width="22"
- name="reset_offset_scale"
- image_overlay="Refresh_Off"
- tool_tip="Reset offset scaling to default value">
- <button.commit_callback
- function="ResetControl"
- parameter="CameraOffsetScale" />
- </button>
+ <text
+ follows="top|left|right"
+ name="offset_scale_lbl"
+ height="16"
+ layout="topleft"
+ left="5"
+ top_pad="8"
+ width="140">
+ Camera offset scale:
+ </text>
+
+ <slider
+ control_name="CameraOffsetScale"
+ follows="top|left|right"
+ height="16"
+ top_pad="2"
+ increment="0.1"
+ min_val="-3"
+ max_val="5"
+ show_text="false"
+ layout="topleft"
+ left="3"
+ name="offset_scale_sld"
+ width="196" />
+ <spinner
+ control_name="CameraOffsetScale"
+ height="20"
+ follows="top|right"
+ layout="topleft"
+ left_pad="5"
+ name="offset_scale_ctrl"
+ min_val="-3"
+ max_val="5"
+ width="58">
+ <spinner.commit_callback
+ function="CommitSettings" />
+ </spinner>
+ <button
+ follows="top|right"
+ layout="topleft"
+ left_pad="3"
+ top_delta="0"
+ right="-5"
+ height="22"
+ width="22"
+ name="reset_offset_scale"
+ image_overlay="Refresh_Off"
+ tool_tip="Reset offset scaling to default value">
+ <button.commit_callback
+ function="ResetControl"
+ parameter="CameraOffsetScale" />
+ </button>
<text
follows="top|left"
name="offset_scale_lbl"
height="16"
layout="topleft"
- left="10"
+ left="5"
top_pad="3"
width="140">
- Camera angle:
- </text>
-
- <slider
- control_name="CameraAngle"
- follows="top|left"
- height="16"
- top_pad="2"
- increment="0.025"
- min_val="0.08"
- max_val="3.06"
- show_text="false"
- layout="topleft"
- left="3"
- name="camera_angle_slider"
- width="196" />
- <spinner
- control_name="CameraAngle"
- height="20"
- follows="top|left"
- left_pad="5"
- name="camera_angle_spinner"
- min_val="0.08"
- max_val="3.06"
- width="58"
- increment="0.025">
- <spinner.commit_callback
- function="CommitSettings" />
- </spinner>
- <button
- follows="top|left"
- left_pad="3"
+ Camera angle:
+ </text>
+
+ <slider
+ control_name="CameraAngle"
+ follows="top|left|right"
+ height="16"
+ top_pad="2"
+ increment="0.025"
+ min_val="0.08"
+ max_val="3.06"
+ show_text="false"
+ layout="topleft"
+ left="3"
+ name="camera_angle_slider"
+ width="196" />
+ <spinner
+ control_name="CameraAngle"
+ height="20"
+ follows="top|right"
+ layout="topleft"
+ left_pad="5"
top_delta="0"
- height="22"
- width="22"
- name="reset_angle"
- image_overlay="Refresh_Off"
- tool_tip="Reset camera angle to default value">
+ name="camera_angle_spinner"
+ min_val="0.08"
+ max_val="3.06"
+ width="58"
+ increment="0.025">
+ <spinner.commit_callback
+ function="CommitSettings" />
+ </spinner>
+ <button
+ follows="top|right"
+ layout="topleft"
+ left_pad="3"
+ top_delta="0"
+ right="-5"
+ height="22"
+ width="22"
+ name="reset_angle"
+ image_overlay="Refresh_Off"
+ tool_tip="Reset camera angle to default value">
<button.commit_callback
function="ResetControl"
parameter="CameraAngle" />
- </button>
-
- <text
- follows="top|left"
- name="offset_scale_lbl"
+ </button>
+
+ <text
+ follows="top|left"
+ name="offset_scale_lbl"
+ height="16"
+ layout="topleft"
+ left="5"
+ top_pad="3"
+ width="140">
+ Zoom Speed:
+ </text>
+
+ <slider
+ control_name="ZoomTime"
+ follows="top|left|right"
height="16"
+ top_pad="2"
+ increment="0.1"
+ min_val="0.0"
+ max_val="30.0"
+ show_text="false"
layout="topleft"
- left="10"
- top_pad="3"
- width="140">
- Zoom Speed:
- </text>
-
- <slider
- control_name="ZoomTime"
+ left="3"
+ name="zoom_time_slider"
+ width="196" />
+ <spinner
+ control_name="ZoomTime"
+ height="20"
+ follows="top|right"
+ layout="topleft"
+ left_pad="5"
+ name="zoom_time_spin"
+ min_val="0.0"
+ max_val="30.0"
+ width="58"
+ increment="0.1">
+ <spinner.commit_callback
+ function="CommitSettings" />
+ </spinner>
+ <button
+ follows="top|right"
+ layout="topleft"
+ left_pad="3"
+ top_delta="0"
+ right="-5"
+ height="22"
+ width="22"
+ name="reset_zoom_time"
+ image_overlay="Refresh_Off"
+ tool_tip="Reset camera zoom speed to default value">
+ <button.commit_callback
+ function="ResetControl"
+ parameter="ZoomTime" />
+ </button>
+
+ <text
follows="top|left"
+ name="offset_scale_lbl"
height="16"
- top_pad="2"
- increment="0.1"
- min_val="0.0"
- max_val="30.0"
- show_text="false"
layout="topleft"
- left="3"
- name="zoom_time_slider"
- width="196" />
- <spinner
- control_name="ZoomTime"
- height="20"
- follows="top|left"
- left_pad="5"
- name="zoom_time_spin"
- min_val="0.0"
- max_val="30.0"
- width="58"
- increment="0.1">
- <spinner.commit_callback
- function="CommitSettings" />
- </spinner>
- <button
- follows="top|left"
- left_pad="3"
- top_delta="0"
- height="22"
- width="22"
- name="reset_zoom_time"
- image_overlay="Refresh_Off"
- tool_tip="Reset camera zoom speed to default value">
- <button.commit_callback
- function="ResetControl"
- parameter="ZoomTime" />
- </button>
-
- <text
- follows="top|left"
- name="offset_scale_lbl"
- height="16"
- layout="topleft"
- left="10"
- top_pad="3"
- width="140">
+ left="5"
+ top_pad="3"
+ width="140">
Position Smoothing:
</text>
-
+
<slider
control_name="CameraPositionSmoothing"
- follows="top|left"
+ follows="top|left|right"
height="16"
top_pad="2"
increment="1.000"
@@ -368,7 +387,8 @@
<spinner
control_name="CameraPositionSmoothing"
height="20"
- follows="top|left"
+ follows="top|right"
+ layout="topleft"
left_pad="5"
name="cam_pos_spinner"
min_val="0.0"
@@ -376,71 +396,140 @@
width="58"
increment="1.000">
</spinner>
- <button
- follows="top|left"
- left_pad="3"
- top_delta="0"
- height="22"
- width="22"
- name="cam_pos_reset"
- image_overlay="Refresh_Off"
- tool_tip="Reset camera position smoothing to default value">
- <button.commit_callback
- function="ResetControl"
- parameter="CameraPositionSmoothing" />
- </button>
- <button
- name="open_prefs_btn"
- label="Camera"
- tool_tip = "Bring up Camera floater"
+ <button
+ follows="top|right"
+ layout="topleft"
+ left_pad="3"
+ top_delta="0"
+ right="-5"
+ height="22"
+ width="22"
+ name="cam_pos_reset"
+ image_overlay="Refresh_Off"
+ tool_tip="Reset camera position smoothing to default value">
+ <button.commit_callback
+ function="ResetControl"
+ parameter="CameraPositionSmoothing" />
+ </button>
+ <button
+ height="23"
+ label=""
+ image_overlay="Cam_Save"
+ name="save_cam_pos_btn"
+ tab_stop="false"
+ tool_tip="Save current camera position and focus"
follows="top|left"
+ layout="topleft"
top_pad="5"
- left="10"
- height="20"
- width="108">
- <button.commit_callback
- function="Presets.toggleCameraFloater" />
- </button>
- <button
- name="open_prefs_btn"
- label="Save Preset"
- tool_tip = "Bring up Camera floater"
- follows="top|left"
- top_delta="0"
- left_pad="5"
- height="20"
- width="108">
+ left="5"
+ width="23">
+ <button.commit_callback
+ function="Camera.SavePosition"/>
+ </button>
+ <button
+ height="23"
+ label=""
+ follows="top|left"
+ layout="topleft"
+ top_delta="0"
+ left_pad="4"
+ image_overlay="Cam_Recall"
+ name="restore_cam_pos_btn"
+ tab_stop="false"
+ tool_tip="Restore saved camera position and focus"
+ width="23">
<button.commit_callback
- function="Presets.toggleCameraFloater" />
- </button>
- <button
- height="20"
- label=""
- image_overlay="Cam_Save"
- name="save_cam_pos_btn"
- tab_stop="false"
- tool_tip="Save current camera position and focus"
- follows="top|left"
- layout="topleft"
- top_delta="0"
- left_pad="5"
- width="23">
- <button.commit_callback
- function="Camera.SavePosition"/>
- </button>
- <button
- height="20"
- label=""
- follows="top|left"
- layout="topleft"
- top_delta="0"
- left_pad="5"
- image_overlay="Cam_Recall"
- name="restore_cam_pos_btn"
- tab_stop="false"
- tool_tip="Restore saved camera position and focus"
- width="23">
- <button.commit_callback
- function="Camera.RestorePosition"/>
- </button>
+ function="Camera.RestorePosition"/>
+ </button>
+ <panel_camera_item
+ follows="top|left"
+ layout="topleft"
+ name="front_view"
+ tool_tip="Front View"
+ top_delta="0"
+ left_pad="4"
+ width="23">
+ <panel_camera_item.mousedown_callback
+ function="CameraPresets.ChangeView"
+ parameter="Front View" />
+ <panel_camera_item.picture
+ image_name="Cam_Preset_Front_Off" />
+ <panel_camera_item.selected_picture
+ image_name="Cam_Preset_Front_On" />
+ </panel_camera_item>
+ <panel_camera_item
+ follows="top|left"
+ layout="topleft"
+ name="group_view"
+ tool_tip="Side View"
+ width="23"
+ left_pad="4">
+ <panel_camera_item.mousedown_callback
+ function="CameraPresets.ChangeView"
+ parameter="Side View" />
+ <panel_camera_item.picture
+ image_name="Cam_Preset_Side_Off" />
+ <panel_camera_item.selected_picture
+ image_name="Cam_Preset_Side_On" />
+ </panel_camera_item>
+ <panel_camera_item
+ follows="top|left"
+ layout="topleft"
+ name="rear_view"
+ tool_tip="Rear View"
+ width="23"
+ left_pad="4">
+ <panel_camera_item.mousedown_callback
+ function="CameraPresets.ChangeView"
+ tool_tip="Rear View"
+ parameter="Rear View" />
+ <panel_camera_item.picture
+ image_name="Cam_Preset_Back_Off" />
+ <panel_camera_item.selected_picture
+ image_name="Cam_Preset_Back_On" />
+ </panel_camera_item>
+ <panel_camera_item
+ follows="top|left"
+ layout="topleft"
+ name="object_view"
+ tool_tip="Object View"
+ width="23"
+ left_pad="4">
+ <panel_camera_item.mousedown_callback
+ function="CameraPresets.ChangeView"
+ parameter="object_view" />
+ <panel_camera_item.picture
+ image_name="Object_View_Off" />
+ <panel_camera_item.selected_picture
+ image_name="Object_View_On" />
+ </panel_camera_item>
+ <panel_camera_item
+ follows="top|left"
+ layout="topleft"
+ name="mouselook_view"
+ tool_tip="Mouselook View"
+ width="23"
+ left_pad="4">
+ <panel_camera_item.mousedown_callback
+ function="CameraPresets.ChangeView"
+ parameter="mouselook_view" />
+ <panel_camera_item.picture
+ image_name="MouseLook_View_Off" />
+ <panel_camera_item.selected_picture
+ image_name="MouseLook_View_On" />
+ </panel_camera_item>
+ <button
+ name="save_preset_btn"
+ label="Save as preset..."
+ tool_tip = "Save current camera settings as a preset"
+ follows="top|right"
+ layout="topleft"
+ top_delta="0"
+ left_pad="5"
+ right="-5"
+ height="23"
+ width="150">
+ <button.commit_callback
+ function="PresetsCamera.Save" />
+ </button>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
index d50506df59b97bc1f3ccfd42fec3140401a439e8..79265761125a351a03b96ffa837cd4330c766d53 100644
--- a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
@@ -8,10 +8,10 @@
border="false"
chrome="true"
follows="bottom"
- height="315"
+ height="380"
layout="topleft"
name="presets_pulldown"
- width="285">
+ width="400">
<text
type="string"
length="1"
@@ -26,11 +26,11 @@
Graphic Presets
</text>
<scroll_list
- follows="left|top"
+ follows="left|top|right"
layout="topleft"
column_padding="0"
height="100"
- width="275"
+ width="390"
draw_heading="false"
draw_stripes="false"
bg_stripe_color="0.25 0.25 0.25 0.25"
@@ -48,13 +48,12 @@
</scroll_list>
<view_border
bevel_style="none"
- follows="top|left"
+ follows="top|left|right"
height="0"
layout="topleft"
left="5"
name="horiz_separator"
- top_delta="105"
- width="275" />
+ top_delta="105"/>
<text
type="string"
@@ -88,7 +87,7 @@
halign="center"
height="12"
layout="topleft"
- left_delta="62"
+ left_delta="102"
name="ShadersPrefText2"
top_delta="0"
width="60">
@@ -101,7 +100,7 @@
halign="center"
height="12"
layout="topleft"
- left_delta="88"
+ left_delta="128"
name="ShadersPrefText3"
top_delta="0"
width="60">
@@ -114,7 +113,7 @@
halign="right"
height="12"
layout="topleft"
- left_delta="65"
+ left_delta="100"
name="ShadersPrefText4"
top_delta="0"
width="60">
@@ -134,7 +133,7 @@
height="14"
image_name="Rounded_Square"
layout="topleft"
- left_pad="41"
+ left_pad="59"
name="LowMidGraphicsDivet"
width="2" />
<icon
@@ -142,7 +141,7 @@
height="14"
image_name="Rounded_Square"
layout="topleft"
- left_pad="41"
+ left_pad="62"
name="MidGraphicsDivet"
top_delta="0"
width="2" />
@@ -151,7 +150,7 @@
height="14"
image_name="Rounded_Square"
layout="topleft"
- left_pad="42"
+ left_pad="61"
name="MidHighGraphicsDivet"
top_delta="0"
width="2" />
@@ -160,7 +159,7 @@
height="14"
image_name="Rounded_Square"
layout="topleft"
- left_pad="42"
+ left_pad="62"
name="HighGraphicsDivet"
top_delta="0"
width="2" />
@@ -169,7 +168,7 @@
height="14"
image_name="Rounded_Square"
layout="topleft"
- left_pad="42"
+ left_pad="61"
name="HighUltraGraphicsDivet"
top_delta="0"
width="2" />
@@ -178,7 +177,7 @@
height="14"
image_name="Rounded_Square"
layout="topleft"
- left_pad="42"
+ left_pad="62"
name="UltraGraphicsDivet"
top_delta="0"
width="2" />
@@ -195,7 +194,7 @@
name="QualityPerformanceSelection"
show_text="false"
top_delta="-2"
- width="279">
+ width="395">
<slider.commit_callback
function="Presets.QualityPerformance"/>
</slider>
@@ -217,7 +216,7 @@
layout="topleft"
max_val="512"
min_val="64"
- left="93"
+ left="113"
right="-68"
name="draw_dist_slider_bar"
control_name="RenderFarClip"/>
@@ -254,7 +253,7 @@
layout="topleft"
max_val="4.0"
min_val="1.0"
- left="93"
+ left="113"
right="-68"
name="lod_slider_bar"
control_name="RenderVolumeLODFactor"/>
@@ -290,7 +289,7 @@
layout="topleft"
max_val="8192"
min_val="0"
- left="93"
+ left="113"
right="-68"
name="max_particles_slider_bar"
control_name="RenderMaxPartCount"/>
@@ -326,7 +325,7 @@
layout="topleft"
max_val="65"
min_val="1"
- left="93"
+ left="113"
right="-68"
name="max_avatar_slider_bar"
control_name="RenderAvatarMaxNonImpostors"/>
@@ -361,7 +360,7 @@
layout="topleft"
max_val="350000"
min_val="0"
- left="93"
+ left="113"
right="-68"
name="complexity_slider_bar"
control_name="RenderAvatarMaxComplexity"/>
@@ -379,30 +378,129 @@
increment="1"
name="complexity_spinner"
control_name="RenderAvatarMaxComplexity" />
+ <!--Max Local Lights-->
+ <text
+ follows="left|top"
+ height="15"
+ left="10"
+ top_pad="3"
+ width="120"
+ layout="topleft"
+ value="Local Lights:"
+ name="lights_label"/>
+ <slider_bar
+ top_pad="-16"
+ height="20"
+ initial_value="96"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="4096"
+ min_val="8"
+ increment="8"
+ left="113"
+ right="-68"
+ name="local_light_slider_bar"
+ control_name="RenderLocalLightCount"/>
+ <spinner
+ top_pad="-21"
+ height="20"
+ label_width="0"
+ right="-8"
+ decimal_digits="0"
+ follows="top|right"
+ layout="topleft"
+ max_val="4096"
+ min_val="8"
+ width="60"
+ increment="8"
+ name="local_light_spinner"
+ control_name="RenderLocalLightCount" />
+ <!--Global Light Scale-->
+ <text
+ follows="left|top"
+ height="15"
+ left="10"
+ top_pad="3"
+ width="120"
+ layout="topleft"
+ value="Light Intensity:"
+ name="light_intensity_label"/>
+ <slider_bar
+ top_pad="-16"
+ height="20"
+ initial_value="96"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="10"
+ min_val="0"
+ increment=".1"
+ left="113"
+ right="-68"
+ name="light_intensity_slider_bar"
+ control_name="AlchemyGlobalLightScale"/>
+ <spinner
+ top_pad="-21"
+ height="20"
+ label_width="0"
+ right="-8"
+ decimal_digits="2"
+ follows="top|right"
+ layout="topleft"
+ max_val="10"
+ min_val="0"
+ increment=".1"
+ width="60"
+ name="light_intensity_spinner"
+ control_name="AlchemyGlobalLightScale" />
+ <text
+ follows="left|top"
+ height="15"
+ left="10"
+ top_pad="3"
+ width="120"
+ layout="topleft"
+ value="Resolution Scale:"
+ name="res_scale_label"/>
+ <slider_bar
+ top_pad="-16"
+ height="20"
+ initial_value="96"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="2"
+ min_val=".5"
+ increment=".1"
+ left="113"
+ right="-68"
+ name="res_scale_slider_bar"
+ tool_tip="(Default: 1.0) [DANGEROUS] Internal render resolution scale."
+ control_name="RenderResolutionMultiplier"/>
+ <spinner
+ top_pad="-21"
+ height="20"
+ label_width="0"
+ right="-8"
+ decimal_digits="2"
+ follows="top|right"
+ layout="topleft"
+ max_val="2"
+ min_val=".5"
+ increment=".1"
+ width="60"
+ name="res_scale_spinner"
+ tool_tip="(Default: 1.0) [DANGEROUS] Internal render resolution scale."
+ control_name="RenderResolutionMultiplier" />
<button
name="open_prefs_btn"
label="Graphics Preferences"
tool_tip = "Bring up graphics prefs"
- follows="top|left"
+ follows="top|right"
layout="topleft"
top_pad="5"
- left="10"
+ right="-9"
height="20"
width="162">
<button.commit_callback
function="Presets.GoGraphicsPrefs" />
</button>
- <button
- name="open_prefs_btn"
- label="Lightbox"
- tool_tip = "Bring up Lightbox"
- follows="top|left"
- layout="topleft"
- top_delta="0"
- left_pad="5"
- height="20"
- width="100">
- <button.commit_callback
- function="Presets.GoLightbox" />
- </button>
</panel>