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

Merge branch 'master' of github.com:Beeks/Ascent

Browse Source
This commit is contained in:
CharleyLevenque
2010-10-02 12:05:56 -04:00
parent 8a78a06a10 810fff09d6
commit a3cb93ac3a
69 changed files with 1046 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/skins/default/xui/en-us/menu_inventory.xml
View File

@@ -208,6 +208,10 @@
mouse_opaque="true" name="Add To Outfit" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="addtooutfit" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="Wear Items" left="0"
mouse_opaque="true" name="Wear Items" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="wearitems" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="Replace Outfit" left="0"
mouse_opaque="true" name="Replace Outfit" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="replaceoutfit" />

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

@@ -41,18 +41,6 @@
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="AscentDisableTeleportScreens" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Disable the Teleport progress screens" left="10"
tool_tip="Viewer will not hide your UI while teleporting, allowing you to continue to read IMs."
mouse_opaque="true" name="disable_tp_screen_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentDisableLogoutScreens" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Hide the Logout progress screen" left="10"
tool_tip="Does not hide the UI when logging out."
mouse_opaque="true" name="disable_logout_screen_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"
@@ -323,7 +311,12 @@ Use #f for user's first name, #l for last name,
label="Enable Clouds" left="10"
mouse_opaque="true" name="enable_clouds" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="SpeedRez" enabled="true"
<check_box bottom_delta="-20" left_delta="10" control_name="SkyUseClassicClouds" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Enable Classic Clouds" left="10"
mouse_opaque="true" name="enable_classic_clouds" radio_style="false"
width="400" />
<check_box bottom_delta="-20" left_delta="-10" control_name="SpeedRez" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Enable speed-rezzing via draw distance stepping" left="10"
mouse_opaque="true" name="speed_rez_check" radio_style="false"

38
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
View File

@@ -11,13 +11,31 @@
tool_tip="Saves settings per-account, allowing easier customization for alts."
mouse_opaque="true" name="use_account_settings_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentDisableTeleportScreens" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Show the Teleport progress screens" left="10"
tool_tip="If turned off, the viewer will not hide your UI while teleporting, allowing you to continue to read IMs."
mouse_opaque="true" name="disable_tp_screen_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="OptionPlayTpSound" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Play the Teleport sound when moving between sims" left="10"
tool_tip="Viewer will play the wooshing TP noise on teleport."
mouse_opaque="true" name="tp_sound_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentDisableLogoutScreens" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Show the Login/Logout progress screens" left="10"
tool_tip="If turned off, the viewer does not hide the UI when logging in or out."
mouse_opaque="true" name="disable_logout_screen_check" radio_style="false"
width="400" />
</panel>
<panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="Colors" name="Colors">
<!-- Client tag options -->
<view_border bevel_style="none" border_thickness="1" bottom="-135" follows="top|left"
height="130" left="5" name="GraphicsBorder" width="485" />
<check_box bottom_delta="110" control_name="AscentUseTag" enabled="true"
<view_border bevel_style="none" border_thickness="1" bottom="-155" follows="top|left"
height="150" left="5" name="GraphicsBorder" width="485" />
<check_box bottom_delta="130" control_name="AscentUseTag" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Use Client Tag:" left_delta="0"
tool_tip="Enabling this will show your client tag on your avatar name locally."
@@ -100,9 +118,15 @@
tool_tip="Enabling this will show the amount of time an avatar has been idle."
mouse_opaque="true" name="show_idle_time_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentUseStatusColors" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Use user status colors (Friend, Linden, etcetera below)" left_delta="-230"
tool_tip="Enabling this will show people who match specific criteria (Lindens, Estate owners, friends, muted people) with the color you've set below."
mouse_opaque="true" name="use_status_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentUpdateTagsOnLoad" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Automatically check website for updates to client definitions" left_delta="-230"
label="Automatically check website for updates to client definitions" left_delta="0"
tool_tip="Enabling this will allow ascent to download fresh definitions when needed."
mouse_opaque="true" name="update_tags_check" radio_style="false"
width="400" />
@@ -110,7 +134,7 @@
label="Manual Update" height="18" left_delta="340" width="100"/>
<!-- End of Client Tag settings -->
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-158" drop_shadow_visible="true" enabled="true" follows="left|top"
bottom="-178" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
Color For My Effects:
@@ -120,7 +144,7 @@
enabled="true" follows="left|top" height="47" label="Effects" left="148"
mouse_opaque="true" name="effect_color_swatch" width="44" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-205" drop_shadow_visible="true" enabled="true" follows="left|top"
bottom="-225" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="friends_color_textbox" v_pad="0" width="394">
Color For:
@@ -144,7 +168,7 @@
name="muted_color_swatch" width="44" />
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
can_apply_immediately="true" color="0.8 1 1 1" mouse_opaque="true"
enabled="true" follows="left|top" height="47" label="Muted" left_delta="54"
enabled="true" follows="left|top" height="47" label="Custom" left_delta="54"
name="custom_color_swatch" width="44" />
</panel>
<panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"