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

Added Alpha Layer support and Additional Attachments, plus I reverted my

Browse Source 
localhost on outgoing log hack and added the original values back in.
This commit is contained in:
phr0z3nt04st
2010-05-13 20:53:47 -05:00
parent 7e2162d5e8
commit 0ba33c9fb4
25 changed files with 1421 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
indra/newview/skins/default/xui/en-us/floater_customize.xml
View File

@@ -1126,6 +1126,174 @@ scratch and wear it.
height="20" label="Revert" label_selected="Revert" left="305"
mouse_opaque="true" name="Revert" scale_image="true" width="82" />
</panel>
<panel name="Tattoo" label="Tattoo" border="true" mouse_opaque="true"
follows="left|top|right|bottom" width="389" height="481" left="102" bottom="-482">
<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
image_name="icon_lock.tga" left="333" mouse_opaque="true" name="square"
width="16" />
<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" left="8"
mouse_opaque="true" name="icon" width="16" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16" left="26"
mouse_opaque="true" name="title" v_pad="0" width="355">
[DESC]
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16" left="26"
mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
[DESC]: cannot modify
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16" left="26"
mouse_opaque="true" name="title_loading" v_pad="0" width="355">
[DESC]: loading...
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16" left="26"
mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
[DESC]: not worn
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-38" drop_shadow_visible="true" follows="left|top|right"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="8"
mouse_opaque="true" name="path" v_pad="0" width="373">
Located in [PATH]
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-74" drop_shadow_visible="true" follows="left|top|right"
font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
mouse_opaque="true" name="not worn instructions" v_pad="0" width="373">
Put on a new tattoo by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-74" drop_shadow_visible="true" follows="left|top|right"
font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
mouse_opaque="true" name="no modify instructions" v_pad="0" width="373">
You do not have permission to modify this wearable.
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-486" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="right" height="28" right="117"
mouse_opaque="true" name="Item Action Label" v_pad="0" width="100">
Tattoo:
</text>
<texture_picker name="Head Tattoo" label="Head Tattoo" tool_tip="Click to choose a picture"
can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
follows="left|top" width="70" height="80" left="14" bottom="-145"/>
<texture_picker name="Upper Tattoo" label="Upper Tattoo" tool_tip="Click to choose a picture"
can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
follows="left|top" width="70" height="80" left="14" bottom="-235"/>
<texture_picker name="Lower Tattoo" label="Lower Tattoo" tool_tip="Click to choose a picture"
can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
follows="left|top" width="70" height="80" left="14" bottom="-325"/>
<button name="Create New" label="Create New Tattoo" label_selected="Create New Tattoo"
follows="left|top" halign="center" width="170" height="24" left="8" bottom="-128"
mouse_opaque="true" scale_image="true"/>
<button name="Take Off" label="Take Off" label_selected="Take Off"
follows="left|top" width="82" height="20" left="8" bottom="-365"/>
<button name="Save" label="Save" label_selected="Save"
follows="right|bottom" width="82" height="20" left="123" bottom="-478"/>
<button name="Save As" label="Save As..." label_selected="Save As..."
follows="right|bottom" width="92" height="20" left="209" bottom="-478"/>
<button name="Revert" label="Revert" label_selected="Revert"
follows="right|bottom" width="82" height="20" left="305" bottom="-478"/>
</panel>
<panel name="Alpha" label="Alpha" border="true" mouse_opaque="true"
follows="left|top|right|bottom" width="389" height="481" left="102" bottom="-482">
<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
image_name="icon_lock.tga" left="333" mouse_opaque="true" name="square"
width="16" />
<icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" left="8"
mouse_opaque="true" name="icon" width="16" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16" left="26"
mouse_opaque="true" name="title" v_pad="0" width="355">
[DESC]
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16" left="26"
mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
[DESC]: cannot modify
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16" left="26"
mouse_opaque="true" name="title_loading" v_pad="0" width="355">
[DESC]: loading...
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="left" height="16" left="26"
mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
[DESC]: not worn
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-38" drop_shadow_visible="true" follows="left|top|right"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="8"
mouse_opaque="true" name="path" v_pad="0" width="373">
Located in [PATH]
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-74" drop_shadow_visible="true" follows="left|top|right"
font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
mouse_opaque="true" name="not worn instructions" v_pad="0" width="373">
Put on a new alpha mask by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-74" drop_shadow_visible="true" follows="left|top|right"
font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
mouse_opaque="true" name="no modify instructions" v_pad="0" width="373">
You do not have permission to modify this wearable.
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-486" drop_shadow_visible="true" follows="left|top|right"
font="SansSerif" h_pad="0" halign="right" height="28" right="117"
mouse_opaque="true" name="Item Action Label" v_pad="0" width="100">
Alpha:
</text>
<texture_picker name="Head Alpha" label="Head Alpha" tool_tip="Click to choose a picture"
can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
follows="left|top" width="64" height="80" left="120" bottom="-165"/>
<texture_picker name="Upper Alpha" label="Upper Alpha" tool_tip="Click to choose a picture"
can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
follows="left|top" width="64" height="80" left_delta="90" bottom="-165"/>
<texture_picker name="Lower Alpha" label="Lower Alpha" tool_tip="Click to choose a picture"
can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
follows="left|top" width="64" height="80" left_delta="90" bottom="-165"/>
<check_box name="head alpha texture invisible"
follows="left" width="16" height="16" left="142" bottom="-185"/>
<check_box name="upper alpha texture invisible"
follows="left" width="16" height="16" left_delta="90" bottom="-185"/>
<check_box name="lower alpha texture invisible"
follows="left" width="16" height="16" left_delta="90" bottom="-185"/>
<texture_picker name="Hair Alpha" label="Hair Alpha" tool_tip="Click to choose a picture"
can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
follows="left|top" width="64" height="80" left="120" bottom="-280"/>
<texture_picker name="Eye Alpha" label="Eye Alpha" tool_tip="Click to choose a picture"
can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
follows="left|top" width="64" height="80" left_delta="90" bottom="-280"/>
<check_box name="hair alpha texture invisible"
follows="left" width="16" height="16" left="142" bottom="-300"/>
<check_box name="eye alpha texture invisible"
follows="left" width="16" height="16" left_delta="90" bottom="-300"/>
<button name="Create New" label="Create New Alpha" label_selected="Create New Alpha"
follows="left|top" halign="center" width="170" height="24" left="8" bottom="-128"
mouse_opaque="true" scale_image="true"/>
<button name="Take Off" label="Take Off" label_selected="Take Off"
follows="left|top" width="82" height="20" left="123" bottom="-340"/>
<button name="Save" label="Save" label_selected="Save"
follows="right|bottom" width="82" height="20" left="123" bottom="-478"/>
<button name="Save As" label="Save As..." label_selected="Save As..."
follows="right|bottom" width="92" height="20" left="209" bottom="-478"/>
<button name="Revert" label="Revert" label_selected="Revert"
follows="right|bottom" width="82" height="20" left="305" bottom="-478"/>
</panel>
</tab_container>
<scroll_container bottom="-476" follows="left|top|right|bottom" height="382" left="197"
mouse_opaque="false" name="panel_container" opaque="false" width="292" />

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

