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

Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear

Browse Source 
Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloatermessagelog.cpp
	indra/newview/llstartup.cpp
	indra/newview/llviewermenu.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/skins/default/xui/fr/menu_inventory.xml
This commit is contained in:
Siana Gearz
2012-03-28 22:27:45 +02:00
parent be9f3178c0 3d6511f4e1
commit f05edda4f4
264 changed files with 27606 additions and 15368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,8 +58,8 @@
left_delta="0" mouse_opaque="true" name="Worn Items"
sort_order="WornItemsSortOrder" width="461" />
</tab_container>
<menu_bar bottom="-34" drop_shadow="false" follows="left|top|right" height="18" left="2"
mouse_opaque="false" name="Inventory Menu" opaque="false" width="461">
<menu_bar bottom="-34" drop_shadow="false" follows="top|left" height="18" left="2"
mouse_opaque="false" name="Inventory Menu" opaque="false" width="237">
<menu bottom_delta="16" drop_shadow="true" height="101"
label="File" left="0" mouse_opaque="false" name="File" opaque="true"
tear_off="true" width="128">

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

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu bottom="100" color="MenuDefaultBgColor" drop_shadow="true" height="101" left="100"
mouse_opaque="false" name="Popup" opaque="true" width="128">
<menu_item_call bottom_delta="-18" height="18" label="Buy" left="0" mouse_opaque="true"
@@ -224,10 +224,11 @@
mouse_opaque="true" name="Replace Outfit" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="replaceoutfit" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="Take Off Items" left="0"
mouse_opaque="true" name="Take Off Items" width="128">
<menu_item_call bottom_delta="-18" height="18" label="Remove From Outfit" left="0"
mouse_opaque="true" name="Remove From Outfit" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="removefromoutfit" />
</menu_item_call>
<menu_item_separator name="Outfit Separator"></menu_item_separator>
<menu_item_separator name="Calling Card Separator" />
<menu_item_call bottom_delta="-18" height="18" label="Start Conference Chat" left="0"
mouse_opaque="true" name="Conference Chat Folder" width="128">
@@ -274,13 +275,13 @@
name="Deactivate" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="deactivate" />
</menu_item_call>
<menu_item_separator name="Attach Separator" />
<menu_item_separator name="Wearable And Object Separator" />
<menu_item_call bottom_delta="-18" height="18" label="Wear" left="0" mouse_opaque="true"
name="Object Wear" width="128">
name="Wearable And 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 to Worn" left="0" mouse_opaque="true"
name="Object Add" width="128">
name="Wearable 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"
@@ -296,10 +297,6 @@
name="Wearable Edit" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="edit" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="Wear" left="0" mouse_opaque="true"
name="Wearable Wear" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="wear" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="Take Off" left="0" mouse_opaque="true"
name="Take Off" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="take_off" />

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

@@ -2319,6 +2319,19 @@ Price to pay for listing must be at least [CURRENCY][MIN_PRICE].
Please enter a higher price.
</notification>
<notification
icon="alertmodal.tga"
name="ConfirmItemDeleteHasLinks"
type="alertmodal">
At least one of the items you has link items that point to it. If you delete this item, its links will permanently stop working. It is strongly advised to delete the links first.
Are you sure you want to delete these items?
<usetemplate
name="okcancelbuttons"
notext="Cancel"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="ConfirmObjectDeleteLock"
@@ -4591,6 +4604,18 @@ Would you like to leave Busy Mode before completing this transaction?
</form>
</notification>
<notification
icon="alertmodal.tga"
name="ConfirmDeleteProtectedCategory"
type="alertmodal">
The folder &apos;[FOLDERNAME]&apos; is a system folder. Deleting system folders can cause instability. Are you sure you want to delete it?
<usetemplate
ignoretext="Confirm before I delete a system folder"
name="okcancelignore"
notext="Cancel"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="ConfirmEmptyTrash"

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

