Merge

20 files changed, 997 insertions, 789 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 214b1a1965..83afa0ed8c 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1252,6 +1252,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>BulkChangeIncludeSettings</key>
+    <map>
+      <key>Comment</key>
+      <string>Bulk permission changes affect environment settings</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>BulkChangeEveryoneCopy</key>
     <map>
       <key>Comment</key>
@@ -15668,6 +15679,28 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>SettingsNextOwnerModify</key>
+    <map>
+      <key>Comment</key>
+      <string>Newly created Environment setting can be modified by next owner</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>SettingsNextOwnerTransfer</key>
+    <map>
+      <key>Comment</key>
+      <string>Newly created Environment setting can be resold or given away by next owner</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>DefaultUploadPermissionsConverted</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index a91246b5a1..56f3b75792 100644
--- a/indra/newview/lldrawpoolwater.cpp
+++ b/indra/newview/lldrawpoolwater.cpp
@@ -1,762 +1,762 @@
-/** 

- * @file lldrawpoolwater.cpp

- * @brief LLDrawPoolWater class implementation

- *

- * $LicenseInfo:firstyear=2002&license=viewerlgpl$

- * Second Life Viewer Source Code

- * Copyright (C) 2010, Linden Research, Inc.

- * 

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation;

- * version 2.1 of the License only.

- * 

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- * 

- * You should have received a copy of the GNU Lesser General Public

- * License along with this library; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

- * 

- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA

- * $/LicenseInfo$

- */

-

-#include "llviewerprecompiledheaders.h"

-#include "llfeaturemanager.h"

-#include "lldrawpoolwater.h"

-

-#include "llviewercontrol.h"

-#include "lldir.h"

-#include "llerror.h"

-#include "m3math.h"

-#include "llrender.h"

-

-#include "llagent.h"		// for gAgent for getRegion for getWaterHeight

-#include "llcubemap.h"

-#include "lldrawable.h"

-#include "llface.h"

-#include "llsky.h"

-#include "llviewertexturelist.h"

-#include "llviewerregion.h"

-#include "llvosky.h"

-#include "llvowater.h"

-#include "llworld.h"

-#include "pipeline.h"

-#include "llviewershadermgr.h"

-#include "llenvironment.h"

-#include "llsettingssky.h"

-#include "llsettingswater.h"

-

-static float sTime;

-

-BOOL deferred_render = FALSE;

-

-BOOL LLDrawPoolWater::sSkipScreenCopy = FALSE;

-BOOL LLDrawPoolWater::sNeedsReflectionUpdate = TRUE;

-BOOL LLDrawPoolWater::sNeedsDistortionUpdate = TRUE;

-F32 LLDrawPoolWater::sWaterFogEnd = 0.f;

-

-LLDrawPoolWater::LLDrawPoolWater() : LLFacePool(POOL_WATER)

-{

-}

-

-LLDrawPoolWater::~LLDrawPoolWater()

-{

-}

-

-void LLDrawPoolWater::setTransparentTextures(const LLUUID& transparentTextureId, const LLUUID& nextTransparentTextureId)

-{

-    LLSettingsWater::ptr_t pwater = LLEnvironment::instance().getCurrentWater();

-    mWaterImagep[0] = LLViewerTextureManager::getFetchedTexture(!transparentTextureId.isNull() ? transparentTextureId : pwater->GetDefaultTransparentTextureAssetId());

-    mWaterImagep[1] = LLViewerTextureManager::getFetchedTexture(!nextTransparentTextureId.isNull() ? nextTransparentTextureId : (!transparentTextureId.isNull() ? transparentTextureId : pwater->GetDefaultTransparentTextureAssetId()));

-    mWaterImagep[0]->addTextureStats(1024.f*1024.f);

-    mWaterImagep[1]->addTextureStats(1024.f*1024.f);

-}

-

-void LLDrawPoolWater::setOpaqueTexture(const LLUUID& opaqueTextureId)

-{

-    LLSettingsWater::ptr_t pwater = LLEnvironment::instance().getCurrentWater();

-    mOpaqueWaterImagep = LLViewerTextureManager::getFetchedTexture(opaqueTextureId);

-    mOpaqueWaterImagep->addTextureStats(1024.f*1024.f);

-}

-

-void LLDrawPoolWater::setNormalMaps(const LLUUID& normalMapId, const LLUUID& nextNormalMapId)

-{

-    LLSettingsWater::ptr_t pwater = LLEnvironment::instance().getCurrentWater();

-    mWaterNormp[0] = LLViewerTextureManager::getFetchedTexture(!normalMapId.isNull() ? normalMapId : pwater->GetDefaultWaterNormalAssetId());

-    mWaterNormp[1] = LLViewerTextureManager::getFetchedTexture(!nextNormalMapId.isNull() ? nextNormalMapId : (!normalMapId.isNull() ? normalMapId : pwater->GetDefaultWaterNormalAssetId()));

-    mWaterNormp[0]->addTextureStats(1024.f*1024.f);

-    mWaterNormp[1]->addTextureStats(1024.f*1024.f);

-}

-

-//static

-void LLDrawPoolWater::restoreGL()

-{

-	/*LLSettingsWater::ptr_t pwater = LLEnvironment::instance().getCurrentWater();

-    if (pwater)

-    {

-        setTransparentTextures(pwater->getTransparentTextureID(), pwater->getNextTransparentTextureID());

-        setOpaqueTexture(pwater->GetDefaultOpaqueTextureAssetId());

-        setNormalMaps(pwater->getNormalMapID(), pwater->getNextNormalMapID());

-    }*/

-}

-

-LLDrawPool *LLDrawPoolWater::instancePool()

-{

-	LL_ERRS() << "Should never be calling instancePool on a water pool!" << LL_ENDL;

-	return NULL;

-}

-

-

-void LLDrawPoolWater::prerender()

-{

-	mVertexShaderLevel = (gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps) ? LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_WATER) : 0;

-}

-

-S32 LLDrawPoolWater::getNumPasses()

-{

-	if (LLViewerCamera::getInstance()->getOrigin().mV[2] < 1024.f)

-	{

-		return 1;

-	}

-

-	return 0;

-}

-

-void LLDrawPoolWater::beginPostDeferredPass(S32 pass)

-{

-	beginRenderPass(pass);

-	deferred_render = TRUE;

-}

-

-void LLDrawPoolWater::endPostDeferredPass(S32 pass)

-{

-	endRenderPass(pass);

-	deferred_render = FALSE;

-}

-

-//===============================

-//DEFERRED IMPLEMENTATION

-//===============================

-void LLDrawPoolWater::renderDeferred(S32 pass)

-{

-	LL_RECORD_BLOCK_TIME(FTM_RENDER_WATER);

-	deferred_render = TRUE;

-	shade();

-	deferred_render = FALSE;

-}

-

-//=========================================

-

-void LLDrawPoolWater::render(S32 pass)

-{

-	LL_RECORD_BLOCK_TIME(FTM_RENDER_WATER);

-	if (mDrawFace.empty() || LLDrawable::getCurrentFrame() <= 1)

-	{

-		return;

-	}

-

-	//do a quick 'n dirty depth sort

-	for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();

-			 iter != mDrawFace.end(); iter++)

-	{

-		LLFace* facep = *iter;

-		facep->mDistance = -facep->mCenterLocal.mV[2];

-	}

-

-	std::sort(mDrawFace.begin(), mDrawFace.end(), LLFace::CompareDistanceGreater());

-

-	// See if we are rendering water as opaque or not

-	if (!gSavedSettings.getBOOL("RenderTransparentWater"))

-	{

-		// render water for low end hardware

-		renderOpaqueLegacyWater();

-		return;

-	}

-

-	LLGLEnable blend(GL_BLEND);

-

-	if ((mVertexShaderLevel > 0) && !sSkipScreenCopy)

-	{

-		shade();

-		return;

-	}

-

-	LLVOSky *voskyp = gSky.mVOSkyp;

-

-	stop_glerror();

-

-	if (!gGLManager.mHasMultitexture)

-	{

-		// Ack!  No multitexture!  Bail!

-		return;

-	}

-

-	LLFace* refl_face = voskyp->getReflFace();

-

-	gPipeline.disableLights();

-	

-	LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);

-

-	LLGLDisable cullFace(GL_CULL_FACE);

-	

-	// Set up second pass first

-	gGL.getTexUnit(1)->activate();

-	gGL.getTexUnit(1)->enable(LLTexUnit::TT_TEXTURE);

-	gGL.getTexUnit(1)->bind(mWaterImagep[0]) ;

-

-    gGL.getTexUnit(2)->activate();

-	gGL.getTexUnit(2)->enable(LLTexUnit::TT_TEXTURE);

-	gGL.getTexUnit(2)->bind(mWaterImagep[1]) ;

-

-	LLVector3 camera_up = LLViewerCamera::getInstance()->getUpAxis();

-	F32 up_dot = camera_up * LLVector3::z_axis;

-

-	LLColor4 water_color;

-	if (LLViewerCamera::getInstance()->cameraUnderWater())

-	{

-		water_color.setVec(1.f, 1.f, 1.f, 0.4f);

-	}

-	else

-	{

-		water_color.setVec(1.f, 1.f, 1.f, 0.5f*(1.f + up_dot));

-	}

-

-	gGL.diffuseColor4fv(water_color.mV);

-

-	// Automatically generate texture coords for detail map

-	glEnable(GL_TEXTURE_GEN_S); //texture unit 1

-	glEnable(GL_TEXTURE_GEN_T); //texture unit 1

-	glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);

-	glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);

-

-	// Slowly move over time.

-	F32 offset = fmod(gFrameTimeSeconds*2.f, 100.f);

-	F32 tp0[4] = {16.f/256.f, 0.0f, 0.0f, offset*0.01f};

-	F32 tp1[4] = {0.0f, 16.f/256.f, 0.0f, offset*0.01f};

-	glTexGenfv(GL_S, GL_OBJECT_PLANE, tp0);

-	glTexGenfv(GL_T, GL_OBJECT_PLANE, tp1);

-

-	gGL.getTexUnit(1)->setTextureColorBlend(LLTexUnit::TBO_MULT, LLTexUnit::TBS_TEX_COLOR, LLTexUnit::TBS_PREV_COLOR);

-	gGL.getTexUnit(1)->setTextureAlphaBlend(LLTexUnit::TBO_REPLACE, LLTexUnit::TBS_PREV_ALPHA);

-

-	gGL.getTexUnit(0)->activate();

-	

-	glClearStencil(1);

-	glClear(GL_STENCIL_BUFFER_BIT);

-	LLGLEnable gls_stencil(GL_STENCIL_TEST);

-	glStencilOp(GL_KEEP, GL_REPLACE, GL_KEEP);

-	glStencilFunc(GL_ALWAYS, 0, 0xFFFFFFFF);

-

-	for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();

-		 iter != mDrawFace.end(); iter++)

-	{

-		LLFace *face = *iter;

-		if (voskyp->isReflFace(face))

-		{

-			continue;

-		}

-		gGL.getTexUnit(0)->bind(face->getTexture());

-		face->renderIndexed();

-	}

-

-	// Now, disable texture coord generation on texture state 1

-	gGL.getTexUnit(1)->activate();

-	gGL.getTexUnit(1)->unbind(LLTexUnit::TT_TEXTURE);

-	gGL.getTexUnit(1)->disable();

-

-    glDisable(GL_TEXTURE_GEN_S); //texture unit 1

-	glDisable(GL_TEXTURE_GEN_T); //texture unit 1

-

-    gGL.getTexUnit(1)->activate();

-	gGL.getTexUnit(1)->unbind(LLTexUnit::TT_TEXTURE);

-	gGL.getTexUnit(1)->disable();

-

-	glDisable(GL_TEXTURE_GEN_S); //texture unit 1

-	glDisable(GL_TEXTURE_GEN_T); //texture unit 1

-

-	// Disable texture coordinate and color arrays

-	gGL.getTexUnit(0)->activate();

-	gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);

-

-	stop_glerror();

-	

-	if (gSky.mVOSkyp->getCubeMap())

-	{

-		gSky.mVOSkyp->getCubeMap()->enable(0);

-		gSky.mVOSkyp->getCubeMap()->bind();

-

-		gGL.matrixMode(LLRender::MM_TEXTURE);

-		gGL.loadIdentity();

-		LLMatrix4 camera_mat = LLViewerCamera::getInstance()->getModelview();

-		LLMatrix4 camera_rot(camera_mat.getMat3());

-		camera_rot.invert();

-

-		gGL.loadMatrix((F32 *)camera_rot.mMatrix);

-

-		gGL.matrixMode(LLRender::MM_MODELVIEW);

-		LLOverrideFaceColor overrid(this, 1.f, 1.f, 1.f,  0.5f*up_dot);

-

-		gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT);

-

-		for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();

-			 iter != mDrawFace.end(); iter++)

-		{

-			LLFace *face = *iter;

-			if (voskyp->isReflFace(face))

-			{

-				//refl_face = face;

-				continue;

-			}

-

-			if (face->getGeomCount() > 0)

-			{					

-				face->renderIndexed();

-			}

-		}

-

-		gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT);

-

-		gSky.mVOSkyp->getCubeMap()->disable();

-		

-		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);

-		gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);

-		gGL.matrixMode(LLRender::MM_TEXTURE);

-		gGL.loadIdentity();

-		gGL.matrixMode(LLRender::MM_MODELVIEW);

-		

-	}

-

-	glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);

-

-    if (refl_face)

-	{

-		glStencilFunc(GL_NOTEQUAL, 0, 0xFFFFFFFF);

-		renderReflection(refl_face);

-	}

-

-	gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT);

-}

-

-// for low end hardware

-void LLDrawPoolWater::renderOpaqueLegacyWater()

-{

-	LLVOSky *voskyp = gSky.mVOSkyp;

-

-	LLGLSLShader* shader = NULL;

-	if (LLGLSLShader::sNoFixedFunction)

-	{

-		if (LLPipeline::sUnderWaterRender)

-		{

-			shader = &gObjectSimpleNonIndexedTexGenWaterProgram;

-		}

-		else

-		{

-			shader = &gObjectSimpleNonIndexedTexGenProgram;

-		}

-

-		shader->bind();

-	}

-

-	stop_glerror();

-

-	// Depth sorting and write to depth buffer

-	// since this is opaque, we should see nothing

-	// behind the water.  No blending because

-	// of no transparency.  And no face culling so

-	// that the underside of the water is also opaque.

-	LLGLDepthTest gls_depth(GL_TRUE, GL_TRUE);

-	LLGLDisable no_cull(GL_CULL_FACE);

-	LLGLDisable no_blend(GL_BLEND);

-

-	gPipeline.disableLights();

-

-	// Activate the texture binding and bind one

-	// texture since all images will have the same texture

-	gGL.getTexUnit(0)->activate();

-	gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);

-	gGL.getTexUnit(0)->bind(mOpaqueWaterImagep);

-

-	// Automatically generate texture coords for water texture

-	if (!shader)

-	{

-		glEnable(GL_TEXTURE_GEN_S); //texture unit 0

-		glEnable(GL_TEXTURE_GEN_T); //texture unit 0

-		glTexGenf(GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);

-		glTexGenf(GL_T, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);

-	}

-

-	// Use the fact that we know all water faces are the same size

-	// to save some computation

-

-	// Slowly move texture coordinates over time so the watter appears

-	// to be moving.

-	F32 movement_period_secs = 50.f;

-

-	F32 offset = fmod(gFrameTimeSeconds, movement_period_secs);

-

-	if (movement_period_secs != 0)

-	{

-	 	offset /= movement_period_secs;

-	}

-	else

-	{

-		offset = 0;

-	}

-

-	F32 tp0[4] = { 16.f / 256.f, 0.0f, 0.0f, offset };

-	F32 tp1[4] = { 0.0f, 16.f / 256.f, 0.0f, offset };

-

-	if (!shader)

-	{

-		glTexGenfv(GL_S, GL_OBJECT_PLANE, tp0);

-		glTexGenfv(GL_T, GL_OBJECT_PLANE, tp1);

-	}

-	else

-	{

-		shader->uniform4fv(LLShaderMgr::OBJECT_PLANE_S, 1, tp0);

-		shader->uniform4fv(LLShaderMgr::OBJECT_PLANE_T, 1, tp1);

-	}

-

-	gGL.diffuseColor3f(1.f, 1.f, 1.f);

-

-	for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();

-		 iter != mDrawFace.end(); iter++)

-	{

-		LLFace *face = *iter;

-		if (voskyp->isReflFace(face))

-		{

-			continue;

-		}

-

-		face->renderIndexed();

-	}

-

-	stop_glerror();

-

-	if (!shader)

-	{

-		// Reset the settings back to expected values

-		glDisable(GL_TEXTURE_GEN_S); //texture unit 0

-		glDisable(GL_TEXTURE_GEN_T); //texture unit 0

-	}

-

-	gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);

-	gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT);

-}

-

-

-void LLDrawPoolWater::renderReflection(LLFace* face)

-{

-	LLVOSky *voskyp = gSky.mVOSkyp;

-

-	if (!voskyp)

-	{

-		return;

-	}

-

-	if (!face->getGeomCount())

-	{

-		return;

-	}

-	

-	S8 dr = voskyp->getDrawRefl();

-	if (dr < 0)

-	{

-		return;

-	}

-

-	LLGLSNoFog noFog;

-

-	gGL.getTexUnit(0)->bind((dr == 0) ? voskyp->getSunTex() : voskyp->getMoonTex());

-

-	LLOverrideFaceColor override(this, LLColor4(face->getFaceColor().mV));

-	face->renderIndexed();

-}

-

-void LLDrawPoolWater::shade()

-{

-	if (!deferred_render)

-	{

-		gGL.setColorMask(true, true);

-	}

-

-	LLVOSky *voskyp = gSky.mVOSkyp;

-

-	if(voskyp == NULL) 

-	{

-		return;

-	}

-

-	LLGLDisable blend(GL_BLEND);

-

-	LLColor3 light_diffuse(0,0,0);

-	F32 light_exp = 0.0f;

-	LLVector3 light_dir;

-	LLColor3 light_color;

-

-    LLEnvironment& environment = LLEnvironment::instance();

-    LLSettingsWater::ptr_t pwater = environment.getCurrentWater();

-    LLSettingsSky::ptr_t   psky   = environment.getCurrentSky();

-

-    light_dir = environment.getLightDirection();

-    light_dir.normalize();

-

-    bool sun_up  = environment.getIsSunUp();

-    bool moon_up = environment.getIsMoonUp();

-

-    if (sun_up)

-    {

-        light_color   =  light_color + psky->getSunAmbient();

-        light_diffuse += psky->getSunDiffuse();         

-    }

-

-    light_exp = light_dir * LLVector3(light_dir.mV[0], light_dir.mV[1], 0.f);

-

-    if (moon_up)

-    {

-        LLColor3 moon_diffuse_color = psky->getMoonDiffuse();

-        light_color   += moon_diffuse_color;

-        light_diffuse += moon_diffuse_color * 0.5f; 

-

-        if (!sun_up)

-        {

-            light_exp = light_dir * LLVector3(light_dir.mV[0], light_dir.mV[1], 0.f);

-        }

-    }

-

-    light_diffuse.normalize();

-    light_diffuse *= (light_exp + 0.25f);

-

-	light_exp *= light_exp;

-	light_exp *= light_exp;

-	light_exp *= light_exp;

-	light_exp *= light_exp;

-	light_exp *= 256.f;

-	light_exp = light_exp > 32.f ? light_exp : 32.f;

-

-    light_diffuse *= 6.f;

-

-	LLGLSLShader* shader;

-

-	F32 eyedepth = LLViewerCamera::getInstance()->getOrigin().mV[2] - LLEnvironment::instance().getWaterHeight();

-	

-	if (eyedepth < 0.f && LLPipeline::sWaterReflections)

-	{

-	    if (deferred_render)

-	    {

-            shader = &gDeferredUnderWaterProgram;

-	    }

-		else

-        {

-	        shader = &gUnderWaterProgram;

-        }

-	}

-	else if (deferred_render)

-	{

-		shader = &gDeferredWaterProgram;

-	}

-	else

-	{

-		shader = &gWaterProgram;

-	}

-

-    shader->bind();

-

-	if (deferred_render)

-	{

-        if (shader->getUniformLocation(LLShaderMgr::DEFERRED_NORM_MATRIX) >= 0)

-	    {

-		    glh::matrix4f norm_mat = get_current_modelview().inverse().transpose();

-		    shader->uniformMatrix4fv(LLShaderMgr::DEFERRED_NORM_MATRIX, 1, FALSE, norm_mat.m);

-	    }

-	}

-

-	sTime = (F32)LLFrameTimer::getElapsedSeconds() * 0.5f;

-	

-	S32 reftex = shader->enableTexture(LLShaderMgr::WATER_REFTEX);

-		

-	if (reftex > -1)

-	{

-		gGL.getTexUnit(reftex)->activate();

-		gGL.getTexUnit(reftex)->bind(&gPipeline.mWaterRef);

-		gGL.getTexUnit(0)->activate();

-	}	

-

-	//bind normal map

-	S32 bumpTex = shader->enableTexture(LLViewerShaderMgr::BUMP_MAP);

-

-    if (mWaterNormp[0])

-    {

-	    gGL.getTexUnit(bumpTex)->bind(mWaterNormp[0]) ;

-

-	    if (gSavedSettings.getBOOL("RenderWaterMipNormal"))

-	    {

-		    mWaterNormp[0]->setFilteringOption(LLTexUnit::TFO_ANISOTROPIC);

-	    }

-	    else 

-	    {

-		    mWaterNormp[0]->setFilteringOption(LLTexUnit::TFO_POINT);

-	    }

-	}

-

-    if (mWaterNormp[1])

-    {

-        bumpTex = shader->enableTexture(LLViewerShaderMgr::BUMP_MAP2);

-

-        gGL.getTexUnit(bumpTex)->bind(mWaterNormp[1]) ;

-

-	    if (gSavedSettings.getBOOL("RenderWaterMipNormal"))

-	    {

-            mWaterNormp[1]->setFilteringOption(LLTexUnit::TFO_ANISOTROPIC);

-	    }

-	    else 

-	    {

-            mWaterNormp[1]->setFilteringOption(LLTexUnit::TFO_POINT);

-	    }

-	}

-

-    shader->uniform3fv(LLShaderMgr::WATER_FOGCOLOR, 1, pwater->getWaterFogColor().mV);

-    shader->uniform1f(LLShaderMgr::WATER_FOGDENSITY, pwater->getWaterFogDensity());

-	

-    // bind reflection texture from RenderTarget

-	S32 screentex = shader->enableTexture(LLShaderMgr::WATER_SCREENTEX);

-	gGL.getTexUnit(screentex)->bind(&gPipeline.mWaterDis);	

-

-	if (mVertexShaderLevel == 1)

-	{

-        LLColor4 fog_color(pwater->getWaterFogColor(), 0.f);

-        fog_color[3] = pwater->getWaterFogDensity();

-        shader->uniform4fv(LLShaderMgr::WATER_FOGCOLOR, 1, fog_color.mV);

-	}

-

-	F32 screenRes[] = 

-	{

-		1.f/gGLViewport[2],

-		1.f/gGLViewport[3]

-	};

-	shader->uniform2fv(LLShaderMgr::DEFERRED_SCREEN_RES, 1, screenRes);

-	stop_glerror();

-	

-	S32 diffTex = shader->enableTexture(LLShaderMgr::DIFFUSE_MAP);

-	stop_glerror();

-	

-	//shader->uniformMatrix4fv("inverse_ref", 1, GL_FALSE, (GLfloat*) gGLObliqueProjectionInverse.mMatrix);

-	shader->uniform1f(LLShaderMgr::WATER_WATERHEIGHT, eyedepth);

-	shader->uniform1f(LLShaderMgr::WATER_TIME, sTime);

-	shader->uniform3fv(LLShaderMgr::WATER_EYEVEC, 1, LLViewerCamera::getInstance()->getOrigin().mV);

-	shader->uniform3fv(LLShaderMgr::WATER_SPECULAR, 1, light_diffuse.mV);

-	shader->uniform1f(LLShaderMgr::WATER_SPECULAR_EXP, light_exp);

-    if (LLEnvironment::instance().isCloudScrollPaused())

-    {

-        static const std::array<F32, 2> zerowave{ {0.0f, 0.0f} };

-        

-        shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR1, 1, zerowave.data());

-        shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR2, 1, zerowave.data());

-    }

-    else

-    {

-        shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR1, 1, pwater->getWave1Dir().mV);

-        shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR2, 1, pwater->getWave2Dir().mV);

-    }

-	shader->uniform3fv(LLShaderMgr::WATER_LIGHT_DIR, 1, light_dir.mV);

-

-	shader->uniform3fv(LLShaderMgr::WATER_NORM_SCALE, 1, pwater->getNormalScale().mV);

-	shader->uniform1f(LLShaderMgr::WATER_FRESNEL_SCALE, pwater->getFresnelScale());

-	shader->uniform1f(LLShaderMgr::WATER_FRESNEL_OFFSET, pwater->getFresnelOffset());

-    shader->uniform1f(LLShaderMgr::WATER_BLUR_MULTIPLIER, pwater->getBlurMultiplier());

-

-	F32 sunAngle = llmax(0.f, light_dir.mV[2]);

-	F32 scaledAngle = 1.f - sunAngle;

-

-	shader->uniform1f(LLShaderMgr::WATER_SUN_ANGLE, sunAngle);

-	shader->uniform1f(LLShaderMgr::WATER_SCALED_ANGLE, scaledAngle);

-	shader->uniform1f(LLShaderMgr::WATER_SUN_ANGLE2, 0.1f + 0.2f*sunAngle);

-

-	LLColor4 water_color;

-	LLVector3 camera_up = LLViewerCamera::getInstance()->getUpAxis();

-	F32 up_dot = camera_up * LLVector3::z_axis;

-	if (LLViewerCamera::getInstance()->cameraUnderWater())

-	{

-		water_color.setVec(1.f, 1.f, 1.f, 0.4f);

-		shader->uniform1f(LLShaderMgr::WATER_REFSCALE, pwater->getScaleBelow());

-	}

-	else

-	{

-		water_color.setVec(1.f, 1.f, 1.f, 0.5f*(1.f + up_dot));

-		shader->uniform1f(LLShaderMgr::WATER_REFSCALE, pwater->getScaleAbove());

-	}

-

-	if (water_color.mV[3] > 0.9f)

-	{

-		water_color.mV[3] = 0.9f;

-	}

-

-	{

-		LLGLEnable depth_clamp(gGLManager.mHasDepthClamp ? GL_DEPTH_CLAMP : 0);

-		LLGLDisable cullface(GL_CULL_FACE);

-		for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();

-			iter != mDrawFace.end(); iter++)

-		{

-			LLFace *face = *iter;

-

-			if (voskyp->isReflFace(face))

-			{

-				continue;

-			}

-

-			LLVOWater* water = (LLVOWater*) face->getViewerObject();

-			gGL.getTexUnit(diffTex)->bind(face->getTexture());

-

-			sNeedsReflectionUpdate = TRUE;

-			

-			if (water->getUseTexture() || !water->getIsEdgePatch())

-			{

-				sNeedsDistortionUpdate = TRUE;

-				face->renderIndexed();

-			}

-            // using squash clip for deferred rendering makes the horizon lines match

-            // between ALM and non-ALM rendering (SL-1655), but introduces an ugly seem between

-            // near and far water(SL-9696)...we're going to live with the former and not cause the latter 

+/** 
+ * @file lldrawpoolwater.cpp
+ * @brief LLDrawPoolWater class implementation
+ *
+ * $LicenseInfo:firstyear=2002&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+#include "llfeaturemanager.h"
+#include "lldrawpoolwater.h"
+
+#include "llviewercontrol.h"
+#include "lldir.h"
+#include "llerror.h"
+#include "m3math.h"
+#include "llrender.h"
+
+#include "llagent.h"		// for gAgent for getRegion for getWaterHeight
+#include "llcubemap.h"
+#include "lldrawable.h"
+#include "llface.h"
+#include "llsky.h"
+#include "llviewertexturelist.h"
+#include "llviewerregion.h"
+#include "llvosky.h"
+#include "llvowater.h"
+#include "llworld.h"
+#include "pipeline.h"
+#include "llviewershadermgr.h"
+#include "llenvironment.h"
+#include "llsettingssky.h"
+#include "llsettingswater.h"
+
+static float sTime;
+
+BOOL deferred_render = FALSE;
+
+BOOL LLDrawPoolWater::sSkipScreenCopy = FALSE;
+BOOL LLDrawPoolWater::sNeedsReflectionUpdate = TRUE;
+BOOL LLDrawPoolWater::sNeedsDistortionUpdate = TRUE;
+F32 LLDrawPoolWater::sWaterFogEnd = 0.f;
+
+LLDrawPoolWater::LLDrawPoolWater() : LLFacePool(POOL_WATER)
+{
+}
+
+LLDrawPoolWater::~LLDrawPoolWater()
+{
+}
+
+void LLDrawPoolWater::setTransparentTextures(const LLUUID& transparentTextureId, const LLUUID& nextTransparentTextureId)
+{
+    LLSettingsWater::ptr_t pwater = LLEnvironment::instance().getCurrentWater();
+    mWaterImagep[0] = LLViewerTextureManager::getFetchedTexture(!transparentTextureId.isNull() ? transparentTextureId : pwater->GetDefaultTransparentTextureAssetId());
+    mWaterImagep[1] = LLViewerTextureManager::getFetchedTexture(!nextTransparentTextureId.isNull() ? nextTransparentTextureId : (!transparentTextureId.isNull() ? transparentTextureId : pwater->GetDefaultTransparentTextureAssetId()));
+    mWaterImagep[0]->addTextureStats(1024.f*1024.f);
+    mWaterImagep[1]->addTextureStats(1024.f*1024.f);
+}
+
+void LLDrawPoolWater::setOpaqueTexture(const LLUUID& opaqueTextureId)
+{
+    LLSettingsWater::ptr_t pwater = LLEnvironment::instance().getCurrentWater();
+    mOpaqueWaterImagep = LLViewerTextureManager::getFetchedTexture(opaqueTextureId);
+    mOpaqueWaterImagep->addTextureStats(1024.f*1024.f);
+}
+
+void LLDrawPoolWater::setNormalMaps(const LLUUID& normalMapId, const LLUUID& nextNormalMapId)
+{
+    LLSettingsWater::ptr_t pwater = LLEnvironment::instance().getCurrentWater();
+    mWaterNormp[0] = LLViewerTextureManager::getFetchedTexture(!normalMapId.isNull() ? normalMapId : pwater->GetDefaultWaterNormalAssetId());
+    mWaterNormp[1] = LLViewerTextureManager::getFetchedTexture(!nextNormalMapId.isNull() ? nextNormalMapId : (!normalMapId.isNull() ? normalMapId : pwater->GetDefaultWaterNormalAssetId()));
+    mWaterNormp[0]->addTextureStats(1024.f*1024.f);
+    mWaterNormp[1]->addTextureStats(1024.f*1024.f);
+}
+
+//static
+void LLDrawPoolWater::restoreGL()
+{
+	/*LLSettingsWater::ptr_t pwater = LLEnvironment::instance().getCurrentWater();
+    if (pwater)
+    {
+        setTransparentTextures(pwater->getTransparentTextureID(), pwater->getNextTransparentTextureID());
+        setOpaqueTexture(pwater->GetDefaultOpaqueTextureAssetId());
+        setNormalMaps(pwater->getNormalMapID(), pwater->getNextNormalMapID());
+    }*/
+}
+
+LLDrawPool *LLDrawPoolWater::instancePool()
+{
+	LL_ERRS() << "Should never be calling instancePool on a water pool!" << LL_ENDL;
+	return NULL;
+}
+
+
+void LLDrawPoolWater::prerender()
+{
+	mVertexShaderLevel = (gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps) ? LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_WATER) : 0;
+}
+
+S32 LLDrawPoolWater::getNumPasses()
+{
+	if (LLViewerCamera::getInstance()->getOrigin().mV[2] < 1024.f)
+	{
+		return 1;
+	}
+
+	return 0;
+}
+
+void LLDrawPoolWater::beginPostDeferredPass(S32 pass)
+{
+	beginRenderPass(pass);
+	deferred_render = TRUE;
+}
+
+void LLDrawPoolWater::endPostDeferredPass(S32 pass)
+{
+	endRenderPass(pass);
+	deferred_render = FALSE;
+}
+
+//===============================
+//DEFERRED IMPLEMENTATION
+//===============================
+void LLDrawPoolWater::renderDeferred(S32 pass)
+{
+	LL_RECORD_BLOCK_TIME(FTM_RENDER_WATER);
+	deferred_render = TRUE;
+	shade();
+	deferred_render = FALSE;
+}
+
+//=========================================
+
+void LLDrawPoolWater::render(S32 pass)
+{
+	LL_RECORD_BLOCK_TIME(FTM_RENDER_WATER);
+	if (mDrawFace.empty() || LLDrawable::getCurrentFrame() <= 1)
+	{
+		return;
+	}
+
+	//do a quick 'n dirty depth sort
+	for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
+			 iter != mDrawFace.end(); iter++)
+	{
+		LLFace* facep = *iter;
+		facep->mDistance = -facep->mCenterLocal.mV[2];
+	}
+
+	std::sort(mDrawFace.begin(), mDrawFace.end(), LLFace::CompareDistanceGreater());
+
+	// See if we are rendering water as opaque or not
+	if (!gSavedSettings.getBOOL("RenderTransparentWater"))
+	{
+		// render water for low end hardware
+		renderOpaqueLegacyWater();
+		return;
+	}
+
+	LLGLEnable blend(GL_BLEND);
+
+	if ((mVertexShaderLevel > 0) && !sSkipScreenCopy)
+	{
+		shade();
+		return;
+	}
+
+	LLVOSky *voskyp = gSky.mVOSkyp;
+
+	stop_glerror();
+
+	if (!gGLManager.mHasMultitexture)
+	{
+		// Ack!  No multitexture!  Bail!
+		return;
+	}
+
+	LLFace* refl_face = voskyp->getReflFace();
+
+	gPipeline.disableLights();
+	
+	LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
+
+	LLGLDisable cullFace(GL_CULL_FACE);
+	
+	// Set up second pass first
+	gGL.getTexUnit(1)->activate();
+	gGL.getTexUnit(1)->enable(LLTexUnit::TT_TEXTURE);
+	gGL.getTexUnit(1)->bind(mWaterImagep[0]) ;
+
+    gGL.getTexUnit(2)->activate();
+	gGL.getTexUnit(2)->enable(LLTexUnit::TT_TEXTURE);
+	gGL.getTexUnit(2)->bind(mWaterImagep[1]) ;
+
+	LLVector3 camera_up = LLViewerCamera::getInstance()->getUpAxis();
+	F32 up_dot = camera_up * LLVector3::z_axis;
+
+	LLColor4 water_color;
+	if (LLViewerCamera::getInstance()->cameraUnderWater())
+	{
+		water_color.setVec(1.f, 1.f, 1.f, 0.4f);
+	}
+	else
+	{
+		water_color.setVec(1.f, 1.f, 1.f, 0.5f*(1.f + up_dot));
+	}
+
+	gGL.diffuseColor4fv(water_color.mV);
+
+	// Automatically generate texture coords for detail map
+	glEnable(GL_TEXTURE_GEN_S); //texture unit 1
+	glEnable(GL_TEXTURE_GEN_T); //texture unit 1
+	glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
+	glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
+
+	// Slowly move over time.
+	F32 offset = fmod(gFrameTimeSeconds*2.f, 100.f);
+	F32 tp0[4] = {16.f/256.f, 0.0f, 0.0f, offset*0.01f};
+	F32 tp1[4] = {0.0f, 16.f/256.f, 0.0f, offset*0.01f};
+	glTexGenfv(GL_S, GL_OBJECT_PLANE, tp0);
+	glTexGenfv(GL_T, GL_OBJECT_PLANE, tp1);
+
+	gGL.getTexUnit(1)->setTextureColorBlend(LLTexUnit::TBO_MULT, LLTexUnit::TBS_TEX_COLOR, LLTexUnit::TBS_PREV_COLOR);
+	gGL.getTexUnit(1)->setTextureAlphaBlend(LLTexUnit::TBO_REPLACE, LLTexUnit::TBS_PREV_ALPHA);
+
+	gGL.getTexUnit(0)->activate();
+	
+	glClearStencil(1);
+	glClear(GL_STENCIL_BUFFER_BIT);
+	LLGLEnable gls_stencil(GL_STENCIL_TEST);
+	glStencilOp(GL_KEEP, GL_REPLACE, GL_KEEP);
+	glStencilFunc(GL_ALWAYS, 0, 0xFFFFFFFF);
+
+	for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
+		 iter != mDrawFace.end(); iter++)
+	{
+		LLFace *face = *iter;
+		if (voskyp->isReflFace(face))
+		{
+			continue;
+		}
+		gGL.getTexUnit(0)->bind(face->getTexture());
+		face->renderIndexed();
+	}
+
+	// Now, disable texture coord generation on texture state 1
+	gGL.getTexUnit(1)->activate();
+	gGL.getTexUnit(1)->unbind(LLTexUnit::TT_TEXTURE);
+	gGL.getTexUnit(1)->disable();
+
+    glDisable(GL_TEXTURE_GEN_S); //texture unit 1
+	glDisable(GL_TEXTURE_GEN_T); //texture unit 1
+
+    gGL.getTexUnit(1)->activate();
+	gGL.getTexUnit(1)->unbind(LLTexUnit::TT_TEXTURE);
+	gGL.getTexUnit(1)->disable();
+
+	glDisable(GL_TEXTURE_GEN_S); //texture unit 1
+	glDisable(GL_TEXTURE_GEN_T); //texture unit 1
+
+	// Disable texture coordinate and color arrays
+	gGL.getTexUnit(0)->activate();
+	gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+
+	stop_glerror();
+	
+	if (gSky.mVOSkyp->getCubeMap())
+	{
+		gSky.mVOSkyp->getCubeMap()->enable(0);
+		gSky.mVOSkyp->getCubeMap()->bind();
+
+		gGL.matrixMode(LLRender::MM_TEXTURE);
+		gGL.loadIdentity();
+		LLMatrix4 camera_mat = LLViewerCamera::getInstance()->getModelview();
+		LLMatrix4 camera_rot(camera_mat.getMat3());
+		camera_rot.invert();
+
+		gGL.loadMatrix((F32 *)camera_rot.mMatrix);
+
+		gGL.matrixMode(LLRender::MM_MODELVIEW);
+		LLOverrideFaceColor overrid(this, 1.f, 1.f, 1.f,  0.5f*up_dot);
+
+		gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT);
+
+		for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
+			 iter != mDrawFace.end(); iter++)
+		{
+			LLFace *face = *iter;
+			if (voskyp->isReflFace(face))
+			{
+				//refl_face = face;
+				continue;
+			}
+
+			if (face->getGeomCount() > 0)
+			{					
+				face->renderIndexed();
+			}
+		}
+
+		gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT);
+
+		gSky.mVOSkyp->getCubeMap()->disable();
+		
+		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+		gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
+		gGL.matrixMode(LLRender::MM_TEXTURE);
+		gGL.loadIdentity();
+		gGL.matrixMode(LLRender::MM_MODELVIEW);
+		
+	}
+
+	glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
+
+    if (refl_face)
+	{
+		glStencilFunc(GL_NOTEQUAL, 0, 0xFFFFFFFF);
+		renderReflection(refl_face);
+	}
+
+	gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT);
+}
+
+// for low end hardware
+void LLDrawPoolWater::renderOpaqueLegacyWater()
+{
+	LLVOSky *voskyp = gSky.mVOSkyp;
+
+	LLGLSLShader* shader = NULL;
+	if (LLGLSLShader::sNoFixedFunction)
+	{
+		if (LLPipeline::sUnderWaterRender)
+		{
+			shader = &gObjectSimpleNonIndexedTexGenWaterProgram;
+		}
+		else
+		{
+			shader = &gObjectSimpleNonIndexedTexGenProgram;
+		}
+
+		shader->bind();
+	}
+
+	stop_glerror();
+
+	// Depth sorting and write to depth buffer
+	// since this is opaque, we should see nothing
+	// behind the water.  No blending because
+	// of no transparency.  And no face culling so
+	// that the underside of the water is also opaque.
+	LLGLDepthTest gls_depth(GL_TRUE, GL_TRUE);
+	LLGLDisable no_cull(GL_CULL_FACE);
+	LLGLDisable no_blend(GL_BLEND);
+
+	gPipeline.disableLights();
+
+	// Activate the texture binding and bind one
+	// texture since all images will have the same texture
+	gGL.getTexUnit(0)->activate();
+	gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
+	gGL.getTexUnit(0)->bind(mOpaqueWaterImagep);
+
+	// Automatically generate texture coords for water texture
+	if (!shader)
+	{
+		glEnable(GL_TEXTURE_GEN_S); //texture unit 0
+		glEnable(GL_TEXTURE_GEN_T); //texture unit 0
+		glTexGenf(GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
+		glTexGenf(GL_T, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
+	}
+
+	// Use the fact that we know all water faces are the same size
+	// to save some computation
+
+	// Slowly move texture coordinates over time so the watter appears
+	// to be moving.
+	F32 movement_period_secs = 50.f;
+
+	F32 offset = fmod(gFrameTimeSeconds, movement_period_secs);
+
+	if (movement_period_secs != 0)
+	{
+	 	offset /= movement_period_secs;
+	}
+	else
+	{
+		offset = 0;
+	}
+
+	F32 tp0[4] = { 16.f / 256.f, 0.0f, 0.0f, offset };
+	F32 tp1[4] = { 0.0f, 16.f / 256.f, 0.0f, offset };
+
+	if (!shader)
+	{
+		glTexGenfv(GL_S, GL_OBJECT_PLANE, tp0);
+		glTexGenfv(GL_T, GL_OBJECT_PLANE, tp1);
+	}
+	else
+	{
+		shader->uniform4fv(LLShaderMgr::OBJECT_PLANE_S, 1, tp0);
+		shader->uniform4fv(LLShaderMgr::OBJECT_PLANE_T, 1, tp1);
+	}
+
+	gGL.diffuseColor3f(1.f, 1.f, 1.f);
+
+	for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
+		 iter != mDrawFace.end(); iter++)
+	{
+		LLFace *face = *iter;
+		if (voskyp->isReflFace(face))
+		{
+			continue;
+		}
+
+		face->renderIndexed();
+	}
+
+	stop_glerror();
+
+	if (!shader)
+	{
+		// Reset the settings back to expected values
+		glDisable(GL_TEXTURE_GEN_S); //texture unit 0
+		glDisable(GL_TEXTURE_GEN_T); //texture unit 0
+	}
+
+	gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+	gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT);
+}
+
+
+void LLDrawPoolWater::renderReflection(LLFace* face)
+{
+	LLVOSky *voskyp = gSky.mVOSkyp;
+
+	if (!voskyp)
+	{
+		return;
+	}
+
+	if (!face->getGeomCount())
+	{
+		return;
+	}
+	
+	S8 dr = voskyp->getDrawRefl();
+	if (dr < 0)
+	{
+		return;
+	}
+
+	LLGLSNoFog noFog;
+
+	gGL.getTexUnit(0)->bind((dr == 0) ? voskyp->getSunTex() : voskyp->getMoonTex());
+
+	LLOverrideFaceColor override(this, LLColor4(face->getFaceColor().mV));
+	face->renderIndexed();
+}
+
+void LLDrawPoolWater::shade()
+{
+	if (!deferred_render)
+	{
+		gGL.setColorMask(true, true);
+	}
+
+	LLVOSky *voskyp = gSky.mVOSkyp;
+
+	if(voskyp == NULL) 
+	{
+		return;
+	}
+
+	LLGLDisable blend(GL_BLEND);
+
+	LLColor3 light_diffuse(0,0,0);
+	F32 light_exp = 0.0f;
+	LLVector3 light_dir;
+	LLColor3 light_color;
+
+    LLEnvironment& environment = LLEnvironment::instance();
+    LLSettingsWater::ptr_t pwater = environment.getCurrentWater();
+    LLSettingsSky::ptr_t   psky   = environment.getCurrentSky();
+
+    light_dir = environment.getLightDirection();
+    light_dir.normalize();
+
+    bool sun_up  = environment.getIsSunUp();
+    bool moon_up = environment.getIsMoonUp();
+
+    if (sun_up)
+    {
+        light_color   =  light_color + psky->getSunAmbient();
+        light_diffuse += psky->getSunDiffuse();         
+    }
+
+    light_exp = light_dir * LLVector3(light_dir.mV[0], light_dir.mV[1], 0.f);
+
+    if (moon_up)
+    {
+        LLColor3 moon_diffuse_color = psky->getMoonDiffuse();
+        light_color   += moon_diffuse_color;
+        light_diffuse += moon_diffuse_color * 0.5f; 
+
+        if (!sun_up)
+        {
+            light_exp = light_dir * LLVector3(light_dir.mV[0], light_dir.mV[1], 0.f);
+        }
+    }
+
+    light_diffuse.normalize();
+    light_diffuse *= (light_exp + 0.25f);
+
+	light_exp *= light_exp;
+	light_exp *= light_exp;
+	light_exp *= light_exp;
+	light_exp *= light_exp;
+	light_exp *= 256.f;
+	light_exp = light_exp > 32.f ? light_exp : 32.f;
+
+    light_diffuse *= 6.f;
+
+	LLGLSLShader* shader;
+
+	F32 eyedepth = LLViewerCamera::getInstance()->getOrigin().mV[2] - LLEnvironment::instance().getWaterHeight();
+	
+	if (eyedepth < 0.f && LLPipeline::sWaterReflections)
+	{
+	    if (deferred_render)
+	    {
+            shader = &gDeferredUnderWaterProgram;
+	    }
+		else
+        {
+	        shader = &gUnderWaterProgram;
+        }
+	}
+	else if (deferred_render)
+	{
+		shader = &gDeferredWaterProgram;
+	}
+	else
+	{
+		shader = &gWaterProgram;
+	}
+
+    shader->bind();
+
+	if (deferred_render)
+	{
+        if (shader->getUniformLocation(LLShaderMgr::DEFERRED_NORM_MATRIX) >= 0)
+	    {
+		    glh::matrix4f norm_mat = get_current_modelview().inverse().transpose();
+		    shader->uniformMatrix4fv(LLShaderMgr::DEFERRED_NORM_MATRIX, 1, FALSE, norm_mat.m);
+	    }
+	}
+
+	sTime = (F32)LLFrameTimer::getElapsedSeconds() * 0.5f;
+	
+	S32 reftex = shader->enableTexture(LLShaderMgr::WATER_REFTEX);
+		
+	if (reftex > -1)
+	{
+		gGL.getTexUnit(reftex)->activate();
+		gGL.getTexUnit(reftex)->bind(&gPipeline.mWaterRef);
+		gGL.getTexUnit(0)->activate();
+	}	
+
+	//bind normal map
+	S32 bumpTex = shader->enableTexture(LLViewerShaderMgr::BUMP_MAP);
+
+    if (mWaterNormp[0])
+    {
+	    gGL.getTexUnit(bumpTex)->bind(mWaterNormp[0]) ;
+
+	    if (gSavedSettings.getBOOL("RenderWaterMipNormal"))
+	    {
+		    mWaterNormp[0]->setFilteringOption(LLTexUnit::TFO_ANISOTROPIC);
+	    }
+	    else 
+	    {
+		    mWaterNormp[0]->setFilteringOption(LLTexUnit::TFO_POINT);
+	    }
+	}
+
+    if (mWaterNormp[1])
+    {
+        bumpTex = shader->enableTexture(LLViewerShaderMgr::BUMP_MAP2);
+
+        gGL.getTexUnit(bumpTex)->bind(mWaterNormp[1]) ;
+
+	    if (gSavedSettings.getBOOL("RenderWaterMipNormal"))
+	    {
+            mWaterNormp[1]->setFilteringOption(LLTexUnit::TFO_ANISOTROPIC);
+	    }
+	    else 
+	    {
+            mWaterNormp[1]->setFilteringOption(LLTexUnit::TFO_POINT);
+	    }
+	}
+
+    shader->uniform3fv(LLShaderMgr::WATER_FOGCOLOR, 1, pwater->getWaterFogColor().mV);
+    shader->uniform1f(LLShaderMgr::WATER_FOGDENSITY, pwater->getWaterFogDensity());
+	
+    // bind reflection texture from RenderTarget
+	S32 screentex = shader->enableTexture(LLShaderMgr::WATER_SCREENTEX);
+	gGL.getTexUnit(screentex)->bind(&gPipeline.mWaterDis);	
+
+	if (mVertexShaderLevel == 1)
+	{
+        LLColor4 fog_color(pwater->getWaterFogColor(), 0.f);
+        fog_color[3] = pwater->getWaterFogDensity();
+        shader->uniform4fv(LLShaderMgr::WATER_FOGCOLOR, 1, fog_color.mV);
+	}
+
+	F32 screenRes[] = 
+	{
+		1.f/gGLViewport[2],
+		1.f/gGLViewport[3]
+	};
+	shader->uniform2fv(LLShaderMgr::DEFERRED_SCREEN_RES, 1, screenRes);
+	stop_glerror();
+	
+	S32 diffTex = shader->enableTexture(LLShaderMgr::DIFFUSE_MAP);
+	stop_glerror();
+	
+	//shader->uniformMatrix4fv("inverse_ref", 1, GL_FALSE, (GLfloat*) gGLObliqueProjectionInverse.mMatrix);
+	shader->uniform1f(LLShaderMgr::WATER_WATERHEIGHT, eyedepth);
+	shader->uniform1f(LLShaderMgr::WATER_TIME, sTime);
+	shader->uniform3fv(LLShaderMgr::WATER_EYEVEC, 1, LLViewerCamera::getInstance()->getOrigin().mV);
+	shader->uniform3fv(LLShaderMgr::WATER_SPECULAR, 1, light_diffuse.mV);
+	shader->uniform1f(LLShaderMgr::WATER_SPECULAR_EXP, light_exp);
+    if (LLEnvironment::instance().isCloudScrollPaused())
+    {
+        static const std::array<F32, 2> zerowave{ {0.0f, 0.0f} };
+        
+        shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR1, 1, zerowave.data());
+        shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR2, 1, zerowave.data());
+    }
+    else
+    {
+        shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR1, 1, pwater->getWave1Dir().mV);
+        shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR2, 1, pwater->getWave2Dir().mV);
+    }
+	shader->uniform3fv(LLShaderMgr::WATER_LIGHT_DIR, 1, light_dir.mV);
+
+	shader->uniform3fv(LLShaderMgr::WATER_NORM_SCALE, 1, pwater->getNormalScale().mV);
+	shader->uniform1f(LLShaderMgr::WATER_FRESNEL_SCALE, pwater->getFresnelScale());
+	shader->uniform1f(LLShaderMgr::WATER_FRESNEL_OFFSET, pwater->getFresnelOffset());
+    shader->uniform1f(LLShaderMgr::WATER_BLUR_MULTIPLIER, pwater->getBlurMultiplier());
+
+	F32 sunAngle = llmax(0.f, light_dir.mV[2]);
+	F32 scaledAngle = 1.f - sunAngle;
+
+	shader->uniform1f(LLShaderMgr::WATER_SUN_ANGLE, sunAngle);
+	shader->uniform1f(LLShaderMgr::WATER_SCALED_ANGLE, scaledAngle);
+	shader->uniform1f(LLShaderMgr::WATER_SUN_ANGLE2, 0.1f + 0.2f*sunAngle);
+
+	LLColor4 water_color;
+	LLVector3 camera_up = LLViewerCamera::getInstance()->getUpAxis();
+	F32 up_dot = camera_up * LLVector3::z_axis;
+	if (LLViewerCamera::getInstance()->cameraUnderWater())
+	{
+		water_color.setVec(1.f, 1.f, 1.f, 0.4f);
+		shader->uniform1f(LLShaderMgr::WATER_REFSCALE, pwater->getScaleBelow());
+	}
+	else
+	{
+		water_color.setVec(1.f, 1.f, 1.f, 0.5f*(1.f + up_dot));
+		shader->uniform1f(LLShaderMgr::WATER_REFSCALE, pwater->getScaleAbove());
+	}
+
+	if (water_color.mV[3] > 0.9f)
+	{
+		water_color.mV[3] = 0.9f;
+	}
+
+	{
+		LLGLEnable depth_clamp(gGLManager.mHasDepthClamp ? GL_DEPTH_CLAMP : 0);
+		LLGLDisable cullface(GL_CULL_FACE);
+		for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
+			iter != mDrawFace.end(); iter++)
+		{
+			LLFace *face = *iter;
+
+			if (voskyp->isReflFace(face))
+			{
+				continue;
+			}
+
+			LLVOWater* water = (LLVOWater*) face->getViewerObject();
+			gGL.getTexUnit(diffTex)->bind(face->getTexture());
+
+			sNeedsReflectionUpdate = TRUE;
+			
+			if (water->getUseTexture() || !water->getIsEdgePatch())
+			{
+				sNeedsDistortionUpdate = TRUE;
+				face->renderIndexed();
+			}
+            // using squash clip for deferred rendering makes the horizon lines match
+            // between ALM and non-ALM rendering (SL-1655), but introduces an ugly seem between
+            // near and far water(SL-9696)...we're going to live with the former and not cause the latter 
             else if (gGLManager.mHasDepthClamp || deferred_render)

-            {

-				face->renderIndexed();

-			}

-			else

-			{

-				LLGLSquashToFarClip far_clip(get_current_projection());

-				face->renderIndexed();

-			}

-		}

-	}

-	

-	shader->disableTexture(LLShaderMgr::ENVIRONMENT_MAP, LLTexUnit::TT_CUBE_MAP);

-	shader->disableTexture(LLShaderMgr::WATER_SCREENTEX);	

-	shader->disableTexture(LLShaderMgr::BUMP_MAP);

-	shader->disableTexture(LLShaderMgr::DIFFUSE_MAP);

-	shader->disableTexture(LLShaderMgr::WATER_REFTEX);

-	shader->disableTexture(LLShaderMgr::WATER_SCREENDEPTH);

-

-	shader->unbind();

-

-	gGL.getTexUnit(0)->activate();

-	gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);

-	if (!deferred_render)

-	{

-		gGL.setColorMask(true, false);

-	}

-

-}

-

-LLViewerTexture *LLDrawPoolWater::getDebugTexture()

-{

-	return LLViewerFetchedTexture::sSmokeImagep;

-}

-

-LLColor3 LLDrawPoolWater::getDebugColor() const

-{

-	return LLColor3(0.f, 1.f, 1.f);

-}

+            {
+				face->renderIndexed();
+			}
+			else
+			{
+				LLGLSquashToFarClip far_clip(get_current_projection());
+				face->renderIndexed();
+			}
+		}
+	}
+	
+	shader->disableTexture(LLShaderMgr::ENVIRONMENT_MAP, LLTexUnit::TT_CUBE_MAP);
+	shader->disableTexture(LLShaderMgr::WATER_SCREENTEX);	
+	shader->disableTexture(LLShaderMgr::BUMP_MAP);
+	shader->disableTexture(LLShaderMgr::DIFFUSE_MAP);
+	shader->disableTexture(LLShaderMgr::WATER_REFTEX);
+	shader->disableTexture(LLShaderMgr::WATER_SCREENDEPTH);
+
+	shader->unbind();
+
+	gGL.getTexUnit(0)->activate();
+	gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
+	if (!deferred_render)
+	{
+		gGL.setColorMask(true, false);
+	}
+
+}
+
+LLViewerTexture *LLDrawPoolWater::getDebugTexture()
+{
+	return LLViewerFetchedTexture::sSmokeImagep;
+}
+
+LLColor3 LLDrawPoolWater::getDebugColor() const
+{
+	return LLColor3(0.f, 1.f, 1.f);
+}
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index 3d8222a371..1b38fceef7 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -976,10 +976,28 @@ void LLEnvironment::updateShaderUniforms(LLGLSLShader *shader)
 void LLEnvironment::recordEnvironment(S32 parcel_id, LLEnvironment::EnvironmentInfo::ptr_t envinfo)
 {
     if (envinfo->mParcelId == INVALID_PARCEL_ID)
-    {   // the returned info applies to an entire region.
-        LL_WARNS("LAPRAS") << "Setting Region environment" << LL_ENDL;
-        setEnvironment(ENV_REGION, envinfo->mDayCycle, envinfo->mDayLength, envinfo->mDayOffset);
-        mTrackAltitudes = envinfo->mAltitudes;
+    {
+        // the returned info applies to an entire region.
+        if (!envinfo->mDayCycle)
+        {
+            clearEnvironment(ENV_PARCEL);
+            setEnvironment(ENV_REGION, LLSettingsDay::GetDefaultAssetId(), LLSettingsDay::DEFAULT_DAYLENGTH, LLSettingsDay::DEFAULT_DAYOFFSET);
+            updateEnvironment();
+        }
+        else if (envinfo->mDayCycle->isTrackEmpty(LLSettingsDay::TRACK_WATER)
+                 || envinfo->mDayCycle->isTrackEmpty(LLSettingsDay::TRACK_GROUND_LEVEL))
+        {
+            LL_WARNS("LAPRAS") << "Invalid day cycle for region" << LL_ENDL;
+            clearEnvironment(ENV_PARCEL);
+            setEnvironment(ENV_REGION, LLSettingsDay::GetDefaultAssetId(), LLSettingsDay::DEFAULT_DAYLENGTH, LLSettingsDay::DEFAULT_DAYOFFSET);
+            updateEnvironment();
+        }
+        else
+        {
+            LL_INFOS("LAPRAS") << "Setting Region environment" << LL_ENDL;
+            setEnvironment(ENV_REGION, envinfo->mDayCycle, envinfo->mDayLength, envinfo->mDayOffset);
+            mTrackAltitudes = envinfo->mAltitudes;
+        }
 
         LL_WARNS("LAPRAS") << "Altitudes set to {" << mTrackAltitudes[0] << ", "<< mTrackAltitudes[1] << ", " << mTrackAltitudes[2] << ", " << mTrackAltitudes[3] << LL_ENDL;
     }
@@ -998,6 +1016,12 @@ void LLEnvironment::recordEnvironment(S32 parcel_id, LLEnvironment::EnvironmentI
             LL_WARNS("LAPRAS") << "Clearing environment on parcel #" << parcel_id << LL_ENDL;
             clearEnvironment(ENV_PARCEL);
         }
+        else if (envinfo->mDayCycle->isTrackEmpty(LLSettingsDay::TRACK_WATER)
+                 || envinfo->mDayCycle->isTrackEmpty(LLSettingsDay::TRACK_GROUND_LEVEL))
+        {
+            LL_WARNS("LAPRAS") << "Invalid day cycle for parcel #" << parcel_id << LL_ENDL;
+            clearEnvironment(ENV_PARCEL);
+        }
         else
         {
             setEnvironment(ENV_PARCEL, envinfo->mDayCycle, envinfo->mDayLength, envinfo->mDayOffset);
@@ -1056,13 +1080,7 @@ void LLEnvironment::requestParcel(S32 parcel_id, environment_apply_fn cb)
             {
                 cb = [this](S32 pid, EnvironmentInfo::ptr_t envinfo)
                 {
-                    if (envinfo->mDayCycle) recordEnvironment(pid, envinfo);
-                    else
-                    {
-                        clearEnvironment(ENV_PARCEL);
-                        setEnvironment(ENV_REGION, LLSettingsDay::GetDefaultAssetId(), LLSettingsDay::DEFAULT_DAYLENGTH, LLSettingsDay::DEFAULT_DAYOFFSET);
-                        updateEnvironment();
-                    }
+                    recordEnvironment(pid, envinfo);
                 };
             }
 
diff --git a/indra/newview/llfloaterbulkpermission.cpp b/indra/newview/llfloaterbulkpermission.cpp
index f2040bc760..a1a06706bc 100644
--- a/indra/newview/llfloaterbulkpermission.cpp
+++ b/indra/newview/llfloaterbulkpermission.cpp
@@ -75,6 +75,7 @@ BOOL LLFloaterBulkPermission::postBuild()
 	mBulkChangeIncludeScripts = gSavedSettings.getBOOL("BulkChangeIncludeScripts");
 	mBulkChangeIncludeSounds = gSavedSettings.getBOOL("BulkChangeIncludeSounds");
 	mBulkChangeIncludeTextures = gSavedSettings.getBOOL("BulkChangeIncludeTextures");
+	mBulkChangeIncludeSettings = gSavedSettings.getBOOL("BulkChangeIncludeSettings");
 	mBulkChangeShareWithGroup = gSavedSettings.getBOOL("BulkChangeShareWithGroup");
 	mBulkChangeEveryoneCopy = gSavedSettings.getBOOL("BulkChangeEveryoneCopy");
 	mBulkChangeNextOwnerModify = gSavedSettings.getBOOL("BulkChangeNextOwnerModify");
@@ -186,6 +187,7 @@ void LLFloaterBulkPermission::onCloseBtn()
 	gSavedSettings.setBOOL("BulkChangeIncludeScripts", mBulkChangeIncludeScripts);
 	gSavedSettings.setBOOL("BulkChangeIncludeSounds", mBulkChangeIncludeSounds);
 	gSavedSettings.setBOOL("BulkChangeIncludeTextures", mBulkChangeIncludeTextures);
+	gSavedSettings.setBOOL("BulkChangeIncludeSettings", mBulkChangeIncludeSettings);
 	gSavedSettings.setBOOL("BulkChangeShareWithGroup", mBulkChangeShareWithGroup);
 	gSavedSettings.setBOOL("BulkChangeEveryoneCopy", mBulkChangeEveryoneCopy);
 	gSavedSettings.setBOOL("BulkChangeNextOwnerModify", mBulkChangeNextOwnerModify);
@@ -281,6 +283,7 @@ void LLFloaterBulkPermission::doCheckUncheckAll(BOOL check)
 	gSavedSettings.setBOOL("BulkChangeIncludeScripts"   , check);
 	gSavedSettings.setBOOL("BulkChangeIncludeSounds"    , check);
 	gSavedSettings.setBOOL("BulkChangeIncludeTextures"  , check);
+	gSavedSettings.setBOOL("BulkChangeIncludeSettings"  , check);
 }
 
 
@@ -302,6 +305,7 @@ void LLFloaterBulkPermission::handleInventory(LLViewerObject* viewer_obj, LLInve
 			( asstype == LLAssetType::AT_OBJECT    && gSavedSettings.getBOOL("BulkChangeIncludeObjects"   )) ||
 			( asstype == LLAssetType::AT_LSL_TEXT  && gSavedSettings.getBOOL("BulkChangeIncludeScripts"   )) ||
 			( asstype == LLAssetType::AT_SOUND     && gSavedSettings.getBOOL("BulkChangeIncludeSounds"    )) ||
+			( asstype == LLAssetType::AT_SETTINGS  && gSavedSettings.getBOOL("BulkChangeIncludeSettings"  )) ||
 			( asstype == LLAssetType::AT_TEXTURE   && gSavedSettings.getBOOL("BulkChangeIncludeTextures"  )))
 		{
 			LLViewerObject* object = gObjectList.findObject(viewer_obj->getID());
@@ -333,7 +337,12 @@ void LLFloaterBulkPermission::handleInventory(LLViewerObject* viewer_obj, LLInve
 					//|| something else // for next owner perms
 					)
 				{
-					perm.setMaskNext(LLFloaterPerms::getNextOwnerPerms("BulkChange"));
+					U32 mask_next = LLFloaterPerms::getNextOwnerPerms("BulkChange");
+					if (asstype == LLAssetType::AT_SETTINGS)
+					{
+						mask_next |= PERM_COPY;
+					}
+					perm.setMaskNext(mask_next);
 					perm.setMaskEveryone(LLFloaterPerms::getEveryonePerms("BulkChange"));
 					perm.setMaskGroup(LLFloaterPerms::getGroupPerms("BulkChange"));
 					new_item->setPermissions(perm); // here's the beef
diff --git a/indra/newview/llfloaterbulkpermission.h b/indra/newview/llfloaterbulkpermission.h
index 0c042c3ee3..1afc876bba 100644
--- a/indra/newview/llfloaterbulkpermission.h
+++ b/indra/newview/llfloaterbulkpermission.h
@@ -102,6 +102,7 @@ private:
 	bool mBulkChangeIncludeScripts;
 	bool mBulkChangeIncludeSounds;
 	bool mBulkChangeIncludeTextures;
+	bool mBulkChangeIncludeSettings;
 	bool mBulkChangeShareWithGroup;
 	bool mBulkChangeEveryoneCopy;
 	bool mBulkChangeNextOwnerModify;
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index fa16648140..96af840bba 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -184,7 +184,7 @@ BOOL LLFloaterEditExtDayCycle::postBuild()
     mFlyoutControl->setAction([this](LLUICtrl *ctrl, const LLSD &data) { onButtonApply(ctrl, data); });
 
     getChild<LLButton>(BTN_CANCEL, true)->setCommitCallback([this](LLUICtrl *ctrl, const LLSD &data) { onClickCloseBtn(); });
-    mTimeSlider->setCommitCallback([this](LLUICtrl *ctrl, const LLSD &data) { onTimeSliderMoved(); });
+    mTimeSlider->setCommitCallback([this](LLUICtrl *ctrl, const LLSD &data) { onTimeSliderCallback(); });
     mAddFrameButton->setCommitCallback([this](LLUICtrl *ctrl, const LLSD &data) { onAddTrack(); });
     mDeleteFrameButton->setCommitCallback([this](LLUICtrl *ctrl, const LLSD &data) { onRemoveTrack(); });
     mImportButton->setCommitCallback([this](LLUICtrl *, const LLSD &){ onButtonImport(); });
@@ -437,6 +437,19 @@ void LLFloaterEditExtDayCycle::refresh()
 void LLFloaterEditExtDayCycle::setEditDayCycle(const LLSettingsDay::ptr_t &pday)
 {
     mEditDay = pday->buildDeepCloneAndUncompress();
+
+    if (mEditDay->isTrackEmpty(LLSettingsDay::TRACK_WATER))
+    {
+        LL_WARNS("ENVDAYEDIT") << "No water frames found, generating replacement" << LL_ENDL;
+        mEditDay->setWaterAtKeyframe(LLSettingsVOWater::buildDefaultWater(), .5f);
+    }
+
+    if (mEditDay->isTrackEmpty(LLSettingsDay::TRACK_GROUND_LEVEL))
+    {
+        LL_WARNS("ENVDAYEDIT") << "No sky frames found, generating replacement" << LL_ENDL;
+        mEditDay->setSkyAtKeyframe(LLSettingsVOSky::buildDefaultSky(), .5f, LLSettingsDay::TRACK_GROUND_LEVEL);
+    }
+
     updateEditEnvironment();
     LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_EDIT, LLEnvironment::TRANSITION_INSTANT);
     LLEnvironment::instance().updateEnvironment(LLEnvironment::TRANSITION_INSTANT);
@@ -773,8 +786,9 @@ void LLFloaterEditExtDayCycle::checkAndConfirmSettingsLoss(on_confirm_fn cb)
     }
 }
 
-void LLFloaterEditExtDayCycle::onTimeSliderMoved()
+void LLFloaterEditExtDayCycle::onTimeSliderCallback()
 {
+    stopPlay();
     selectFrame(mTimeSlider->getCurSliderValue(), LLSettingsDay::DEFAULT_FRAME_SLOP_FACTOR);
 }
 
@@ -1260,11 +1274,25 @@ void LLFloaterEditExtDayCycle::doApplyEnvironment(const std::string &where, cons
             return;
         }
 
-        LLEnvironment::instance().updateParcel(parcel->getLocalID(), day, -1, -1);
+        if (mInventoryItem && !isDirty())
+        {
+            LLEnvironment::instance().updateParcel(parcel->getLocalID(), mInventoryItem->getAssetUUID(), -1, -1);
+        }
+        else
+        {
+            LLEnvironment::instance().updateParcel(parcel->getLocalID(), day, -1, -1);
+        }
     }
     else if (where == ACTION_APPLY_REGION)
     {
-        LLEnvironment::instance().updateRegion(day, -1, -1);
+        if (mInventoryItem && !isDirty())
+        {
+            LLEnvironment::instance().updateRegion(mInventoryItem->getAssetUUID(), -1, -1);
+        }
+        else
+        {
+            LLEnvironment::instance().updateRegion(day, -1, -1);
+        }
     }
     else
     {
diff --git a/indra/newview/llfloatereditextdaycycle.h b/indra/newview/llfloatereditextdaycycle.h
index 185b27bff3..0ab47fc1e5 100644
--- a/indra/newview/llfloatereditextdaycycle.h
+++ b/indra/newview/llfloatereditextdaycycle.h
@@ -108,8 +108,8 @@ private:
 	void                        onCommitName(class LLLineEditor* caller, void* user_data);
 	void                        onTrackSelectionCallback(const LLSD& user_data);
 	void                        onPlayActionCallback(const LLSD& user_data);
-	// time slider moved
-	void                        onTimeSliderMoved();
+	// time slider clicked
+	void                        onTimeSliderCallback();
 	// a frame moved or frame selection changed
 	void                        onFrameSliderCallback(const LLSD &);
     void                        onFrameSliderDoubleClick(S32 x, S32 y, MASK mask);
diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp
index d65a578a6d..2eda405f51 100644
--- a/indra/newview/llfloaterfixedenvironment.cpp
+++ b/indra/newview/llfloaterfixedenvironment.cpp
@@ -430,17 +430,33 @@ void LLFloaterFixedEnvironment::doApplyEnvironment(const std::string &where)
             return;
         }
 
-        if (mSettings->getSettingsType() == "sky")
+        if (mInventoryItem && !isDirty())
+        {
+            LLEnvironment::instance().updateParcel(parcel->getLocalID(), mInventoryItem->getAssetUUID(), -1, -1);
+        }
+        else if (mSettings->getSettingsType() == "sky")
+        {
             LLEnvironment::instance().updateParcel(parcel->getLocalID(), std::static_pointer_cast<LLSettingsSky>(mSettings), -1, -1);
+        }
         else if (mSettings->getSettingsType() == "water")
+        {
             LLEnvironment::instance().updateParcel(parcel->getLocalID(), std::static_pointer_cast<LLSettingsWater>(mSettings), -1, -1);
+        }
     }
     else if (where == ACTION_APPLY_REGION)
     {
-        if (mSettings->getSettingsType() == "sky")
+        if (mInventoryItem && !isDirty())
+        {
+            LLEnvironment::instance().updateRegion(mInventoryItem->getAssetUUID(), -1, -1);
+        }
+        else if (mSettings->getSettingsType() == "sky")
+        {
             LLEnvironment::instance().updateRegion(std::static_pointer_cast<LLSettingsSky>(mSettings), -1, -1);
+        }
         else if (mSettings->getSettingsType() == "water")
+        {
             LLEnvironment::instance().updateRegion(std::static_pointer_cast<LLSettingsWater>(mSettings), -1, -1);
+        }
     }
     else
     {
diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp
index 2281ea1496..3968f43485 100644
--- a/indra/newview/llfloaterperms.cpp
+++ b/indra/newview/llfloaterperms.cpp
@@ -121,7 +121,8 @@ const std::string LLFloaterPermsDefault::sCategoryNames[CAT_LAST] =
 	"Scripts",
 	"Notecards",
 	"Gestures",
-	"Wearables"
+	"Wearables",
+	"Settings"
 };
 
 BOOL LLFloaterPermsDefault::postBuild()
diff --git a/indra/newview/llfloaterperms.h b/indra/newview/llfloaterperms.h
index e866b6de7d..02359a256e 100644
--- a/indra/newview/llfloaterperms.h
+++ b/indra/newview/llfloaterperms.h
@@ -74,6 +74,7 @@ enum Categories
 	CAT_NOTECARDS,
 	CAT_GESTURES,
 	CAT_WEARABLES,
+	CAT_SETTINGS,
 	CAT_LAST
 };
 
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index d84ce16792..36fb98efe1 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -144,6 +144,7 @@ LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) :
 	mAllowMultiSelect(p.allow_multi_select),
 	mShowItemLinkOverlays(p.show_item_link_overlays),
 	mShowEmptyMessage(p.show_empty_message),
+	mSuppressFolderMenu(p.suppress_folder_menu),
 	mViewsInitialized(false),
 	mInvFVBridgeBuilder(NULL),
 	mInventoryViewModel(p.name),
@@ -191,6 +192,7 @@ LLFolderView * LLInventoryPanel::createFolderRoot(LLUUID root_id )
     p.use_label_suffix = mParams.use_label_suffix;
     p.allow_multiselect = mAllowMultiSelect;
     p.show_empty_message = mShowEmptyMessage;
+    p.suppress_folder_menu = mSuppressFolderMenu;
     p.show_item_link_overlays = mShowItemLinkOverlays;
     p.root = NULL;
     p.allow_drop = mParams.allow_drop_on_root;
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index e2da06b8d8..90fd659522 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -97,6 +97,7 @@ public:
 		Optional<StartFolder>               start_folder;
 		Optional<bool>						use_label_suffix;
 		Optional<bool>						show_empty_message;
+		Optional<bool>						suppress_folder_menu;
 		Optional<bool>						show_root_folder;
 		Optional<bool>						allow_drop_on_root;
 		Optional<bool>						use_marketplace_folders;
@@ -111,6 +112,7 @@ public:
 			inventory("", &gInventory),
 			allow_multi_select("allow_multi_select", true),
 			show_item_link_overlays("show_item_link_overlays", false),
+			suppress_folder_menu("suppress_folder_menu", false),
 			filter("filter"),
 			start_folder("start_folder"),
 			use_label_suffix("use_label_suffix", true),
@@ -261,6 +263,7 @@ protected:
 	bool 						mAllowMultiSelect;
 	bool 						mShowItemLinkOverlays; // Shows link graphic over inventory item icons
 	bool						mShowEmptyMessage;
+	bool						mSuppressFolderMenu;
 
 	LLHandle<LLFolderView>      mFolderRoot;
 	LLScrollContainer*			mScroller;
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index 583adcb024..4073639a20 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -43,6 +43,7 @@
 
 #include "llagent.h"
 #include "llassettype.h"
+#include "llfloaterperms.h"
 #include "llnotificationsutil.h"
 
 #include "llviewerregion.h"
@@ -95,7 +96,8 @@ namespace
 void LLSettingsVOBase::createNewInventoryItem(LLSettingsType::type_e stype, const LLUUID &parent_id, inventory_result_fn callback)
 {
     LLTransactionID tid;
-    U32             nextOwnerPerm = LLPermissions::DEFAULT.getMaskNextOwner();
+    U32 nextOwnerPerm = LLFloaterPerms::getNextOwnerPerms("Settings");
+    nextOwnerPerm |= PERM_COPY;
 
     if (!LLEnvironment::instance().isInventoryEnabled())
     {
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index 3ec8e1e911..e6ea5c3784 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -631,7 +631,7 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
 	LLUICtrl* edit_cost = getChild<LLUICtrl>("Edit Cost");
 
 	// Check for ability to change values.
-	if (is_obj_modify && can_agent_sell 
+    if (is_obj_modify && can_agent_sell 
 		&& gAgent.allowOperation(PERM_TRANSFER, perm, GP_OBJECT_MANIPULATE))
 	{
 		getChildView("CheckPurchase")->setEnabled(is_complete);
@@ -657,6 +657,25 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
 		edit_cost->setEnabled(FALSE);
 	}
 
+    // Hide any properties that are not relevant to settings
+    if (is_settings)
+    {
+        getChild<LLUICtrl>("GroupLabel")->setEnabled(false);
+        getChild<LLUICtrl>("GroupLabel")->setVisible(false);
+        getChild<LLUICtrl>("CheckShareWithGroup")->setEnabled(false);
+        getChild<LLUICtrl>("CheckShareWithGroup")->setVisible(false);
+        getChild<LLUICtrl>("AnyoneLabel")->setEnabled(false);
+        getChild<LLUICtrl>("AnyoneLabel")->setVisible(false);
+        getChild<LLUICtrl>("CheckEveryoneCopy")->setEnabled(false);
+        getChild<LLUICtrl>("CheckEveryoneCopy")->setVisible(false);
+        getChild<LLUICtrl>("CheckPurchase")->setEnabled(false);
+        getChild<LLUICtrl>("CheckPurchase")->setVisible(false);
+        getChild<LLUICtrl>("ComboBoxSaleType")->setEnabled(false);
+        getChild<LLUICtrl>("ComboBoxSaleType")->setVisible(false);
+        getChild<LLUICtrl>("Edit Cost")->setEnabled(false);
+        getChild<LLUICtrl>("Edit Cost")->setVisible(false);
+    }
+
 	// Set values.
 	getChild<LLUICtrl>("CheckPurchase")->setValue(is_for_sale);
 	getChild<LLUICtrl>("CheckNextOwnerModify")->setValue(LLSD(BOOL(next_owner_mask & PERM_MODIFY)));
diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index e7ab3cacdc..b4577f54e6 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -156,7 +156,20 @@
      name="icon_texture"
      tool_tip="Textures"
      left_pad="2" />
-
+  <check_box
+    control_name="BulkChangeIncludeSettings"
+    height="16"
+    name="check_settings"
+    left="245"
+    top="25"
+    width="16" />
+  <icon
+    height="16"
+    image_name="Inv_Settings"
+    mouse_opaque="true"
+    name="icon_setting"
+    tool_tip="Environment settings"
+    left_pad="2" />
     <button
       height="23"
     layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_perms_default.xml b/indra/newview/skins/default/xui/en/floater_perms_default.xml
index 1c3af49bfe..49dc719a24 100644
--- a/indra/newview/skins/default/xui/en/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/en/floater_perms_default.xml
@@ -488,6 +488,67 @@
        left_pad="0"
        top_delta="0"
        width="100" />
+      <text
+       name="label_13"
+       type="string"
+       length="1"
+       follows="left|top"
+       height="16"
+       layout="topleft"
+       left="0"
+       tool_tip="Set default permissions for when Environment settings are created"
+       width="100">
+          Settings
+      </text>
+      <icon
+       follows="left|top"
+       height="16"
+       image_name="Inv_Settings"
+       layout="topleft"
+       left_pad="2"
+       width="18"/>
+      <check_box
+       height="16"
+       layout="topleft"
+       name="env_settings_c"
+       left_pad="45"
+       top_delta="0"
+       value="true"
+       enabled="false"
+       width="100">
+      </check_box>
+      <check_box
+       control_name="SettingsNextOwnerModify"
+       height="16"
+       layout="topleft"
+       name="env_settings_m"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+      <check_box
+       control_name="SettingsNextOwnerTransfer"
+       height="16"
+       layout="topleft"
+       name="env_settings_t"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+      <check_box
+       enabled="false"
+       height="16"
+       layout="topleft"
+       name="env_settings_s"
+       left_pad="0"
+       top_delta="0"
+       width="120" />
+      <check_box
+       enabled="false"
+       height="16"
+       layout="topleft"
+       name="env_settings_e"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
   </panel>
   <button
    height="20"
diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
index 2df52ec6d5..2258a1dc24 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -51,6 +51,7 @@
                     right="-2" />
             <inventory_panel
                     allow_multi_select="false"
+                    suppress_folder_menu="true"
                     bg_visible="true"
                     bg_alpha_color="DkGray2"
                     border="false"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index cd642f9531..4813ae3468 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6068,7 +6068,7 @@ This day cycle file references a missing sky file: [SKY].
    icon="alertmodal.tga"
    name="WLRegionApplyFail"
    type="alertmodal">
-Sorry, the settings couldn't be applied to the region.  Leaving the region and then returning may help rectify the problem.  The reason given was: [FAIL_REASON]
+Sorry, the settings couldn't be applied to the region. Reason: [FAIL_REASON]
   </notification>
 
   <notification
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index cfb142093a..539d5a636b 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -70,7 +70,7 @@
                     <radio_group
                             height="90"
                             layout="topleft"
-                            top_pad="5"
+                            top_pad="8"
                             left_delta="10"
                             name="rdg_environment_select">
                         <radio_item
@@ -145,7 +145,7 @@
                             height="12"
                             layout="topleft"
                             left_delta="10"
-                            top_pad="10"
+                            top_pad="14"
                             width="200">
                         Day Length (hours)
                     </text>
diff --git a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
index 0e729c821a..9fa77855c0 100644
--- a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
+++ b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
@@ -5,7 +5,7 @@
     height="150"
     user_resize="false"     
     increment_angle_mouse="1.5f"
-    increment_angle_btn="3.0f"    
+    increment_angle_btn="1.0f"    
     image_sphere="VirtualTrackball_Sphere"
     image_moon_back="VirtualTrackball_Moon_Back"
     image_moon_front="VirtualTrackball_Moon_Front"