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

Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer into animesh

Browse Source
This commit is contained in:
Damian Zhaoying
2019-04-01 18:12:27 -03:00
parent ee745a20ef 7d56d772d4
commit 5f4e4a0d54
16 changed files with 880 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/skins/default/xui/en-us/floater_directory.xml
View File

@@ -142,9 +142,6 @@
<string name="done_text">
Done
</string>
<string name="redirect_404_url">
http://secondlife.com/app/search/notfound.html
</string>
<string name="default_search_page">"http://secondlife.com/app/search/index.php?"</string>
</panel>
<panel bottom="-549" follows="all" height="533" label="All" left="1" mouse_opaque="false" name="web_panel" width="778">
@@ -158,7 +155,6 @@
<text bottom="5" follows="bottom|left" left="10" height="16" name="status_text"/>
<string name="loading_text">Loading...</string>
<string name="done_text">Done</string>
<string name="redirect_404_url">[APP_SITE]/404</string>
<string name="default_search_page">http://search.secondlife.com/</string>
</panel>
<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
@@ -420,7 +416,6 @@
height="16" />
<string name="loading_text">Loading...</string>
<string name="done_text">Done</string>
<string name="redirect_404_url">http://secondlife.com/app/search/notfound.html</string>
<string name="default_search_page">"http://secondlife.com/app/showcase/index.php?"</string>
</panel>
<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
@@ -769,7 +764,6 @@ To buy direct, visit the land and click on the place name in the title bar.
<text bottom="5" follows="bottom|left" left="10" height="16" name="status_text"/>
<string name="loading_text">Loading...</string>
<string name="done_text">Done</string>
<string name="redirect_404_url">[APP_SITE]/404</string>
<string name="default_search_page">https://marketplace.secondlife.com/</string>
</panel>
</tab_container>

62
indra/newview/skins/default/xui/en-us/menu_media_ctrl.xml
View File

@@ -1,6 +1,27 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu
name="media ctrl context menu">
<menu_item_call
label="Undo"
layout="topleft"
name="undo">
<menu_item_call.on_click
function="Edit.Undo" />
<menu_item_call.on_enable
function="Edit.EnableUndo" />
</menu_item_call>
<menu_item_call
label="Redo"
layout="topleft"
name="redo">
<menu_item_call.on_click
function="Edit.Redo" />
<menu_item_call.on_enable
function="Edit.EnableRedo" />
</menu_item_call>
<menu_item_separator
layout="topleft"
name="undo_separator" />
<menu_item_call
label="Cut"
layout="topleft"
@@ -28,4 +49,45 @@
<menu_item_call.on_enable
function="Edit.EnablePaste" />
</menu_item_call>
<menu_item_call
label="Delete"
layout="topleft"
name="delete">
<menu_item_call.on_click
function="Edit.Delete" />
<menu_item_call.on_enable
function="Edit.EnableDelete" />
</menu_item_call>
<menu_item_separator
layout="topleft"
name="select_separator" />
<menu_item_call
label="Select All"
layout="topleft"
name="select_all">
<menu_item_call.on_click
function="Edit.SelectAll" />
<menu_item_call.on_enable
function="Edit.EnableSelectAll" />
</menu_item_call>
<menu_item_separator
layout="topleft"
name="debug_separator"
visible="false" />
<menu_item_call
label="Open Web Inspector"
layout="topleft"
name="open_webinspector"
visible="false">
<menu_item_call.on_click
function="Open.WebInspector" />
</menu_item_call>
<menu_item_call
label="Show Source"
layout="topleft"
name="show_page_source"
visible="false">
<menu_item_call.on_click
function="Open.ViewSource" />
</menu_item_call>
</menu>