diff --git a/BuildParams b/BuildParams
index 6adae15d5f..d481072185 100644
--- a/BuildParams
+++ b/BuildParams
@@ -1,19 +1,15 @@
# BuildParams
#
# Please refer to:
-# https://wiki.lindenlab.com/wiki/Parabuild_with_Mercurial#How_Build_Parameters_Work
+# https://wiki.secondlife.com/wiki/Automated_Build_System
# Global setting for now...
Darwin.symbolfiles = "newview/Release/secondlife-symbols-darwin.tar.bz2"
CYGWIN.symbolfiles = "newview/Release/secondlife-symbols-windows.tar.bz2"
Linux.symbolfiles = "newview/secondlife-symbols-linux.tar.bz2"
-# Public Upload Locations overriding the default private ones
-S3PROXY_URL = http://automated-builds-secondlife-com.s3.amazonaws.com/
-S3INTERNAL_URL = http://automated-builds-secondlife-com.s3.amazonaws.com/
-S3GET_URL = http://automated-builds-secondlife-com.s3.amazonaws.com/
-S3PUT_URL = https://s3.amazonaws.com/automated-builds-secondlife-com/
-S3ACL = public-read
+# Use Public Upload Locations
+public_build = true
# Update Public Inworld Build Status Indicators
email_status_this_is_os = true
@@ -27,7 +23,6 @@ viewer-development.show_changes_since = 2-1-release
# Build Settings
viewer-development_coverity.coverity_product = viewer
-
viewer-development.build_debug_release_separately = true
# Notifications - to configure email notices, add a setting like this:
@@ -155,4 +150,26 @@ oz_viewer-review1_coverity.build_CYGWIN_Debug = false
oz_viewer-review1_coverity.build_CYGWIN_RelWithDebInfo = false
oz_viewer-review1_coverity.build_CYGWIN_Release = false
+oz_viewer-review2_coverity.coverity_product = viewer
+
+oz_viewer-review2.build_Linux = true
+oz_viewer-review2_debug.build_Linux = false
+oz_viewer-review2_coverity.build_Linux = false
+
+oz_viewer-review2.build_Darwin = true
+oz_viewer-review2_debug.build_Darwin = false
+oz_viewer-review2_coverity.build_Darwin = false
+
+oz_viewer-review2.build_CYGWIN = true
+oz_viewer-review2.build_CYGWIN_Debug = false
+oz_viewer-review2.build_CYGWIN_RelWithDebInfo = false
+oz_viewer-review2.build_CYGWIN_Release = true
+oz_viewer-review2_debug.build_CYGWIN_Debug = true
+oz_viewer-review2_debug.build_CYGWIN_RelWithDebInfo = true
+oz_viewer-review2_debug.build_CYGWIN_Release = false
+oz_viewer-review2_coverity.build_coverity = true
+oz_viewer-review2_coverity.build_CYGWIN_Debug = false
+oz_viewer-review2_coverity.build_CYGWIN_RelWithDebInfo = false
+oz_viewer-review2_coverity.build_CYGWIN_Release = false
+
# eof
diff --git a/doc/contributions.txt b/doc/contributions.txt
index f4619bff5c..6d93eca14c 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -128,6 +128,8 @@ Asuka Neely
VWR-8179
Balp Allen
VWR-4157
+Be Holder
+ SNOW-397
Benja Kepler
VWR-746
Biancaluce Robbiani
@@ -154,6 +156,7 @@ Boroondas Gupte
SNOW-503
SNOW-510
SNOW-527
+ SNOW-610
SNOW-624
VWR-233
WEB-262
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index 3a89b999bd..e26acd53a3 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -895,9 +895,7 @@ LLVector3 LLRender::getUITranslation()
{
if (mUIOffset.empty())
{
- //llassert(!mUIOffset.empty());
- llwarns << "UI offset stack empty." << llendl;
- return LLVector3(0,0,0);
+ return LLVector3::zero;
}
return mUIOffset.back();
}
@@ -906,9 +904,7 @@ LLVector3 LLRender::getUIScale()
{
if (mUIScale.empty())
{
- //llassert(!mUIScale.empty());
- llwarns << "UI scale stack empty." << llendl;
- return LLVector3(1,1,1);
+ return LLVector3(1.f, 1.f, 1.f);
}
return mUIScale.back();
}
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 07418d1b5e..9d911777d1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8635,7 +8635,7 @@
Type
Boolean
Value
- 0
+ 1
ShowBetaGrids