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

Merge git://github.com/AlericInglewood/SingularityViewer

Browse Source 
Conflicts:
	indra/newview/llpaneldisplay.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
This commit is contained in:
Siana Gearz
2011-06-05 19:56:46 +02:00
parent 1473486f23 50ce0c4183
commit 630059a74f
587 changed files with 27725 additions and 13002 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/skins/default/xui/en-us/floater_beacons.xml
View File

@@ -1,24 +1,25 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="false"
width="250" height="225"
width="250" height="255"
name="beacons" title="Beacons"
rect_control="FloaterBeaconsRect" control_name="BeaconAlwaysOn">
<panel bottom="10" follows="left|top|right|bottom" left="10" width="230" height="200" name="beacons_panel">
<check_box bottom_delta="-33" follows="left|top" left="0" name="touch_only" label="Scripted Objects with Touch Only" control_name="scripttouchbeacon" />
rect_control="FloaterBeaconsRect" control_name="ShowBeaconsFloater">
<panel bottom="10" follows="left|top|right|bottom" left="10" width="230" height="230" name="beacons_panel">
<check_box bottom_delta="-33" follows="left|top" left="0" name="always_on" label="Keep beacons when closing floater" control_name="keepbeacons" />
<check_box bottom_delta="-30" follows="left|top" left="0" name="touch_only" label="Scripted Objects with Touch Only" control_name="scripttouchbeacon" />
<check_box bottom_delta="-20" follows="left|top" left="0" name="scripted" label="Scripted Objects" control_name="scriptsbeacon" />
<check_box bottom_delta="-20" follows="left|top" left="0" name="physical" label="Physical Objects" control_name="physicalbeacon" />
<check_box bottom_delta="-20" follows="left|top" left="0" name="sounds" label="Sound Sources" control_name="soundsbeacon" />
<check_box bottom_delta="-20" follows="left|top" left="0" name="particles" label="Particle Sources" control_name="particlesbeacon" />
<check_box bottom_delta="-20" follows="left|top" left="0" name="highlights" label="Render Highlights" control_name="renderhighlights" />
<check_box bottom_delta="-30" follows="left|top" left="0" name="highlights" label="Render Highlights" control_name="renderhighlights" />
<check_box bottom_delta="-20" follows="left|top" left="0" name="beacons" label="Render Beacons" control_name="renderbeacons" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="5"
bottom_delta="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="25"
mouse_opaque="true" name="beacon_width_label" v_pad="0" width="128">
Beacon Width:
</text>
<slider bottom_delta="-20" can_edit_text="false" enabled="true" width="185" height="16" mouse_opaque="true"
decimal_digits="0" increment="1" initial_val="1" left="30" min_val="1.0" max_val="16.0"
decimal_digits="0" increment="1" initial_val="1" left="16" min_val="1.0" max_val="16.0"
name="beacon_width" show_text="true" value="1" control_name="DebugBeaconLineWidth"/>
</panel>
</floater>

19
indra/newview/skins/default/xui/en-us/floater_dickdongs.xml
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
width="250" height="225"
name="dickdongs" title="HOLYFUCKSHIT A CUSTOM FLOATER"
rect_control="FloaterDickDongsRect" control_name="DickDongsFloater">
<panel bottom="10" follows="left|top|right|bottom" left="10" width="230" height="200" name="dickdongs_panel">
<check_box bottom_delta="-33" follows="left|top" left="0" name="myfirstcheckbox1" label="LOOK AT THIS A MOTHERFUCKING CHECKBOX JESUS CHRIST" control_name="DickDongsCheckbox1" />
<check_box bottom_delta="-20" follows="left|top" left="0" name="myfirstcheckbox2" label="HOLY SHIT ANOTHER CHECKBOX?? GODDAMN IT'S MY LUCKY DAY" control_name="DickDongsCheckbox2" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="5"
mouse_opaque="true" name="amountofawesomelabel" v_pad="0" width="128">
AMOUNT OF AWESOME:
</text>
<slider bottom_delta="-20" can_edit_text="false" enabled="false" width="185" height="16" mouse_opaque="true"
decimal_digits="0" increment="1" initial_val="16" left="30" min_val="1.0" max_val="16.0"
name="beacon_width" show_text="false" value="1" control_name="DickDongsSlider1"/>
</panel>
</floater>

