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

[BOM] Add Universal wearables functionality

Browse Source
This commit is contained in:
Liru Færs
2019-10-14 21:53:01 -04:00
parent 27c259bf7c
commit 278b617290
14 changed files with 1289 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1348,6 +1348,184 @@ one from scratch and wear it.
<button name="Revert" label="Revert" label_selected="Revert"
follows="right|bottom" width="82" height="20" left="305" bottom="-478"/>
</panel>
<panel label="Universal" name="Universal" border="true" follows="all" height="481" left="102" bottom="-482" width="389">
<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>
<tab_container name="layer_tabs" follows="all" left_delta="85" bottom_delta="-30" height="16" width="300" tab_min_width="55"/>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-104" drop_shadow_visible="true" follows="left|top|right"
font="SansSerifSmall" h_pad="0" halign="left" height="28" left="102"
mouse_opaque="true" name="not worn instructions" v_pad="0" width="284">
Put on a new universal by dragging one from your
inventory to your avatar. Alternately, you can 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="-50" drop_shadow_visible="true" follows="left|top|right"
font="SansSerifSmall" h_pad="0" halign="left" height="14" 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|bottom|right"
font="SansSerif" h_pad="0" halign="right" height="28" right="117"
mouse_opaque="true" name="Item Action Label" v_pad="0" width="100">
Universal:
</text>
<texture_picker
can_apply_immediately="true"
allow_no_texture="true"
default_image_name="Default"
follows="left|top"
width="80" height="96" left="109" bottom="-174"
label="Head Tattoo"
name="Head Universal Tattoo"
tool_tip="Click to choose a picture"/>
<texture_picker
can_apply_immediately="true"
allow_no_texture="true"
default_image_name="Default"
follows="left|top"
label="Upper Tattoo"
width="80" height="96" left_delta="96" bottom_delta="0"
name="Upper Universal Tattoo"
tool_tip="Click to choose a picture"/>
<texture_picker
can_apply_immediately="true"
allow_no_texture="true"
default_image_name="Default"
follows="left|top"
label="Lower Tattoo"
width="80" height="96" left_delta="96" bottom_delta="0"
name="Lower Universal Tattoo"
tool_tip="Click to choose a picture"/>
<texture_picker
can_apply_immediately="true"
allow_no_texture="true"
default_image_name="Default"
follows="left|top"
width="80" height="96" left_delta="-192" bottom_delta="-106"
label="Skirt Tattoo"
name="Skirt Tattoo"
tool_tip="Click to choose a picture"/>
<texture_picker
can_apply_immediately="true"
allow_no_texture="true"
default_image_name="Default"
follows="left|top"
width="80" height="96" left_delta="96" bottom_delta="0"
label="Hair Tattoo"
name="Hair Tattoo"
tool_tip="Click to choose a picture"/>
<texture_picker
can_apply_immediately="true"
allow_no_texture="true"
default_image_name="Default"
follows="left|top"
width="80" height="96" left_delta="96" bottom_delta="0"
label="Eyes Tattoo"
name="Eyes Tattoo"
tool_tip="Click to choose a picture"/>
<texture_picker
can_apply_immediately="true"
allow_no_texture="true"
default_image_name="Default"
follows="left|top"
width="80" height="96" left_delta="-192" bottom_delta="-106"
label="Left Arm Tattoo"
name="Left Arm Tattoo"
tool_tip="Click to choose a picture"/>
<texture_picker
can_apply_immediately="true"
allow_no_texture="true"
default_image_name="Default"
follows="left|top"
width="80" height="96" left_delta="96" bottom_delta="0"
label="Left Leg Tattoo"
name="Left Leg Tattoo"
tool_tip="Click to choose a picture"/>
<texture_picker
can_apply_immediately="true"
allow_no_texture="true"
default_image_name="Default"
follows="left|top"
width="80" height="96" left_delta="96" bottom_delta="0"
label="Aux1 Tattoo"
name="Aux1 Tattoo"
tool_tip="Click to choose a picture"/>
<texture_picker
can_apply_immediately="true"
allow_no_texture="true"
default_image_name="Default"
follows="left|top"
width="80" height="96" left_delta="-192" bottom_delta="-106"
label="Aux2 Tattoo"
name="Aux2 Tattoo"
tool_tip="Click to choose a picture"/>
<texture_picker
can_apply_immediately="true"
allow_no_texture="true"
default_image_name="Default"
follows="left|top"
width="80" height="96" left_delta="96" bottom_delta="0"
label="Aux3 Tattoo"
name="Aux3 Tattoo"
tool_tip="Click to choose a picture"/>
<color_swatch
can_apply_immediately="true"
allow_no_texture="true"
follows="left|top"
width="80" height="96" left_delta="96" bottom_delta="0"
label="Color/Tint"
name="Color/Tint"
tool_tip="Click to open color picker"/>
<button name="Create New" label="Create New Universal" label_selected="Create New Universal"
follows="left|top" width="170" height="24" left="160" bottom="-148"/>
<button name="Take Off" label="Take Off"
follows="left|top" width="82" height="20" left="8" bottom="-330"/>
<button bottom_delta="-26" follows="left|top" height="20" width="82" name="New Layer" label="New Layer"/>
<button bottom_delta="-26" follows="left|top" height="20" width="41" name="Arrow Left" label="◀️◀️" tool_tip="Move to inner layer."/>
<button bottom_delta="0" left_delta="41" height="20" follows="left|top" width="41" name="Arrow Right" label="▶️▶️" tool_tip="Move to outer layer."/>
<button name="Save" label="Save"
follows="right|bottom" width="82" height="20" left="123" bottom="-478"/>
<button name="Save As" label="Save As..."
follows="right|bottom" width="92" height="20" left="209" bottom="-478"/>
<button name="Revert" label="Revert"
follows="right|bottom" width="82" height="20" left="305" bottom="-478"/>
</panel>
<panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
label="Physics" left="102" mouse_opaque="true" name="Physics" width="389">
<icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"

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