@@ -118,6 +118,14 @@
mouse_opaque="true" name="New Underpants" width="125">
<on_click filter="" function="Inventory.DoCreate" userdata="underpants" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="New Tattoo" left="0"
mouse_opaque="true" name="New Tattoo" width="125">
<on_click filter="" function="Inventory.DoCreate" userdata="tattoo" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="New Alpha" left="0"
mouse_opaque="true" name="New Alpha" width="125">
<on_click filter="" function="Inventory.DoCreate" userdata="alpha" />
</menu_item_call>
</menu>
<menu bottom_delta="-599" drop_shadow="true" height="85" left="0"
mouse_opaque="false" name="New Body Parts" opaque="true" width="118">

10
indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
View File

@@ -21,7 +21,7 @@
<check_box bottom="-276" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Eyes" left="13"
mouse_opaque="true" name="checkbox_Eyes" radio_style="false" width="100" />
<check_box bottom="-434" enabled="true" follows="left|top" font="SansSerifSmall"
<check_box bottom="-456" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Rename Clothing To Folder Name"
left="13" mouse_opaque="true" name="rename" radio_style="false" width="210" />
<check_box bottom="-216" enabled="true" follows="left|top" font="SansSerifSmall"
@@ -53,6 +53,12 @@
<check_box bottom="-376" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Skirt" left="113"
mouse_opaque="true" name="checkbox_Skirt" radio_style="false" width="100" />
<check_box bottom="-396" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Tattoo" left="113"
mouse_opaque="true" name="checkbox_Tattoo" radio_style="false" width="100" />
<check_box bottom="-416" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Alpha" left="113"
mouse_opaque="true" name="checkbox_Alpha" radio_style="false" width="100" />
<check_box bottom="-216" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Chest" left="213"
mouse_opaque="true" name="checkbox_Chest" radio_style="false" width="100" />
@@ -244,7 +250,7 @@ now wearing into it.
Attachments:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-414" drop_shadow_visible="true" enabled="true" follows="left|top"
bottom="-436" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
mouse_opaque="true" name="Options:" v_pad="0" width="100">
Options:

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

@@ -88,6 +88,14 @@
mouse_opaque="true" name="New Underpants" width="128">
<on_click filter="" function="Inventory.DoCreate" userdata="underpants" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="New Tattoo" left="0"
mouse_opaque="true" name="New Tattoo" width="128">
<on_click filter="" function="Inventory.DoCreate" userdata="tattoo" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="New Alpha" left="0"
mouse_opaque="true" name="New Alpha" width="128">
<on_click filter="" function="Inventory.DoCreate" userdata="alpha" />
</menu_item_call>
</menu>
<menu bottom_delta="0" color="MenuDefaultBgColor" drop_shadow="true" height="175" left="0"
mouse_opaque="false" name="New Body Parts" opaque="true" tear_off="false"