1
indra/newview/skins/default/xui/en-us/floater_snapshot.xml
View File

@@ -32,6 +32,7 @@
list_position="below" mouse_opaque="true" name="save_btn" tool_tip="Save image to a file"
width="105">
<flyout_button_item value="save" name="save_item">Save</flyout_button_item>
<flyout_button_item value="saveas" name="saveas_item">Save As...</flyout_button_item>
</flyout_button>
<button bottom_delta="0" follows="left|top" height="20" label="Cancel" left="120"
name="discard_btn" width="85" />

99
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -408,100 +408,11 @@
<on_click function="View.HighlightTransparent" userdata="" />
<on_check function="View.CheckHighlightTransparent" />
</menu_item_check>
<menu create_jump_keys="true" drop_shadow="true" enabled="true"
label="Beacons" mouse_opaque="false" name="Beacons"
opaque="true" tear_off="true">
<menu_item_check enabled="true" height="18"
label="Beacons Always On" mouse_opaque="true"
name="Beacons Always On" shortcut="control|n">
<on_click function="ToggleControl"
userdata="BeaconAlwaysOn" />
<on_check control="BeaconAlwaysOn" />
</menu_item_check>
<menu_item_separator enabled="true" height="8"
label="-----------" mouse_opaque="true" name="separator" />
<menu_item_check enabled="true" height="18"
label="Scripted Objects with Touch Only" left="0" color="1 0 0 1"
mouse_opaque="true" name="Scripted Objects With Touch Only">
<on_click function="View.ToggleBeacon"
userdata="scripttouchbeacon" />
<on_check function="View.CheckBeaconEnabled"
userdata="scripttouchbeacon" />
</menu_item_check>
<menu_item_check enabled="true" height="18"
label="Scripted Objects" mouse_opaque="true" color="1 0 0 1"
name="Scripted Objects">
<on_click function="View.ToggleBeacon"
userdata="scriptsbeacon" />
<on_check function="View.CheckBeaconEnabled"
userdata="scriptsbeacon" />
</menu_item_check>
<menu_item_check enabled="true" height="18"
label="Physical Objects" mouse_opaque="true" color="0 1 0 1"
name="Physical Objects">
<on_click function="View.ToggleBeacon"
userdata="physicalbeacon" />
<on_check function="View.CheckBeaconEnabled"
userdata="physicalbeacon" />
</menu_item_check>
<menu_item_check enabled="true" height="18"
label="Sound Sources" mouse_opaque="true" color="1 1 0 1"
name="Sound Sources">
<on_click function="View.ToggleBeacon"
userdata="soundsbeacon" />
<on_check function="View.CheckBeaconEnabled"
userdata="soundsbeacon" />
</menu_item_check>
<menu_item_check enabled="true" height="18"
label="Particle Sources" mouse_opaque="true" color="0 0 1 1"
name="Particle Sources">
<on_click function="View.ToggleBeacon"
userdata="particlesbeacon" />
<on_check function="View.CheckBeaconEnabled"
userdata="particlesbeacon" />
</menu_item_check>
<menu_item_separator enabled="true" height="8"
label="-----------" mouse_opaque="true" name="separator" />
<menu_item_check enabled="true" height="18"
label="Render Highlights" mouse_opaque="true"
name="Render Highlights">
<on_click function="View.ToggleBeacon"
userdata="renderhighlights" />
<on_check function="View.CheckBeaconEnabled"
userdata="renderhighlights" />
</menu_item_check>
<menu_item_check enabled="true" height="18"
label="Render Beacons" mouse_opaque="true"
name="Render Beacons">
<on_click function="View.ToggleBeacon"
userdata="renderbeacons" />
<on_check function="View.CheckBeaconEnabled"
userdata="renderbeacons" />
</menu_item_check>
<menu_item_separator enabled="true" height="8"
label="-----------" mouse_opaque="true" name="separator3" />
<menu create_jump_keys="true"
drop_shadow="true" enabled="true" height="117"
label="Beacon Width" mouse_opaque="false" name="Beacon Width"
opaque="true" tear_off="true">
<menu_item_call enabled="true" height="18" label="1"
mouse_opaque="true" name="Beacon Width 1">
<on_click function="View.BeaconWidth" userdata="1" />
</menu_item_call>
<menu_item_call enabled="true" height="18" label="4"
mouse_opaque="true" name="Beacon Width 4">
<on_click function="View.BeaconWidth" userdata="4" />
</menu_item_call>
<menu_item_call enabled="true" height="18" label="16"
mouse_opaque="true" name="Beacon Width 16">
<on_click function="View.BeaconWidth" userdata="16" />
</menu_item_call>
<menu_item_call enabled="true" height="18" label="32"
mouse_opaque="true" name="Beacon Width 32">
<on_click function="View.BeaconWidth" userdata="32" />
</menu_item_call>
</menu>
</menu>
<menu_item_check name="beacons" label="Beacons"
shortcut="control|alt|shift|N">
<on_click function="ShowFloater" userdata="beacons" />
<on_check function="FloaterVisible" userdata="beacons" />
</menu_item_check>
<menu_item_check bottom="-384" enabled="true" height="19" label="Hide Particles" left="0"
mouse_opaque="true" name="Hide Particles" width="129" shortcut="control|alt|shift|=">
<on_click function="View.ToggleRenderType" userdata="hideparticles" />

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

