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

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate

Browse Source 
Conflicts:
	indra/llui/lluictrl.cpp - Silly mergestuffs
	indra/newview/llfloatermediabrowser.cpp - deleted
	indra/newview/llpanellogin.cpp - updated functions went poof

Compile Fixies:
	indra/newview/llfloaterwater.cpp - I missed a spot with notificationsutil, it seems.
This commit is contained in:
Lirusaito
2013-06-26 12:37:31 -04:00
parent 32dc35d582 f6df34e40a
commit 19367b517c
37 changed files with 1060 additions and 1533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/skins/default/xui/en-us/floater_animation_anim_preview.xml
View File

@@ -58,7 +58,7 @@
<button
follows="left|bottom"
height="22"
label="Upload ([AMOUNT])"
label="Upload ([UPLOADFEE])"
layout="topleft"
left="45"
name="ok_btn"

2
indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
View File

@@ -579,7 +579,7 @@
initial_val="0.5" label="" left="494" max_val="10" min_val="-10"
mouse_opaque="true" name="WLCloudScrollY" show_text="true" value="0.0"
width="200" />
<check_box bottom="-120" control_name="DrawClassicClouds" follows="left"
<check_box bottom="-120" control_name="SkyUseClassicClouds" follows="left"
font="SansSerifSmall" height="16" initial_value="false"
label="Draw Classic Clouds" left="480" mouse_opaque="true"
name="DrawClassicClouds" width="200" />