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

Merge remote-tracking branch 'lirusaito/master'

Browse Source
This commit is contained in:
Latif Khalifa
2013-07-12 08:15:05 +02:00
parent 77f77b03b0 dfb4370a56
commit c769510c6f
14 changed files with 108 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/skins/default/xui/en-us/menu_pie_object.xml
View File

@@ -60,20 +60,17 @@
<menu_item_call enabled="true" hidden="false" label="Data" mouse_opaque="true" name="Data">
<on_click function="Object.Data" />
</menu_item_call>
<menu_item_call label="Export" mouse_opaque="true" name="Export">
<on_click function="Object.Export" />
<on_enable function="Object.EnableExport" />
</menu_item_call>
<menu_item_call label="Save OBJ..." mouse_opaque="true" name="Save OBJ...">
<on_click function="Object.SaveAsOBJ" />
<on_enable function="Object.EnableExport" />
</menu_item_call>
<menu_item_call enabled="true" label="Reload" mouse_opaque="true" name="Reload Textures">
<on_click function="Object.ReloadTextures" />
</menu_item_call>
<menu_item_separator />
<pie_menu label="Export &gt;" name="Export Menu">
<menu_item_call enabled="false" hidden="false" label="XML" mouse_opaque="true" name="ExportXML">
<on_click function="Object.Export" />
<on_enable function="Object.EnableExport" />
</menu_item_call>
<menu_item_call enabled="false" hidden="false" label="Wavefront" mouse_opaque="true" name="ExportOBJ">
<on_click function="Object.SaveAsOBJ" />
<on_enable function="Object.EnableExport" />
</menu_item_call>
</pie_menu>
</pie_menu>
<menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute">
<on_click function="Object.Mute" />

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

@@ -119,4 +119,7 @@
<on_click function="ShowFloater" userdata="appearance" />
<on_enable function="Edit.EnableCustomizeAvatar" />
</menu_item_call>
<menu_item_call label="Save OBJ..." mouse_opaque="true" name="Save OBJ...">
<on_click function="Avatar.SaveAsOBJ" />
</menu_item_call>
</pie_menu>

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

@@ -9638,21 +9638,17 @@ Would you like to enable announcing keys to objects in the sim?
</notification>
<notification
icon="alert.tga"
name="WavefrontExportFailed"
type="alert">
Export to Wavefront OBJ file failed:
[REASON]
icon="notify.tga"
name="WavefrontExportPartial"
type="notify">
Unable to include [OBJECT] in export, insufficient permissions.
</notification>
<notification
icon="notify.tga"
icon="notifytip.tga"
name="WavefrontExportSuccess"
type="notify">
Object successfully exported in Wavefront OBJ format to:
[FILENAME]
type="notifytip">
Object successfully exported to: [FILENAME]
</notification>
</notifications>

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

@@ -183,8 +183,8 @@
label="Instant Message..." label_selected="Instant Message..."
left_delta="71" mouse_opaque="true" name="Instant Message..."
tool_tip="Instant Message (IM)" width="140" />
<button bottom="-470" ffont="SansSerif" halign="center" height="20" label="Mute"
label_selected="Mute" left_delta="141" mouse_opaque="true" name="Mute"
<button bottom="-470" font="SansSerifSmall" halign="center" height="20" label="(Un)Mute"
left_delta="141" mouse_opaque="true" name="Mute"
width="60" />
<button bottom="-470" font="SansSerif" halign="center" height="20" label="Invite to Group"
label_selected="Invite to Group" left_delta="61" mouse_opaque="true"