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

Sync with viewer-tiger~

Browse Source 
Syncs up llmath stuffs.

Thanks to Shyotl for the CMakeLists fix for Wbemuuid.
This commit is contained in:
Inusaito Sayori
2014-07-11 20:36:19 -04:00
parent bc8947289b
commit 8a2e24ecd0
52 changed files with 1456 additions and 1435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/skins/default/xui/en-us/panel_region_general.xml
View File

@@ -31,9 +31,8 @@
left="205" name="terraform_help" width="18" />
<check_box bottom_delta="-20" follows="left|top" height="20" label="Block Fly" left="10"
name="block_fly_check" width="80" />
<button bottom_delta="0" follows="left|top" height="18" label="?" left="205" name="fly_help" width="18" />
<check_box bottom_delta="-20" follows="left|top" height="20" label="Block Parcel Fly Over" tool_tip="Extend access checks upwards to prevent flying over a parcel" left="10" name="block_fly_over_check" width="90" />
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
left="205" name="fly_help" width="18" />
<check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Damage"
left="10" name="allow_damage_check" width="80" />
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
@@ -95,7 +94,7 @@
label="Phase" left_delta="-35" max_val="30" min_val="6" name="sun_hour_slider" show_text="false" width="200" />
<button bottom_delta="-20" enabled="false" follows="left|top" height="20" label="Apply"
left="108" name="apply_btn" width="100" />
<button bottom_delta="-60" follows="left|top" height="20"
<button bottom_delta="-40" follows="left|top" height="20"
label="Teleport Home One User..." left="10" name="kick_btn" width="250" />
<button bottom_delta="-23" follows="left|top" height="20"
label="Teleport Home All Users..." left="10" name="kick_all_btn" width="250" />

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

@@ -316,7 +316,10 @@ Make sure you entered the correct Login URI. An example of a Login URI is: \"htt
<!-- build floater -->
<string name="multiple_textures">Multiple</string>
<string name="use_texture">Use texture</string>
<string name="manip_hint1">Move mouse cursor over ruler</string>
<string name="manip_hint2">to snap to grid</string>
<!-- world map -->
<string name="texture_loading">Loading...</string>