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-08-26 22:49:45 -04:00
parent 8c23e3bdea 2be05793b1
commit fbcfee20b6
9 changed files with 541 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,7 @@
</menu_item_call>
<menu_item_separator bottom="-194" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator4" width="243" />
<menu_item_call bottom="-259" enabled="true" height="19" label="Quit" left="0"
<menu_item_call bottom="-259" enabled="true" height="19" label="Quit" left="0" color="1 0 0 1"
mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
<on_click function="File.Quit" userdata="" />
</menu_item_call>
@@ -387,11 +387,100 @@
<on_click function="View.HighlightTransparent" userdata="" />
<on_check function="View.CheckHighlightTransparent" />
</menu_item_check>
<menu_item_check bottom="-384" enabled="true" height="19" label="Beacons" left="0"
mouse_opaque="true" name="beacons" width="211" shortcut="control|alt|shift|N">
<on_click function="ShowFloater" userdata="beacons" />
<on_check function="FloaterVisible" userdata="beacons" />
</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 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" />

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

@@ -17,12 +17,6 @@
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="RevokePermsOnStandUp" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="On standing up, revoke perms for the object your avatar was sitting on" left="10"
tool_tip="Objects generally retain Take Control and Trigger Animation permissions until reset or given permission by another user. Enabling this will make sure you revoke these permissions immediately."
mouse_opaque="true" name="revoke_perms_on_stand_up_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"
@@ -271,7 +265,8 @@
tool_tip="" name="AscentCmdLineMapTo" control_name="AscentCmdLineMapTo" width="200"/>
<check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Use same position between sims" left_delta="0" mouse_opaque="true"
name="toggle" radio_style="false" width="270" control_name="AscentCmdLineMapToKeepPos"/>
name="AscentCmdLineMapToKeepPos" radio_style="false" width="270"
control_name="AscentCmdLineMapToKeepPos"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
name="cmd_line_text_13" width="512">
Teleport to avatar (usage: cmd name)</text>
@@ -299,6 +294,12 @@
tool_tip="Turns off broadcasting headturns and lookat beacons for yourself."
mouse_opaque="true" name="private_look_at_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="RevokePermsOnStandUp" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="On standing up, revoke perms for the object your avatar was sitting on" left="10"
tool_tip="Objects generally retain Take Control and Trigger Animation permissions until reset or given permission by another user. Enabling this will make sure you revoke these permissions immediately."
mouse_opaque="true" name="revoke_perms_on_stand_up_check" radio_style="false"
width="400" />
</panel>
</tab_container>
</panel>

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

@@ -90,32 +90,32 @@
tool_tip="Enabling this set your avatar name color to your client tag color or custom set color."
mouse_opaque="true" name="show_self_tag_color_check" radio_style="false"
width="400" />
<check_box bottom_delta="65" control_name="AscentCustomizeOwnTag" enabled="false"
<check_box bottom_delta="65" control_name="AscentUseCustomTag" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Use a custom color and label (Local only)" left_delta="230"
tool_tip="Enabling this will let you set your own name tag to show up with your custom client and tag color. This only shows up to yourself."
mouse_opaque="true" name="customize_own_tag_check" radio_style="false"
width="400" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-16" left_delta="0" drop_shadow_visible="true" enabled="false" follows="left|top"
bottom_delta="-16" left_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10"
mouse_opaque="true" name="tag_color_textbox" v_pad="0" width="394">
mouse_opaque="true" name="custom_tag_label_text" v_pad="0" width="394">
Tag Label:
</text>
<line_editor bottom_delta="-8" enabled="false" follows="left|top" font="SansSerif"
height="20" left_delta="60" name="custom_client_tag_label"
<line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
height="20" left_delta="60" name="custom_tag_label_box"
tool_tip="The custom string you would like to replace your client tag with (Local only)"
width="170" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-25" left_delta="-60" drop_shadow_visible="true" enabled="false" follows="left|top"
bottom_delta="-25" left_delta="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10"
mouse_opaque="true" name="tag_color_textbox" v_pad="0" width="394">
mouse_opaque="true" name="custom_tag_color_text" v_pad="0" width="394">
Tag color:
</text>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-29"
can_apply_immediately="false" color="1 1 1 1"
enabled="false" follows="left|top" height="48" label="" left_delta="73"
mouse_opaque="true" name="tag_color_swatch"
enabled="true" follows="left|top" height="48" label="" left_delta="60"
mouse_opaque="true" name="custom_tag_color_swatch"
tool_tip="The custom color you would like to replace your client color with (Local only)" width="32" />
<!-- End of Client Tag settings -->
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"