@@ -171,6 +171,9 @@
mouse_opaque="true" name="New Alpha" width="125">
<on_click filter="" function="Inventory.DoCreate" userdata="alpha" />
</menu_item_call>
<menu_item_call label="New Universal" name="New Universal">
<on_click function="Inventory.DoCreate" userdata="universal"/>
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="New Physics" left="0"
mouse_opaque="true" name="New Physics" width="125">
<on_click filter="" function="Inventory.DoCreate" userdata="physics" />

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

@@ -157,6 +157,9 @@
mouse_opaque="true" name="New Alpha" width="128">
<on_click filter="" function="Inventory.DoCreate" userdata="alpha" />
</menu_item_call>
<menu_item_call label="New Universal" name="New Universal">
<on_click function="Inventory.DoCreate" userdata="universal"/>
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="New Physics" left="0"
mouse_opaque="true" name="New Physics" width="128">
<on_click filter="" function="Inventory.DoCreate" userdata="physics" />

60
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -3259,61 +3259,6 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="AvatarSetNotBusy">Not Busy</string>
<string name="AvatarSetBusy">Busy</string>
<!-- Wearable Types -->
<string name="shape">Shape</string>
<string name="skin">Skin</string>
<string name="hair">Hair</string>
<string name="eyes">Eyes</string>
<string name="shirt">Shirt</string>
<string name="pants">Pants</string>
<string name="shoes">Shoes</string>
<string name="socks">Socks</string>
<string name="jacket">Jacket</string>
<string name="gloves">Gloves</string>
<string name="undershirt">Undershirt</string>
<string name="underpants">Underpants</string>
<string name="skirt">Skirt</string>
<string name="alpha">Alpha</string>
<string name="tattoo">Tattoo</string>
<string name="physics">Physics</string>
<string name="invalid">invalid</string>
<string name="none">none</string>
<string name="unknown">Unknown</string>
<!-- Not Worn Wearable Types -->
<string name="shirt_not_worn">Shirt not worn</string>
<string name="pants_not_worn">Pants not worn</string>
<string name="shoes_not_worn">Shoes not worn</string>
<string name="socks_not_worn">Socks not worn</string>
<string name="jacket_not_worn">Jacket not worn</string>
<string name="gloves_not_worn">Gloves not worn</string>
<string name="undershirt_not_worn">Undershirt not worn</string>
<string name="underpants_not_worn">Underpants not worn</string>
<string name="skirt_not_worn">Skirt not worn</string>
<string name="alpha_not_worn">Alpha not worn</string>
<string name="tattoo_not_worn">Tattoo not worn</string>
<string name="physics_not_worn">Physics not worn</string>
<string name="invalid_not_worn">invalid</string>
<!-- Create new wearable of the specified type -->
<string name="create_new_shape">Create new shape</string>
<string name="create_new_skin">Create new skin</string>
<string name="create_new_hair">Create new hair</string>
<string name="create_new_eyes">Create new eyes</string>
<string name="create_new_shirt">Create new shirt</string>
<string name="create_new_pants">Create new pants</string>
<string name="create_new_shoes">Create new shoes</string>
<string name="create_new_socks">Create new socks</string>
<string name="create_new_jacket">Create new jacket</string>
<string name="create_new_gloves">Create new gloves</string>
<string name="create_new_undershirt">Create new undershirt</string>
<string name="create_new_underpants">Create new underpants</string>
<string name="create_new_skirt">Create new skirt</string>
<string name="create_new_alpha">Create new alpha</string>
<string name="create_new_tattoo">Create new tattoo</string>
<string name="create_new_physics">Create new physics</string>
<string name="create_new_invalid">invalid</string>
<!-- Wearable List-->
<string name="NewWearable">New [WEARABLE_ITEM]</string>
@@ -3336,7 +3281,7 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="universal">Universal</string>
<string name="physics">Physics</string>
<string name="invalid">invalid</string>
<string name="unknown">unknown</string>
<string name="unknown">Unknown</string>
<string name="none">none</string>
<!-- Not Worn Wearable Types -->
@@ -3351,6 +3296,7 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="skirt_not_worn">Skirt not worn</string>
<string name="alpha_not_worn">Alpha not worn</string>
<string name="tattoo_not_worn">Tattoo not worn</string>
<string name="universal_not_worn">Universal not worn</string>
<string name="physics_not_worn">Physics not worn</string>
<string name="invalid_not_worn">invalid</string>
@@ -3370,6 +3316,7 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="create_new_skirt">Create new skirt</string>
<string name="create_new_alpha">Create new alpha</string>
<string name="create_new_tattoo">Create new tattoo</string>
<string name="create_new_universal">Create new universal</string>
<string name="create_new_physics">Create new physics</string>
<string name="create_new_invalid">invalid</string>
@@ -4694,6 +4641,7 @@ Abuse Report</string>
<string name="New Skirt">New Skirt</string>
<string name="New Alpha">New Alpha</string>
<string name="New Tattoo">New Tattoo</string>
<string name="New Universal">New Universal</string>
<string name="New Physics">New Physics</string>
<string name="Invalid Wearable">Invalid Wearable</string>
<string name="New Gesture">New Gesture</string>