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

Merge branch 'master' of github.com:HazimGazov/Inertia

Browse Source 
Conflicts:
	indra/newview/llviewermenu.cpp
This commit is contained in:
phr0z3nt04st
2010-06-09 00:59:47 -05:00
parent b1b36abe23 29ee9f7a08
commit 70e296e174
4 changed files with 314 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -539,6 +539,10 @@
mouse_opaque="true" name="Region/Estate..." width="185">
<on_click function="ShowFloater" userdata="about region" />
</menu_item_call>
<menu_item_call bottom="-308" enabled="true" height="19" label="Export Region" left="0"
mouse_opaque="true" name="Export Region" width="185">
<on_click function="ShowFloater" userdata="export region" />
</menu_item_call>
<menu_item_separator bottom="-316" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator6" width="185" />
<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"