@@ -6821,6 +6821,14 @@ The URL you clicked cannot be opened from this web browser.
You do not appear to have the proper hardware requirements for [VIEWER_NAME]. The viewer requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
</global>
<global name="UnsupportedCPUSSE2">
You do not appear to have the proper hardware requirements for [VIEWER_NAME]. The viewer requires a CPU that supports SSE2
</global>
<global name="UnsupportedCPUSSE">
You do not appear to have the proper hardware requirements for [VIEWER_NAME]. The viewer requires a CPU that supports SSE
</global>
<global name="UnsupportedCPUAmount">
796
</global>

296
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
View File

@@ -1,8 +1,298 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel top="20" left="10" height="400" width="517" follows="left|top|right|bottom"
border="true" label="SG System" name="ascsys" enabled="true" mouse_opaque="true">
<tab_container label="SG System" bottom="0" height="440" width="497" left="0"
name="Ascent System" tab_min_width="70" tab_position="top">
border="true" label="Singularity" name="ascsys" enabled="true" mouse_opaque="true">
<tab_container label="Singularity System" bottom="0" height="440" width="497" left="0"
name="Ascent System" tab_min_width="70" tab_position="top">
<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="General" name="User Interface">
<check_box bottom_delta="-25" control_name="DoubleClickTeleport" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Enable teleporting via double-click in-world" left="10"
tool_tip="Double-clicking on an object/person will teleport you to that location."
mouse_opaque="true" name="double_click_teleport_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="OptionRotateCamAfterLocalTP" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Reset camera after teleporting" left="20"
tool_tip="Centers the camera behind you after a local teleport."
mouse_opaque="true" name="center_after_teleport_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="OptionOffsetTPByAgentHeight" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Offset TP target by half agent height" left="20"
tool_tip="Tries to aim the TP so that your feet land at the point you're aiming for."
mouse_opaque="true" name="offset_teleport_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="PreviewAnimInWorld" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Preview animations on the avatar instead on a dummy before uploading" left="10"
tool_tip="The Animation upload window will play animations on your avatar when previewing them."
mouse_opaque="true" name="preview_anim_in_world_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="SaveScriptsAsMono" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Save scripts in inventory as Mono scripts instead of LSL2" left="10"
tool_tip="Scripts will automatically be compiled in Mono when saving - Usually only possible when placed in an object."
mouse_opaque="true" name="save_scripts_as_mono_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentAlwaysRezInGroup" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Always rez objects as land group when available" left="10"
tool_tip="Rez objects with the same group that the object is being rezzed on has, regardless of your active tag."
mouse_opaque="true" name="always_rez_in_group_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentBuildAlwaysEnabled" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Always show Build as enabled" left="10"
tool_tip="Allows you to use the Build menu without having to be tricky about it. May not mean you can actually build there."
mouse_opaque="true" name="always_build_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentFlyAlwaysEnabled" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Always allow Fly" left="10"
tool_tip="Lets you fly in locations you shouldn't be allowed to. Use at your own risk - Just because you can doesn't mean you should."
mouse_opaque="true" name="always_fly_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentDisableMinZoomDist" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Disable camera minimum distance" left="10"
tool_tip="Allows the camera to get reeeaaally close to things."
mouse_opaque="true" name="disable_camera_zoom_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentPowerfulWizardCheck1" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Enable Power User functionality" left="10"
tool_tip="Adds features deemed too dangerous for normal use. These features can wreak havoc or do bad things if misused - Mostly to yourself or your belongings. If you're sure, activate the checkbox below as well."
mouse_opaque="true" name="power_user_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentPowerfulWizardCheck2" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Confirm Power User functionality" left="10"
tool_tip="Confirms Power User activation. Turn this on at your own risk, and use any features it enables responsibly. Ascent devs will not replace anything you break if you ruin something important. Unlike most checkboxes, you must apply/ok changes before this will activate."
mouse_opaque="true" name="power_user_confirm_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentUseSystemFolder" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Enable Ascent System Inventory (Requires Restart)" left="10"
tool_tip="Creates a new folder in the inventory for storing settings files and non-permanent assets."
mouse_opaque="true" name="system_folder_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentSystemTemporary" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Temporary uploads go in the System Asset folder." left="20"
tool_tip="Puts temporary uploads in the Asset folder which separates them from actual uploads, making them easier to find."
mouse_opaque="true" name="temp_in_system_check" radio_style="false"
width="400" />
</panel>
<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="Chat/IM" name="Chat/IM">
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
left="15" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
width="300">
IMs:
</text>
<check_box bottom_delta="-25" control_name="WoLfVerticalIMTabs" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Use Vertical IMs (Requires a restart)" left="10"
mouse_opaque="true" name="use_vertical_ims_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Announce incoming instant messages" left="10" mouse_opaque="true"
control_name="AscentInstantMessageAnnounceIncoming" radio_style="false" width="270"
name="quickstart_im_check"
tool_tip="Opens an IM window when someone starts typing an IM to you. This gives you a heads up that someone is IMing you before they hit enter. "/>
<check_box bottom_delta="-20" control_name="AscentHideTypingNotification" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Don't send '[name] is typing...' in IMs" left="10"
tool_tip="IM partners will not see '______ is typing...' when you're responding."
mouse_opaque="true" name="hide_typing_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="OptionShowGroupNameInChatIM" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Show group name in chat" left="10"
tool_tip="The name of the group will also be displayed if the IM is from group chat."
mouse_opaque="true" name="append_group_name_check" radio_style="false"
width="400" />
<!-- Left/Right Column split -->
<view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="75"
left="235" name="CmdDivisor" width="0"/>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
left="250" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
width="300">
Chat:
</text>
<check_box bottom_delta="-25" control_name="PlayTypingSound" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Play the typing sound for local chat" left_delta="-5"
tool_tip="Silences the chatting type sound, making it quieter for things like performances."
mouse_opaque="true" name="play_typing_sound_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="HideNotificationsInChat" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Do not echo/log notifications in chat" left_delta="00"
mouse_opaque="true" name="hide_notifications_in_chat_check" radio_style="false"
width="400" />
<check_box bottom="-120" control_name="AscentAllowMUpose" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Allow MU pose method." left="10"
tool_tip="Allows the use of both /me and : to perform emotes."
mouse_opaque="true" name="allow_mu_pose_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentAutoCloseOOC" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Auto-close OOC comments." left="10"
tool_tip="Will automatically append '))' to any message starting with '((', or visa versa."
mouse_opaque="true" name="close_ooc_check" radio_style="false"
width="400" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
left_delta="0" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
width="300">
Show links on chatting object names in chat history for:
</text>
<radio_group bottom_delta="-26" control_name="LinksForChattingObjects" draw_border="true" enabled="true"
tool_tip="Enables a link to show you the owner of the speaking object."
follows="left|top" height="20" left="20" mouse_opaque="true" name="objects_link" width="350">
<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18"
left_delta="5" mouse_opaque="true" name="no_object" width="48">
No object
</radio_item>
<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18"
left_delta="45" mouse_opaque="true" name="others_objects" width="48">
Others' objects
</radio_item>
<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18"
left_delta="60" mouse_opaque="true" name="anyones_objects" width="48">
Anyone's objects
</radio_item>
</radio_group>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
left="10" mouse_opaque="true" name="time_format_text_box" v_pad="0"
width="80">
Time format:
</text>
<combo_box allow_text_entry="false" bottom_delta="-5" enabled="true" follows="left|top"
height="18" hidden="false" left="90" max_chars="20" mouse_opaque="true"
tool_tip="Show hours in either 12-23 or 12PM-11PM format."
name="time_format_combobox" width="130">
<combo_item type="string" length="1" enabled="true" name="24hours" value="default">
24-hour clock
</combo_item>
<combo_item type="string" length="1" enabled="true" name="12hours" value="default">
12-hour clock
</combo_item>
</combo_box>
<check_box bottom_delta="0" control_name="SecondsInChatAndIMs" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Seconds in chat/IMs timestamps" left="240"
mouse_opaque="true" name="seconds_in_chat_and_ims_check" radio_style="false"
width="260" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
left="10" mouse_opaque="true" name="date_format_text_box" v_pad="0"
width="80">
Date format:
</text>
<combo_box allow_text_entry="false" bottom_delta="-5" enabled="true" follows="left|top"
height="18" hidden="false" left="90" max_chars="20" mouse_opaque="true"
name="date_format_combobox" width="130">
<combo_item type="string" length="1" enabled="true" name="year_first" value="default">
YYYY-MM-DD
</combo_item>
<combo_item type="string" length="1" enabled="true" name="day_first" value="default">
DD/MM/YYYY
</combo_item>
<combo_item type="string" length="1" enabled="true" name="month_first" value="default">
MM/DD/YYYY
</combo_item>
</combo_box>
<!-- Auto-responder -->
<view_border bevel_style="none" border_thickness="1" bottom="-420" follows="top|left"
height="190" left="5" name="GraphicsBorder" width="485" />
<check_box bottom_delta="168" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Enable Autoresponse" left="10" mouse_opaque="true"
name="AscentInstantMessageResponseAnyone" radio_style="false" width="270"
tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
<!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-22" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
h_pad="0" halign="left" height="18" left_delta="10" mouse_opaque="false"
name="text_box1" v_pad="0" width="430">
Response:
</text>
<combo_box allow_text_entry="false" bottom_delta="2" enabled="true" follows="left|top"
height="18" hidden="false" left_delta="67" max_chars="20" mouse_opaque="true"
tool_tip="Saved response to use."
name="autoresponse_combobox" width="90">
<combo_item type="string" length="1" enabled="true" name="default" value="default">
Default
</combo_item>
</combo_box>
<button bottom_delta="0" control_name="addResponse" name="add_current" follows="left|top"
label="+" height="18" left_delta="90" width="20"/>
<button bottom_delta="0" control_name="removeResponse" name="remove_current" follows="left|top"
label="-" height="18" left_delta="20" width="20"/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Autorespond to non-friends" left_delta="-187" mouse_opaque="true"-->
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Autorespond to non-friends" left_delta="0" mouse_opaque="true"
name="AscentInstantMessageResponseFriends" radio_style="false" width="270"
tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Autorespond to people you have muted" left_delta="0"
mouse_opaque="true" name="AscentInstantMessageResponseMuted" radio_style="false"
width="270" tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Send as soon as they start typing" left_delta="0" mouse_opaque="true"
name="AscentInstantMessageShowOnTyping" radio_style="false" width="270"/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="26"
initial_value="false" label="Don't show IMs you auto-responsed to" left_delta="0"
mouse_opaque="true" name="AscentInstantMessageShowResponded" radio_style="false"
width="170"/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Autorespond to every message" left_delta="0" mouse_opaque="true"
name="AscentInstantMessageResponseRepeat" radio_style="false" width="270"/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Send an item along with the response" left_delta="0"
mouse_opaque="true" name="AscentInstantMessageResponseItem" radio_style="false"
width="270" tool_tip="You can include an inventory item to send along with your auto response by dragging it from your inventory to the location below"/>
<!--<view_border blevel_style="in" bottom_delta="-20" follows="left|top" height="18" left_delta="5"
mouse_opaque="false" name="im_give_drop_target_rect" width="220"/>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom_delta="0"
drop_shadow_visible="true" follows="left|top" font="SansSerifSmall" h_pad="0" halign="center"
height="16" left_delta="0" mouse_opaque="true" name="Give inventory" tool_tip="Drop an inventory item here to have it given along with the auto-response."
v_pad="2" width="230">
Drop item here (Currently: NONE)
</text>-->
<!-- Right Column -->
<!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="160" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
h_pad="0" halign="left" height="18" left_delta="245" mouse_opaque="false"-->
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="120" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
h_pad="0" halign="left" height="18" left_delta="245" mouse_opaque="false"
name="text_box1" v_pad="0" width="430">
Response Text:
</text>
<text_editor type="string" length="1" bottom_delta="-110" embedded_items="false" enabled="true"
follows="left|top" font="SansSerifSmall" height="110" left_delta="0" max_length="1100"
mouse_opaque="true" name="im_response" width="230" word_wrap="true" spell_check="true"/>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
h_pad="0" halign="left" height="18" left_delta="0" mouse_opaque="false"
name="text_box1" v_pad="0" width="430">
Use #f for user's first name, #l for last name,
#t for timestamp, #r for SLURL to you,
#i for your idle time. (e.g. "5 mins")
</text>
</panel>
<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="General" name="User Interface">

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

