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

Revert "THE BIGGIE."

Browse Source 
This reverts commit ec55705bdd.

Conflicts:

	indra/newview/ascentprefsvan.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
This commit is contained in:
Siana Gearz
2010-10-18 18:27:09 +02:00
parent 49cb86adae
commit 5a67fcd623
48 changed files with 7185 additions and 8544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,10 +24,6 @@
<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 name="checkbox_use_links" control_name="UseInventoryLinks" initial_value="false"
enabled="true" label="Use links for no-copy items" font="SansSerifSmall"
bottom_delta="-20" left_delta="0" follows="left|top" height="16" width="300"
mouse_opaque="true" radio_style="false" />
<check_box bottom="-216" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Shirt" left="113"
mouse_opaque="true" name="checkbox_Shirt" radio_style="false" width="100" />

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

@@ -129,10 +129,6 @@
name="Sound Open" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="open" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="Find Original" left="0"
mouse_opaque="true" name="Find Original" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="goto" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="Purge Item" left="0" mouse_opaque="true"
name="Purge Item" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="purge" />
@@ -190,10 +186,6 @@
name="Paste" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="paste" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="Paste As Link" left="0" mouse_opaque="true"
name="Paste As Link" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="paste_link" />
</menu_item_call>
<menu_item_separator name="Paste Separator" />
<menu_item_call bottom_delta="-18" height="18" label="Delete" left="0" mouse_opaque="true"
name="Delete" width="128">
@@ -263,6 +255,10 @@
<on_click filter="" function="Inventory.DoToSelected" userdata="deactivate" />
</menu_item_call>
<menu_item_separator name="Attach Separator" />
<menu_item_call bottom_delta="-18" height="18" label="Detach From Yourself" left="0"
mouse_opaque="true" name="Detach From Yourself" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="detach" />
</menu_item_call>
<!-- COMMENTED OUT for DEV-32347 -->
<menu_item_call bottom_delta="-18" height="18" label="Restore to Last Position" left="0" mouse_opaque="true"
name="Restore to Last Position" width="128">
@@ -272,19 +268,11 @@
name="Object Wear" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="attach" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="Add" left="0" mouse_opaque="true"
name="Object Add" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="wear_add" />
</menu_item_call>
<menu bottom_delta="-18" height="18" label="Attach To" left="0" mouse_opaque="true"
name="Attach To" opaque="true" tear_off="false" width="128" />
<menu bottom_delta="-18" height="18" label="Attach To HUD" left="0"
mouse_opaque="true" name="Attach To HUD" opaque="true" tear_off="false"
width="128" />
<menu_item_call bottom_delta="-18" height="18" label="Detach From Yourself" left="0"
mouse_opaque="true" name="Detach From Yourself" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="detach" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="Edit" left="0" mouse_opaque="true"
name="Wearable Edit" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="edit" />

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

@@ -798,14 +798,6 @@ The outfit folder contains no clothing, body parts, or attachments.
You can not wear clothes or body parts that are in the trash
</notification>
<notification
icon="alertmodal.tga"
name="MaxAttachmentsOnOutfit"
type="alertmodal">
Could not attach object.
Exceeds the attachments limit of [MAX_ATTACHMENTS] objects. Please detach another object first.
</notification>
<notification
icon="alertmodal.tga"
name="CannotWearInfoNotComplete"

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

@@ -166,10 +166,6 @@
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"
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="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"
follows="left|top|right|bottom" label="Body Dynamics" name="Body Dynamics">