@@ -15,24 +15,24 @@
<text text_color="0,0,0,1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-17" drop_shadow_visible="true" follows="top|left"
font="SansSerifBold" h_pad="0" halign="left" height="16" left="4"
mouse_opaque="true" name="artist_label" v_pad="0" width="50">
mouse_opaque="false" name="artist_label" v_pad="0" width="50">
Artist:
</text>
<text text_color="0,0,0,1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-17" drop_shadow_visible="true" follows="top|left|right"
font="SansSerifBold" h_pad="0" halign="left" height="16" left="50"
mouse_opaque="true" name="artist_text" v_pad="0" width="125">
mouse_opaque="false" name="artist_text" v_pad="0" width="125">
</text>
<text text_color="0,0,0,1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-32" drop_shadow_visible="true" follows="top|left"
font="SansSerifBold" h_pad="0" halign="left" height="16" left="4"
mouse_opaque="true" name="title_label" v_pad="0" width="50">
mouse_opaque="false" name="title_label" v_pad="0" width="50">
Title:
</text>
<text text_color="0,0,0,1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-32" drop_shadow_visible="true" follows="top|left|right"
font="SansSerifBold" h_pad="0" halign="left" height="16" left="50"
mouse_opaque="true" name="title_text" v_pad="0" width="125">
mouse_opaque="false" name="title_text" v_pad="0" width="125">
</text>
<string name="paused">

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

@@ -1821,6 +1821,20 @@ Returns a key that is the UUID of the user seated on the prim.
<!-- mouselook -->
<string name="LeaveMouselook">Press ESC to return to World View</string>
<!-- use value="" because they have preceding spaces -->
<string name="no_transfer" value=" (no transfer)" />
<string name="no_modify" value=" (no modify)" />
<string name="no_copy" value=" (no copy)" />
<string name="temporary" value=" (temporary)" />
<string name="worn" value=" (worn)" />
<string name="locked" value=" (locked)" />
<string name="link" value=" (link)" />
<string name="broken_link" value=" (broken_link)" />
<string name="LoadingContents">Loading contents...</string>
<string name="NoContents">No contents</string>
<string name="WornOnAttachmentPoint" value=" (worn on [ATTACHMENT_POINT])" />
<string name="LockedOnAttachmentPoint" value=" (locked to [ATTACHMENT_POINT])" />
<string name="ActiveGesture" value="[GESLABEL] (active)"/>
<string name="Stone">Stone</string>
<string name="Metal">Metal</string>
<string name="Glass">Glass</string>

38
indra/newview/skins/default/xui/fr/menu_inventory.xml
View File

@@ -11,8 +11,8 @@
<menu_item_call label="Nouveau dossier" name="New Folder"/>
<menu_item_call label="Nouveau script" name="New Script"/>
<menu_item_call label="Nouvelle note" name="New Note"/>
<menu_item_call label="Nouvelle gesture" name="New Gesture"/>
<menu name="New Clothes">
<menu_item_call label="Nouveau geste" name="New Gesture"/>
<menu label="Nouveaux habits" name="New Clothes">
<menu_item_call label="Nouvelle chemise" name="New Shirt"/>
<menu_item_call label="Nouveau pantalon" name="New Pants"/>
<menu_item_call label="Nouvelles chaussures" name="New Shoes"/>
@@ -20,10 +20,13 @@
<menu_item_call label="Nouvelle veste" name="New Jacket"/>
<menu_item_call label="Nouvelle jupe" name="New Skirt"/>
<menu_item_call label="Nouveaux gants" name="New Gloves"/>
<menu_item_call label="Nouveau Tee shirt" name="New Undershirt"/>
<menu_item_call label="Nouveaux sous-vêtements" name="New Underpants"/>
<menu_item_call label="Nouveau débardeur" name="New Undershirt"/>
<menu_item_call label="Nouveau caleçon" name="New Underpants"/>
<menu_item_call label="Nouveau masque alpha" name="New Alpha Mask"/>
<menu_item_call label="Nouveau tatouage" name="New Tattoo"/>
<menu_item_call label="Nouvelles propriétés physiques" name="New Physics"/>
</menu>
<menu name="New Body Parts">
<menu label="Nouvelles parties du corps" name="New Body Parts">
<menu_item_call label="Nouvelle silhouette" name="New Shape"/>
<menu_item_call label="Nouvelle peau" name="New Skin"/>
<menu_item_call label="Nouveaux cheveux" name="New Hair"/>
@@ -40,15 +43,23 @@
<menu_item_call label="Téléporter" name="Landmark Open"/>
<menu_item_call label="Ouvrir" name="Animation Open"/>
<menu_item_call label="Ouvrir" name="Sound Open"/>
<menu_item_call label="Purger l&apos;objet" name="Purge Item"/>
<menu_item_call label="Restaurer l&apos;objet" name="Restore Item"/>
<menu_item_call label="Remplacer la tenue actuelle" name="Replace Outfit"/>
<menu_item_call label="Ajouter à la tenue actuelle" name="Add To Outfit"/>
<menu_item_call label="Enlever de la tenue actuelle" name="Remove From Outfit"/>
<menu_item_call label="Trouver l'original" name="Find Original"/>
<menu_item_call label="Purger l'objet" name="Purge Item"/>
<menu_item_call label="Restaurer l'objet" name="Restore Item"/>
<menu_item_call label="Ouvrir" name="Open"/>
<menu_item_call label="Ouvrir l'original" name="Open Original"/>
<menu_item_call label="Propriétés" name="Properties"/>
<menu_item_call label="Renommer" name="Rename"/>
<menu_item_call label="Copier l&apos;UUID (identifiant universel unique)" name="Copy Asset UUID"/>
<menu_item_call label="Copier l'UUID (identifiant universel unique)" name="Copy Asset UUID"/>
<menu_item_call label="Copier" name="Copy"/>
<menu_item_call label="Coller" name="Paste"/>
<menu_item_call label="Coller comme lien" name="Paste As Link"/>
<menu_item_call label="Supprimer" name="Remove Link"/>
<menu_item_call label="Supprimer" name="Delete"/>
<menu_item_call label="Supprimer le dossier système" name="Delete System Folder"/>
<menu_item_call label="Enlever l&apos;ensemble" name="Take Off Items"/>
<menu_item_call label="Ajouter à l&apos;ensemble" name="Add To Outfit"/>
<menu_item_call label="Remplacer l&apos;ensemble" name="Replace Outfit"/>
@@ -58,22 +69,17 @@
<menu_item_call label="Jouer dans le Monde" name="Animation Play"/>
<menu_item_call label="Jouer localement" name="Animation Audition"/>
<menu_item_call label="Envoyer un message instantané" name="Send Instant Message"/>
<menu_item_call label="Offrir de téléporter..." name="Offer Teleport..."/>
<menu_item_call label="Proposer une téléportation..." name="Offer Teleport..."/>
<menu_item_call label="Démarrer le chat conférence" name="Conference Chat"/>
<menu_item_call label="Activer" name="Activate"/>
<menu_item_call label="Désactiver" name="Deactivate"/>
<menu_item_call label="Détacher de vous" name="Detach From Yourself"/>
<menu_item_call label="Remettre dans le dernier emplacement" name="Restore to Last Position"/>
<menu_item_call label="Porter" name="Object Wear"/>
<menu_item_call label="Porter" name="Wearable And Object Wear"/>
<menu label="Attacher à" name="Attach To"/>
<menu label="Attacher au HUD " name="Attach To HUD"/>
<menu_item_call label="Éditer" name="Wearable Edit"/>
<menu_item_call label="Porter" name="Wearable Wear"/>
<menu_item_call label="Ajouter" name="Wearable Add"/>
<menu_item_call label="Enlever" name="Take Off"/>
<menu_item_call label="--aucune option--" name="--no options--"/>
<menu_item_call bottom_delta="-18" height="18" label="Porter l&apos;ensemble" left="0"
mouse_opaque="true" name="Wear Items" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="wearitems" />
</menu_item_call>
</menu>
</menu></menu>