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

This commit is contained in:
Inusaito Sayori
2015-08-12 14:52:52 -04:00
201 changed files with 10553 additions and 6878 deletions

View File

@@ -260,7 +260,7 @@
<menu_item_separator name="Sound Separator" />
<menu_item_call bottom_delta="-18" height="18" label="Play" left="0" mouse_opaque="true"
name="Sound Play" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="open" />
<on_click filter="" function="Inventory.DoToSelected" userdata="sound_play" />
</menu_item_call>
<menu_item_separator name="Landmark Separator" />
<menu_item_call bottom_delta="-18" height="18" label="About Landmark" left="0"

View File

@@ -3183,6 +3183,7 @@ The
<string name="NoContents">No contents</string>
<string name="WornOnAttachmentPoint" value=" (worn on [ATTACHMENT_POINT])" />
<string name="LockedOnAttachmentPoint" value=" (locked to [ATTACHMENT_POINT])" />
<string name="AttachmentErrorMessage" value=" ([ATTACHMENT_ERROR])" />
<string name="ActiveGesture" value="[GESLABEL] (active)"/>
<!-- Inventory permissions -->
<string name="PermYes">Yes</string>
@@ -3264,9 +3265,12 @@ The
<string name="Stomach">Stomach</string>
<string name="Left Pec">Left Pec</string>
<string name="Right Pec">Right Pec</string>
<string name="Neck">Neck</string>
<string name="Avatar Center">Root</string>
<string name="Invalid Attachment">Invalid Attachment Point</string>
<string name="Neck">Neck</string>
<string name="Avatar Center">Root</string>
<string name="Invalid Attachment">Invalid Attachment Point</string>
<string name="ATTACHMENT_MISSING_ITEM">Error: missing item</string>
<string name="ATTACHMENT_MISSING_BASE_ITEM">Error: missing base item</string>
<string name="ATTACHMENT_NOT_ATTACHED">Error: object is in current outfit but not attached</string>
<!-- Account types, see LLAvatarPropertiesProcessor -->
<string name="AcctTypeResident">Resident</string>