@@ -191,37 +191,35 @@
initial_value="true" label="Deferred Shading" left_delta="0"
mouse_opaque="true" name="RenderDeferred" radio_style="false"
width="256" />
<check_box bottom_delta="-17" control_name="RenderDeferredSunShadow" enabled="true"
<check_box bottom_delta="-17" control_name="RenderDeferredGI" enabled="true"
follows="left|top" font="SansSerifSmall" height="16"
initial_value="true" label="Primary Shadows" left_delta="0"
mouse_opaque="true" name="RenderDeferredSunShadow" radio_style="false"
initial_value="true" label="Global Illumination (Experimental!)" left_delta="0"
mouse_opaque="true" name="RenderDeferredGI" radio_style="false"
width="256" />
<check_box bottom_delta="-17" control_name="RenderWaterReflections" enabled="true"
follows="left|top" font="SansSerifSmall" height="16"
initial_value="true" label="Water Reflections" left_delta="0"
mouse_opaque="true" name="Reflections" radio_style="false" width="256" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-17" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12"
left="10" mouse_opaque="true" name="ReflectionDetailText" v_pad="0"
left="15" mouse_opaque="true" name="ReflectionDetailText" v_pad="0"
width="128">
Reflection Detail:
Water Reflections:
</text>
<combo_box bottom_delta="-20" control_name="RenderReflectionDetail" enabled = "true" follows="left|top" label="Reflection Detail"
left_delta="-2" mouse_opaque="true" name="ReflectionDetailCombo" width="160" height="16">
<combo_item type="string" length="1" name="0" value="0">
<combo_item type="string" length="1" name="0" value="0">
Disabled
</combo_item>
<combo_item type="string" length="1" name="1" value="1">
Terrain and Trees
</combo_item>
<combo_item type="string" length="1" name="1" value="1">
<combo_item type="string" length="1" name="2" value="2">
All Static Objects
</combo_item>
<combo_item type="string" length="1" name="2" value="2">
<combo_item type="string" length="1" name="3" value="3">
All Avatars and Objects
</combo_item>
<combo_item type="string" length="1" name="3" value="3">
<combo_item type="string" length="1" name="4" value="4">
Everything
</combo_item>
</combo_box>
<!--radio_group bottom_delta="-73" control_name="RenderReflectionDetail" draw_border="false"
@@ -245,6 +243,27 @@
Everything
</radio_item>
</radio_group-->
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-17" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12"
left="15" mouse_opaque="true" name="ShadowDetailText" v_pad="0"
width="128">
Deferred Shadows:
</text>
<combo_box bottom_delta="-20" control_name="RenderShadowDetail" enabled = "true" follows="left|top" label="Shadow Detail"
left_delta="-2" mouse_opaque="true" name="ShadowDetailCombo" width="160" height="16">
<combo_item type="string" length="1" name="0" value="0">
Disabled
</combo_item>
<combo_item type="string" length="1" name="1" value="1">
Sun shadows
</combo_item>
<combo_item type="string" length="1" name="2" value="2">
Sun and spotlight shadows
</combo_item>
</combo_box>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-313" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
@@ -320,6 +339,11 @@
increment="0.125" initial_val="160" label=" Avatars:"
label_width="140" left_delta="0" max_val="1" min_val="0"
mouse_opaque="true" name="AvatarMeshDetail" show_text="false" width="223" />
<slider bottom_delta="-20" can_edit_text="false" control_name="RenderAvatarPhysicsLODFactor"
decimal_digits="3" enabled="true" follows="left|top" height="16"
increment="0.1" initial_val="160" label=" Avatar Physics:"
label_width="140" left_delta="0" max_val="1" min_val="0"
mouse_opaque="true" name="AvatarPhysicsDetail" show_text="false" width="223" />
<slider bottom_delta="-20" can_edit_text="false" control_name="RenderTerrainLODFactor"
decimal_digits="3" enabled="true" follows="left|top" height="16"
increment="0.125" initial_val="160" label=" Terrain:"
@@ -364,6 +388,13 @@
name="AvatarMeshDetailText" v_pad="0" width="128">
Low
</text>
<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" mouse_opaque="true"
name="AvatarPhysicsDetailText" v_pad="0" width="128">
Off
</text>
<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"
@@ -379,13 +410,13 @@
Low
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-331" drop_shadow_visible="true" enabled="true" follows="left|top"
bottom="-352" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12"
left="210" mouse_opaque="true" name="LightingDetailText" v_pad="0"
width="128">
Lighting Detail:
</text>
<radio_group bottom_delta="-43" control_name="RenderLightingDetail" draw_border="false"
<radio_group bottom_delta="-43" control_name="RenderLocalLights" draw_border="false"
enabled="true" follows="left|top" height="38" left_delta="0"
mouse_opaque="true" name="LightingDetailRadio" width="321">
<radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16"
@@ -398,7 +429,7 @@
</radio_item>
</radio_group>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-331" drop_shadow_visible="true" enabled="true" follows="left|top"
bottom="-352" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="360"
mouse_opaque="true" name="TerrainDetailText" v_pad="0" width="128">
Terrain Detail: