Partial merge of LGPL repo

doc/contributions.txt

@@ -1200,6 +1200,9 @@ Tofu Buzzard
 	SH-2477
 	STORM-1684
 	STORM-1819
+    STORM-1921
+    STORM-1927
+    STORM-1928
 Tony Kembia
 Torben Trautman
 TouchaHoney Perhaps

indra/llcharacter/llbvhloader.cpp

@@ -221,7 +221,12 @@ ELoadStatus LLBVHLoader::loadTranslationTable(const char *fileName)
 
 	LLAPRFile infile ;
 	infile.open(path, LL_APR_R);
-	apr_file_t *fp = infile.getFileHandle();
+	
+	// <FS:ND> Remove LLVolatileAPRPool/apr_file_t and use FILE* instead
+	// apr_file_t *fp = infile.getFileHandle();
+	LLAPRFile::tFiletype *fp = infile.getFileHandle();
+	// </FS:ND>
+
 	if (!fp)
 		return E_ST_NO_XLT_FILE;
 
@@ -1338,7 +1343,11 @@ void LLBVHLoader::reset()
 //------------------------------------------------------------------------
 // LLBVHLoader::getLine()
 //------------------------------------------------------------------------
-BOOL LLBVHLoader::getLine(apr_file_t* fp)
+
+// <FS:ND> Remove LLVolatileAPRPool/apr_file_t and use FILE* instead
+//BOOL LLBVHLoader::getLine(apr_file_t* fp)
+BOOL LLBVHLoader::getLine(LLAPRFile::tFiletype* fp)
+// </FS:ND>
 {
 	if (apr_file_eof(fp) == APR_EOF)
 	{

indra/llcharacter/llbvhloader.h

@@ -298,7 +298,11 @@ public:
 
 protected:
 	// Consumes one line of input from file.
-	BOOL getLine(apr_file_t *fp);
+
+	// <FS:ND> Remove LLVolatileAPRPool/apr_file_t and use FILE* instead
+	// BOOL getLine(apr_file_t *fp);
+	BOOL getLine(LLAPRFile::tFiletype *fp);
+	// </FS:ND>
 
 	// parser state
 	char		mLine[BVH_PARSER_LINE_SIZE];		/* Flawfinder: ignore */

indra/llcharacter/llkeyframemotionparam.cpp

@@ -353,7 +353,12 @@ BOOL LLKeyframeMotionParam::loadMotions()
 	S32 fileSize = 0;
 	LLAPRFile infile ;
 	infile.open(path, LL_APR_R, NULL, &fileSize);
-	apr_file_t* fp = infile.getFileHandle() ;
+
+	// <FS:ND> Remove LLVolatileAPRPool/apr_file_t and use FILE* instead
+	// apr_file_t* fp = infile.getFileHandle() ;
+	LLAPRFile::tFiletype* fp = infile.getFileHandle() ;
+	// </FS:ND>
+
 	if (!fp || fileSize == 0)
 	{
 		llinfos << "ERROR: can't open: " << path << llendl;

indra/llcharacter/llstatemachine.cpp

@@ -206,7 +206,11 @@ BOOL LLStateDiagram::saveDotFile(const std::string& filename)
 {
 	LLAPRFile outfile ;
 	outfile.open(filename, LL_APR_W);
-	apr_file_t* dot_file = outfile.getFileHandle() ;
+	
+	// <FS:ND> Remove LLVolatileAPRPool/apr_file_t and use FILE* instead
+	// apr_file_t* dot_file = outfile.getFileHandle() ;
+	LLAPRFile::tFiletype* dot_file = outfile.getFileHandle() ;
+	// </FS:ND>
 
 	if (!dot_file)
 	{

indra/llcommon/CMakeLists.txt

@@ -269,8 +269,8 @@ set(llcommon_HEADER_FILES
     )
 
 # <FS:ND> Add all nd* files. memory pool, intrinsics, ...
-set(llcommon_ND_SOURCE_FILES ndallocators.cpp ndintrin.cpp ndmemorypool.cpp ndexceptions.cpp ndmallocstats.cpp )
-set(llcommon_ND_HEADER_FILES ndintrin.h ndlocks.h ndmemory.h ndmemorypool.h ndpooldefines.h ndexceptions.h ndmallocstats.h ndstackwalk.h ndcallstack.h ndobjectpool.h ndstlallocator.h )
+set(llcommon_ND_SOURCE_FILES ndallocators.cpp ndintrin.cpp ndmemorypool.cpp ndexceptions.cpp ndmallocstats.cpp ndfile.cpp )
+set(llcommon_ND_HEADER_FILES ndintrin.h ndlocks.h ndmemory.h ndmemorypool.h ndpooldefines.h ndexceptions.h ndmallocstats.h ndstackwalk.h ndcallstack.h ndobjectpool.h ndstlallocator.h ndfile.h )
 
 SOURCE_GROUP( nd FILES ${llcommon_ND_SOURCE_FILES} ${llcommon_ND_HEADER_FILES} )
 

indra/llcommon/llapr.cpp

@@ -31,7 +31,12 @@
 #include "apr_dso.h"
 
 apr_pool_t *gAPRPoolp = NULL; // Global APR memory pool
-LLVolatileAPRPool *LLAPRFile::sAPRFilePoolp = NULL ; //global volatile APR memory pool.
+
+// <FS:ND> moved LLAPRFile into a namespace, so we can toggle the implementation without much fuss
+//LLVolatileAPRPool *LLAPRFile::sAPRFilePoolp = NULL ; //global volatile APR memory pool.
+LLVolatileAPRPool *ll::apr::LLAPRFile::sAPRFilePoolp = NULL ; //global volatile APR memory pool.
+// </FS:ND>
+
 apr_thread_mutex_t *gLogMutexp = NULL;
 apr_thread_mutex_t *gCallStacksLogMutexp = NULL;
 
@@ -52,9 +57,13 @@ void ll_init_apr()
 		apr_thread_mutex_create(&gCallStacksLogMutexp, APR_THREAD_MUTEX_UNNESTED, gAPRPoolp);
 	}
 
-	if(!LLAPRFile::sAPRFilePoolp)
+	// if(!LLAPRFile::sAPRFilePoolp)
+	// {
+	// 	LLAPRFile::sAPRFilePoolp = new LLVolatileAPRPool(FALSE) ;
+	// }
+	if(!ll::apr::LLAPRFile::sAPRFilePoolp)
 	{
-		LLAPRFile::sAPRFilePoolp = new LLVolatileAPRPool(FALSE) ;
+		ll::apr::LLAPRFile::sAPRFilePoolp = new LLVolatileAPRPool(FALSE) ;
 	}
 }
 
@@ -84,10 +93,15 @@ void ll_cleanup_apr()
 		apr_pool_destroy(gAPRPoolp);
 		gAPRPoolp = NULL;
 	}
-	if (LLAPRFile::sAPRFilePoolp)
+	// if (LLAPRFile::sAPRFilePoolp)
+	// {
+	// 	delete LLAPRFile::sAPRFilePoolp ;
+	//	LLAPRFile::sAPRFilePoolp = NULL ;
+	// }
+	if (ll::apr::LLAPRFile::sAPRFilePoolp)
 	{
-		delete LLAPRFile::sAPRFilePoolp ;
-		LLAPRFile::sAPRFilePoolp = NULL ;
+		delete ll::apr::LLAPRFile::sAPRFilePoolp ;
+		ll::apr::LLAPRFile::sAPRFilePoolp = NULL ;
 	}
 	apr_terminate();
 }
@@ -319,6 +333,7 @@ void ll_apr_assert_status(apr_status_t status, apr_dso_handle_t *handle)
     llassert(! ll_apr_warn_status(status, handle));
 }
 
+namespace ll { namespace apr {
 //---------------------------------------------------------------------
 //
 // LLAPRFile functions
@@ -800,6 +815,7 @@ bool LLAPRFile::removeDir(const std::string& dirname, LLVolatileAPRPool* pool)
 //end of static components of LLAPRFile
 //*******************************************************************************************************************************
 //
+} }
 
 // <FS:ND> Special case for UTF-8 filenames under windows. As we cannot pass UTF-16 filenames into apr use a shortfilename, those are always ASCII
 std::string ndConvertFilename( std::string const &aFilename )

indra/llcommon/llapr.h

@@ -187,6 +187,8 @@ typedef LLAtomic32<S32> LLAtomicS32;
 #define LL_APR_RPB (APR_READ|APR_WRITE|APR_BINARY) // "r+b"
 #define LL_APR_WPB (APR_CREATE|APR_TRUNCATE|APR_READ|APR_WRITE|APR_BINARY) // "w+b"
 
+namespace ll { namespace apr {
+
 //
 //apr_file manager
 //which: 1)only keeps one file open;
@@ -199,7 +201,6 @@ typedef LLAtomic32<S32> LLAtomicS32;
 //      1, a temporary pool passed to an APRFile function, which is used within this function and only once.
 //      2, a global pool.
 //
-
 class LL_COMMON_API LLAPRFile : boost::noncopyable
 {
 	// make this non copyable since a copy closes the file
@@ -208,6 +209,10 @@ private:
 	LLVolatileAPRPool *mCurrentFilePoolp ; //currently in use apr_pool, could be one of them: sAPRFilePoolp, or a temp pool. 
 
 public:
+	// <FS:ND> typedef for underlying primitive
+	typedef apr_file_t tFiletype;
+	// </FS:ND>
+	
 	LLAPRFile() ;
 	LLAPRFile(const std::string& filename, apr_int32_t flags, LLVolatileAPRPool* pool = NULL);
 	~LLAPRFile() ;
@@ -255,6 +260,7 @@ public:
 //*******************************************************************************************************************************
 };
 
+} }
 /**
  * @brief Function which appropriately logs error or remains quiet on
  * APR_SUCCESS.
@@ -269,4 +275,8 @@ void LL_COMMON_API ll_apr_assert_status(apr_status_t status, apr_dso_handle_t* h
 
 extern "C" LL_COMMON_API apr_pool_t* gAPRPoolp; // Global APR memory pool
 
+#include "ndfile.h"
+typedef ll::apr::LLAPRFile LLAPRFile;
+//typedef nd::apr::ndFile LLAPRFile;
+
 #endif // LL_LLAPR_H

indra/llcommon/llsys.cpp

@@ -250,6 +250,11 @@ LLOSInfo::LLOSInfo() :
 					else
 						mOSStringSimple = "Windows Server 2012 ";
 				}
+				else if(osvi.dwMinorVersion == 3)
+				{
+					if(osvi.wProductType == VER_NT_WORKSTATION)
+						mOSStringSimple = "Microsoft Windows Blue ";
+				}
 
 				///get native system info if available..
 				typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO); ///function pointer for loading GetNativeSystemInfo

indra/llcommon/ndfile.cpp

@@ -0,0 +1,473 @@
+/**
+ * $LicenseInfo:firstyear=2013&license=fsviewerlgpl$
+ * Phoenix Firestorm Viewer Source Code
+ * Copyright (C) 2013, Nicky Dasmijn
+ *
+ * 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
+ *
+ * The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
+ * http://www.firestormviewer.org
+ * $/LicenseInfo$
+ */
+
+#include "ndfile.h"
+#include "llerror.h"
+#include "llfile.h"
+
+#ifdef LL_WINDOWS
+#include <io.h>
+#else
+#include <sys/file.h>
+#endif
+
+namespace nd
+{
+	namespace apr
+	{
+		ndFile::ndFile()
+		: mFile(NULL)
+		{
+		}
+		
+		ndFile::ndFile(const std::string& filename, apr_int32_t flags, ndVolatileAPRPool* pool)
+		: mFile(NULL)
+		{
+			open(filename, flags, pool);
+		}
+		
+		ndFile::~ndFile()
+		{
+			close() ;
+		}
+		
+		apr_status_t ndFile::close() 
+		{
+			FILE *pFile(mFile);
+			mFile = 0;
+			return close( pFile, 0 );
+		}
+		
+		apr_status_t ndFile::open(const std::string& filename, apr_int32_t flags, ndVolatileAPRPool* pool, S32* sizep)
+		{
+			return nd::aprhelper::ndOpenFile( filename, flags, mFile, sizep );
+		}
+		
+		apr_status_t ndFile::open(const std::string& filename, apr_int32_t flags, BOOL use_global_pool)
+		{
+			return nd::aprhelper::ndOpenFile( filename, flags, mFile );
+		}
+		
+		S32 ndFile::read(void *buf, S32 nbytes)
+		{
+			if( !mFile )
+			{
+				llwarns << "File is not open, cannot read" << llendl;
+				return 0;
+			}
+		
+			S32 read =  fread(buf, 1, nbytes, mFile );
+			if( nbytes != read )
+			{
+				llwarns << "Error when reading, wanted " << nbytes << " read " << read << llendl;
+			}
+
+			return read;
+		}
+		
+		S32 ndFile::write(const void *buf, S32 nbytes)
+		{
+			if( !mFile )
+			{
+				llwarns << "File is not open, cannot write" << llendl;
+				return 0;
+			}
+		
+			S32 written =  fwrite( buf, 1, nbytes, mFile );	
+			if( nbytes != written )
+			{
+				llwarns << "Error when writing, wanted " << nbytes << " wrote " << written  << llendl;
+			}
+			return written;
+		}
+		
+		S32 ndFile::seek(apr_seek_where_t where, S32 offset)
+		{
+			return ndFile::seek(mFile, where, offset) ;
+		}
+		
+		apr_status_t ndFile::close(FILE* file_handle, ndVolatileAPRPool* pool) 
+		{
+			if( 0 == LLFile::close( file_handle ) )
+				return APR_SUCCESS;
+		
+			return APR_OS_START_SYSERR + errno;
+		}
+		
+		FILE* ndFile::open(const std::string& filename, ndVolatileAPRPool* pool, apr_int32_t flags)
+		{
+			FILE *pFile(0);
+			if( APR_SUCCESS == nd::aprhelper::ndOpenFile( filename, flags, pFile ) && pFile )
+				return pFile;
+		
+			return 0;
+		}
+		
+		S32 ndFile::seek(FILE* file_handle, apr_seek_where_t where, S32 offset)
+		{
+			if( !file_handle )
+				return -1;
+		
+			int seekStatus(0);
+			if( offset >= 0 )
+				seekStatus = fseek( file_handle, offset, nd::aprhelper::ndConvertSeekFlags( where ) );
+			else
+				seekStatus = fseek( file_handle, 0, SEEK_END );
+		
+			if( 0 != seekStatus )
+			{
+				int err = errno;
+				llwarns << "Seek failed with errno " << err << llendl;
+				return -1;
+			}
+
+			S32 offsetNew = ftell( file_handle );
+			if( offset != 0 && offset != offsetNew )
+			{
+				llwarns << "Seek failed, wanted offset " << offset << " got " << offsetNew << llendl;
+			}
+			return offsetNew;
+
+		}
+		
+		S32 ndFile::readEx(const std::string& filename, void *buf, S32 offset, S32 nbytes, ndVolatileAPRPool* pool)
+		{
+			FILE* file_handle = open(filename, pool, APR_READ|APR_BINARY); 
+			if (!file_handle)
+				return 0;
+		
+			llassert(offset >= 0);
+		
+			if (offset > 0)
+				offset = ndFile::seek(file_handle, APR_SET, offset);
+			
+			apr_size_t bytes_read;
+			if (offset < 0)
+				bytes_read = 0;
+			else
+				bytes_read = fread(buf, 1, nbytes, file_handle );
+			
+			close(file_handle, pool);
+
+			if( nbytes != bytes_read )
+			{
+				llwarns << "Error when reading, wanted " << nbytes << " read " << bytes_read << " offset " << offset << llendl;
+			}
+			return (S32)bytes_read;
+		}
+		
+		S32 ndFile::writeEx(const std::string& filename, void *buf, S32 offset, S32 nbytes, ndVolatileAPRPool* pool)
+		{
+			apr_int32_t flags = APR_CREATE|APR_WRITE|APR_BINARY;
+			if (offset < 0)
+			{
+				flags |= APR_APPEND;
+				offset = 0;
+			}
+			
+			FILE* file_handle = open(filename, pool, flags);
+		
+			if (!file_handle)
+				return 0;
+		
+			if (offset > 0)
+				offset = ndFile::seek(file_handle, APR_SET, offset);
+			
+			apr_size_t bytes_written;
+			if (offset < 0)
+				bytes_written = 0;
+			else
+				bytes_written = fwrite(buf, 1, nbytes, file_handle );
+		
+			ndFile::close(file_handle, pool);
+
+			if( nbytes != bytes_written )
+				llwarns << "Error when writing, wanted " << nbytes << " wrote " << bytes_written << " offset " << offset << llendl;
+
+			return (S32)bytes_written;
+		}
+		
+		bool ndFile::remove(const std::string& filename, ndVolatileAPRPool* pool)
+		{
+			return 0 == LLFile::remove( filename );
+		}
+		
+		bool ndFile::rename(const std::string& filename, const std::string& newname, ndVolatileAPRPool* pool)
+		{
+			return 0 == LLFile::rename( filename, newname );
+		}
+		
+		bool ndFile::isExist(const std::string& filename, ndVolatileAPRPool* pool, apr_int32_t flags)
+		{
+			FILE *pFile = LLFile::fopen( filename, nd::aprhelper::ndConvertOpenFlags( flags, filename ) );
+			if( pFile )
+				LLFile::close( pFile );
+		
+			return 0 != pFile;
+		}
+		
+		S32 ndFile::size(const std::string& aFilename, ndVolatileAPRPool* pool)
+		{
+			llstat oStat;
+			int nRes = LLFile::stat( aFilename, &oStat );
+			if( 0 == nRes )
+				return oStat.st_size;
+
+			return 0;
+		}
+		
+		bool ndFile::makeDir(const std::string& dirname, ndVolatileAPRPool* pool)
+		{
+			return 0 != LLFile::mkdir( dirname );
+		}
+		
+		bool ndFile::removeDir(const std::string& dirname, ndVolatileAPRPool* pool)
+		{
+			return 0 == LLFile::rmdir( dirname );
+		}
+	}
+}
+namespace nd
+{
+	namespace aprhelper
+	{
+		std::string ndConvertFilename( std::string const &aFilename )
+		{
+#ifdef LL_WINDOWS
+			// For safety reason (don't change any behaviour) do nothing different if filename is already ASCII
+			std::string::const_iterator itr = std::find_if( aFilename.begin(), aFilename.end(), [&]( char const & aVal ){ return aVal < 0; } ); 
+			if( aFilename.end() == itr )
+				return aFilename;
+			
+			wchar_t aShort[ MAX_PATH ] = {0};
+			DWORD nRes = ::GetShortPathNameW( utf8str_to_utf16str( aFilename ).c_str(), aShort, _countof( aShort ) );
+			if( nRes == 0 || nRes >= _countof( aShort ) )
+				return aFilename;
+			
+			return utf16str_to_utf8str( aShort );
+#else
+			return aFilename;
+#endif
+		}
+
+		char const *openR = "r";
+		char const *openRB = "rb";
+		char const *openRP = "r+";
+		char const *openRBP = "rb+";
+		char const *openW = "w";
+		char const *openWB = "wb";
+		char const *openWP = "w+";
+		char const *openWBP = "wb+";
+		char const *openA = "a";
+		char const *openAB = "ab";
+
+		char const* ndConvertOpenFlags( apr_int32_t aFlags, std::string const &aFilename )
+		{
+			bool isBinary = (aFlags & APR_BINARY);
+			bool doCreate = (aFlags & APR_CREATE);
+			bool doTruncate = (aFlags & APR_TRUNCATE);
+			bool doesExist = LLFile::isfile( aFilename );
+
+			if( aFlags & APR_READ && aFlags & APR_WRITE )
+			{
+				if( doTruncate || !doesExist )
+				{
+					if( isBinary )
+						return openWBP;
+					else
+						return openWP;
+				}
+				else
+				{
+					if( isBinary )
+						return openRBP;
+					else
+						return openRP;
+				}
+			}
+			
+			if( aFlags & APR_READ )
+			{
+				if( isBinary )
+					return openRB;
+				else
+					return openR;
+			}
+			
+			if( aFlags & APR_WRITE )
+			{
+				if( ( doesExist && !doTruncate ) || !doCreate )
+				{
+					if( isBinary )
+						return openRBP;
+					else
+						return openRP;
+				}
+				else
+				{
+					if( isBinary )
+						return openWB;
+					else
+						return openW;
+				}
+			}
+			
+			if( aFlags & APR_APPEND )
+			{
+				if( isBinary )
+					return openAB;
+				else
+					return openA;
+			}
+			
+			return openR;
+		}
+		
+		apr_status_t ndOpenFile( const std::string& aFilename, apr_int32_t aOpenflags, FILE *&aFileout, S32* aSizeout)
+		{
+			aFileout = 0;
+			if( aSizeout )
+				*aSizeout = 0;
+			
+			apr_status_t s = APR_SUCCESS;
+			FILE *pFile = LLFile::fopen( aFilename, ndConvertOpenFlags( aOpenflags, aFilename ) );
+			
+			if ( !pFile )
+			{
+				s = APR_OS_START_SYSERR + errno;
+			}
+			else if (aSizeout)
+			{
+				llstat oStat;
+				int nRes = LLFile::stat( aFilename, &oStat );
+				if ( 0 == nRes )
+					*aSizeout = oStat.st_size;
+				else
+				{
+					int err = errno;
+					llwarns << "stat for file " << aFilename << " failed with errno " << err << llendl;
+				}
+			}
+			
+			aFileout = pFile;
+			return s;
+		}
+	}
+}
+
+int apr_file_close( FILE *aFile )
+{
+	if( 0 == fclose( aFile ) )
+		return APR_SUCCESS;
+
+	return APR_OS_START_SYSERR+errno;
+}
+
+int apr_file_printf( FILE *aFile, char const *aFmt, ... )
+{
+	va_list vaLst;
+	va_start( vaLst, aFmt );
+	int nPrinted = vfprintf( aFile, aFmt, vaLst );
+	va_end( vaLst );
+
+	if( nPrinted >= 0 )
+		return APR_SUCCESS;
+
+	return APR_OS_START_SYSERR+errno;
+}
+
+int apr_file_eof( FILE *aFile )
+{
+	if( 0 == feof(aFile) )
+		return APR_SUCCESS;
+	else
+		return APR_EOF;
+}
+
+int apr_file_gets( char *aBuffer, U32 aMax, FILE *aFile )
+{
+	if( fgets( aBuffer, aMax, aFile ) )
+		return APR_SUCCESS;
+
+	return APR_OS_START_SYSERR + ferror( aFile );
+}
+
+int apr_file_lock( FILE *aFile, int aLock )
+{
+#ifndef LL_WINDOWS
+	int fd = fileno( aFile );
+	if( -1 == fd )
+		return APR_OS_START_SYSERR + errno;
+
+	int lockType = LOCK_SH;
+	if( aLock & APR_FLOCK_EXCLUSIVE )
+		lockType = LOCK_EX;
+	if( aLock & APR_FLOCK_NONBLOCK )
+		lockType |= LOCK_NB;
+	
+	int nRes;
+	do
+	{
+		nRes = flock( fd, lockType );
+	}
+	while( nRes && errno == EINTR );
+
+	if( 0 == nRes )
+		return APR_SUCCESS;
+
+	return APR_OS_START_SYSERR + errno;
+#else
+	int fd = _fileno( aFile );
+	if( -1 == fd )
+		return APR_OS_START_SYSERR + errno;
+
+	HANDLE fHandle = reinterpret_cast<HANDLE>( _get_osfhandle( fd ) );
+	if( INVALID_HANDLE_VALUE == fHandle )
+		return APR_OS_START_SYSERR + errno;
+
+	DWORD lockType = 0;
+	
+	if( aLock & APR_FLOCK_NONBLOCK )
+		lockType |= LOCKFILE_FAIL_IMMEDIATELY;
+	if( aLock & APR_FLOCK_EXCLUSIVE )
+		lockType |= LOCKFILE_EXCLUSIVE_LOCK;
+
+	OVERLAPPED oOverlapped;
+	memset( &oOverlapped, 0, sizeof( OVERLAPPED ) );
+	if( ::LockFileEx( fHandle, lockType, 0, 0, UINT_MAX, &oOverlapped ) )
+		return APR_SUCCESS;
+
+	return APR_OS_START_SYSERR + ::GetLastError();
+#endif
+}
+
+int apr_file_read( FILE *aFile, void *aBuffer, U32 *aLen )
+{
+	U32 nRead = fread( aBuffer, 1, *aLen, aFile );
+	if( 0 == nRead )
+		return APR_OS_START_SYSERR + ferror( aFile );
+
+	*aLen = nRead;
+	return APR_SUCCESS;
+}

indra/llcommon/ndfile.h

@@ -0,0 +1,121 @@
+#ifndef NDAPRFILEREPLACEMENT_H
+#define NDAPRFILEREPLACEMENT_H
+
+/**
+ * $LicenseInfo:firstyear=2013&license=fsviewerlgpl$
+ * Phoenix Firestorm Viewer Source Code
+ * Copyright (C) 2013, Nicky Dasmijn
+ *
+ * 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
+ *
+ * The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
+ * http://www.firestormviewer.org
+ * $/LicenseInfo$
+ */
+
+#include <boost/noncopyable.hpp>
+#include <stdio.h>
+
+#if LL_LINUX || LL_SOLARIS
+#include <sys/param.h>  // Need PATH_MAX in APR headers...
+#endif
+
+#include <boost/noncopyable.hpp>
+
+#include "apr_thread_proc.h"
+#include "apr_thread_mutex.h"
+#include "apr_getopt.h"
+#include "apr_signal.h"
+#include "apr_atomic.h"
+
+
+#include "llpreprocessor.h"
+#include "llstring.h"
+
+namespace nd
+{
+	namespace apr
+	{
+		class LL_COMMON_API ndFile : boost::noncopyable
+		{
+		private:
+			FILE *mFile;
+		
+		public:
+			typedef FILE tFiletype;
+			typedef void ndVolatileAPRPool;
+
+			ndFile() ;
+			ndFile(const std::string& filename, apr_int32_t flags, ndVolatileAPRPool* pool = NULL);
+			~ndFile() ;
+			
+			apr_status_t open(const std::string& filename, apr_int32_t flags, ndVolatileAPRPool* pool = NULL, S32* sizep = NULL);
+			apr_status_t open(const std::string& filename, apr_int32_t flags, BOOL use_global_pool); //use gAPRPoolp.
+			apr_status_t close() ;
+		
+			// Returns actual offset, -1 if seek fails
+			S32 seek(apr_seek_where_t where, S32 offset);
+		
+			apr_status_t eof() { return feof(mFile)==0?APR_SUCCESS:APR_EOF;}
+		
+			// Returns bytes read/written, 0 if read/write fails:
+			S32 read(void* buf, S32 nbytes);
+			S32 write(const void* buf, S32 nbytes);
+		
+			tFiletype* getFileHandle() {return mFile;}	
+		
+		private:
+			static FILE* open(const std::string& filename, ndVolatileAPRPool* pool, apr_int32_t flags);
+			static apr_status_t close(FILE* file, ndVolatileAPRPool* pool) ;
+			static S32 seek(FILE* file, apr_seek_where_t where, S32 offset);
+		
+		public:
+			// returns false if failure:
+			static bool remove(const std::string& filename, ndVolatileAPRPool* pool = NULL);
+			static bool rename(const std::string& filename, const std::string& newname, ndVolatileAPRPool* pool = NULL);
+			static bool isExist(const std::string& filename, ndVolatileAPRPool* pool = NULL, apr_int32_t flags = APR_READ);
+			static S32 size(const std::string& filename, ndVolatileAPRPool* pool = NULL);
+			static bool makeDir(const std::string& dirname, ndVolatileAPRPool* pool = NULL);
+			static bool removeDir(const std::string& dirname, ndVolatileAPRPool* pool = NULL);
+		
+			// Returns bytes read/written, 0 if read/write fails:
+			static S32 readEx(const std::string& filename, void *buf, S32 offset, S32 nbytes, ndVolatileAPRPool* pool = NULL);	
+			static S32 writeEx(const std::string& filename, void *buf, S32 offset, S32 nbytes, ndVolatileAPRPool* pool = NULL); // offset<0 means append
+		//*******************************************************************************************************************************
+		};
+	}
+}
+
+int LL_COMMON_API apr_file_close( FILE* );
+int LL_COMMON_API apr_file_printf( FILE*, char const*, ... );
+int LL_COMMON_API apr_file_eof( FILE* );
+int LL_COMMON_API apr_file_gets( char*, U32, FILE* );
+int LL_COMMON_API apr_file_lock( FILE*, int );
+int LL_COMMON_API apr_file_read( FILE*, void*, U32* );
+
+namespace nd
+{
+	namespace aprhelper
+	{
+		std::string LL_COMMON_API ndConvertFilename( std::string const &aFilename );
+		char const* LL_COMMON_API ndConvertOpenFlags( apr_int32_t, std::string const& );
+
+		inline bool ndIsCreateFile( apr_int32_t aFlags) { return APR_CREATE == ( aFlags & (APR_CREATE|APR_TRUNCATE) ); }
+		inline S32 ndConvertSeekFlags( apr_seek_where_t aWhere ) { return aWhere; }
+		inline apr_status_t ndOpenFile( const std::string& aFilename, apr_int32_t aOpenflags, FILE *&aFileout, S32* aSizeout = 0);
+	}
+}
+
+#endif

indra/llcommon/ndmallocstats.cpp

@@ -72,12 +72,13 @@ namespace nd
 			memset( &sStats[0], 0, sizeof(sStats) );
 			bStarted = true;
 		}
+
 		void tearDown()
 		{ bStarted = false; }
 
 		void logAllocation( size_t aSize, nd::debugging::sEBP * aEBP )
 		{
-			if( !bStarted || 0 == aSize )
+			if( !isEnabled() )
 				return;
 
 			nd::intrin::FAA( &sStats[0]  );
@@ -160,7 +161,7 @@ namespace nd
 
 		void dumpStats( std::ostream &aOut )
 		{
-			if( 0 == sStats[0] )
+			if( !isEnabled() && 0 != sStats[0] )
 				return;
 
 #ifdef LOG_ALLOCATION_STACKS
@@ -193,5 +194,10 @@ namespace nd
 
 			aOut << " t/s (% s) " << sStats[0] << "/" << nSmallAllocs << "(" << fPercentSmall << ")";
 		}
+
+		bool isEnabled()
+		{
+			return bStarted;
+		}
 	}
 }

indra/llcommon/ndmallocstats.h

@@ -38,7 +38,9 @@ namespace nd
 
 		void logAllocation( size_t aSize, nd::debugging::sEBP * aEBP );
 		void dumpStats( std::ostream &aOut );
+
+		bool isEnabled();
 	}
 }
 
-#endif
+#endif

indra/llcommon/ndmemorypool.cpp

@@ -249,16 +249,12 @@ namespace nd
 
 		void startUp()
 		{
-			nd::allocstats::startUp();
-
 			allocPage( 0 );
 			sActive = true;
 		}
 
 		void tearDown()
 		{
-			nd::allocstats::tearDown();
-
 			sActive = false;
 
 			for( int i = 0; i < MAX_PAGES; ++i )
@@ -411,12 +407,10 @@ namespace nd
 	{
 		void startUp()
 		{
-			nd::allocstats::startUp();
 		}
 
 		void tearDown()
 		{
-			nd::allocstats::tearDown();
 		}
 
 		void *malloc( size_t aSize, size_t aAlign )

indra/llimage/llimage.cpp

@@ -1600,7 +1600,12 @@ BOOL LLImageFormatted::load(const std::string &filename, int load_size)
 	S32 file_size = 0;
 	LLAPRFile infile ;
 	infile.open(filename, LL_APR_RB, NULL, &file_size);
-	apr_file_t* apr_file = infile.getFileHandle();
+
+	// <FS:ND> Remove LLVolatileAPRPool/apr_file_t and use FILE* instead
+	// apr_file_t* apr_file = infile.getFileHandle();
+	LLAPRFile::tFiletype* apr_file = infile.getFileHandle();
+	// </FS:ND>
+
 	if (!apr_file)
 	{
 		setLastError("Unable to open file for reading", filename);

indra/llimage/llimagej2c.cpp

@@ -363,7 +363,12 @@ BOOL LLImageJ2C::loadAndValidate(const std::string &filename)
 	S32 file_size = 0;
 	LLAPRFile infile ;
 	infile.open(filename, LL_APR_RB, NULL, &file_size);
-	apr_file_t* apr_file = infile.getFileHandle() ;
+
+	// <FS:ND> Remove LLVolatileAPRPool/apr_file_t and use FILE* instead
+	// apr_file_t* apr_file = infile.getFileHandle() ;
+	LLAPRFile::tFiletype* apr_file = infile.getFileHandle() ;
+	// </FS:ND>
+
 	if (!apr_file)
 	{
 		setLastError("Unable to open file for reading", filename);

indra/llmessage/lltemplatemessagedispatcher.cpp

@@ -33,6 +33,7 @@
 #include "llsd.h"
 #include "lltemplatemessagereader.h"
 
+#include "ndexceptions.h" // <FS:ND/> For ndxran
 
 LLTemplateMessageDispatcher::LLTemplateMessageDispatcher(LLTemplateMessageReader &template_message_reader) :
 	mTemplateMessageReader(template_message_reader)
@@ -57,7 +58,13 @@ void LLTemplateMessageDispatcher::dispatch(const std::string& msg_name,
 
 	if (validate_message)
 	{
-		mTemplateMessageReader.readMessage(&(data[0]),host);
+		// <FS:ND> Handle invalid packets by throwing an exception and a graceful continue
+				
+		//		mTemplateMessageReader.readMessage(&(data[0]),host);
+		
+		try{ mTemplateMessageReader.readMessage(&(data[0]),host); }
+		catch( nd::exceptions::xran &ex ) { llwarns << ex.what() << llendl; }
+		// </FS:ND>
 	} 
 	else 
 	{

indra/llmessage/message.cpp

@@ -82,6 +82,8 @@
 #include "lltransfertargetvfile.h"
 #include "llmemtype.h"
 
+#include "ndexceptions.h" // <FS:ND/> For ndxran
+
 // Constants
 //const char* MESSAGE_LOG_FILENAME = "message.log";
 static const F32 CIRCUIT_DUMP_TIMEOUT = 30.f;
@@ -723,7 +725,15 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count )
 			if( valid_packet )
 			{
 				logValidMsg(cdp, host, recv_reliable, recv_resent, (BOOL)(acks>0) );
-				valid_packet = mTemplateMessageReader->readMessage(buffer, host);
+
+				// <FS:ND> Handle invalid packets by throwing an exception and a graceful continue
+				
+				// valid_packet = mTemplateMessageReader->readMessage(buffer, host);
+				
+				try { valid_packet = mTemplateMessageReader->readMessage(buffer, host); }
+				catch( nd::exceptions::xran &ex ) { llwarns << ex.what() << llendl; }
+
+				// </FS:ND>
 			}
 
 			// It's possible that the circuit went away, because ANY message can disable the circuit

indra/llrender/llshadermgr.cpp

@@ -541,11 +541,12 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 	}
 	
 	// <FS:ND> Don't recompile shaders if it is already loaded.
-	if( mShaderObjects.end() != mShaderObjects.find(filename) )
-	{
-		LL_INFOS("ShaderLoading") << "Reusing compiled shader for " << filename << LL_ENDL;
-		return mShaderObjects[ filename ];
-	}
+	// <FS:TM> recompile for now to test some issues
+	//if( mShaderObjects.end() != mShaderObjects.find(filename) )
+	//{
+	//	LL_INFOS("ShaderLoading") << "Reusing compiled shader for " << filename << LL_ENDL;
+	//	return mShaderObjects[ filename ];
+	//}
 	// </FS:ND>
 
 	//read in from file
@@ -713,9 +714,12 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 
 			// text[count++] = strdup("VARYING_FLAT int vary_texture_index;\n");
 			
+			// <FS:TS> This causes shader link failures on 64-bit Linux
+#if !(LL_GNUC && ( defined(__amd64__) || defined(__x86_64__) ) )
 			if( gGLManager.mIsATI )
 				text[count++] = strdup("VARYING int vary_texture_index;\n");
 			else
+#endif
 				text[count++] = strdup("VARYING_FLAT int vary_texture_index;\n");
 
 			// </FS:ND>

indra/llui/lllayoutstack.cpp

@@ -297,12 +297,21 @@ void LLLayoutStack::removeChild(LLView* view)
 	if (embedded_panelp)
 	{
 		mPanels.erase(std::find(mPanels.begin(), mPanels.end(), embedded_panelp));
-		delete embedded_panelp;
+		// delete embedded_panelp;	// <FS:Zi> Fix crash when removing layout panels from a stack
 		updateFractionalSizes();
 		mNeedsLayout = true;
 	}
 
 	LLView::removeChild(view);
+
+	// <FS:Zi> Fix crash when removing layout panels from a stack
+	if (embedded_panelp)
+	{
+		// only delete the panel after it was removed from LLView to prevent
+		// LLView::removeChild() to run into an already deleted pointer
+		delete embedded_panelp;
+	}
+	// </FS:Zi>
 }
 
 BOOL LLLayoutStack::postBuild()

indra/newview/CMakeLists.txt

@@ -125,7 +125,7 @@ set(viewer_SOURCE_FILES
     fsfloatergroup.cpp
     fsfloaterplacedetails.cpp
     fsfloaterprofile.cpp
-    fsfloatersearchlegacy.cpp
+    fsfloatersearch.cpp
     fsfloaterteleporthistory.cpp
     fsfloaterwsassetblacklist.cpp
     fsgrouptitles.cpp
@@ -772,7 +772,7 @@ set(viewer_HEADER_FILES
     fsfloatergroup.h
     fsfloaterplacedetails.h
     fsfloaterprofile.h
-    fsfloatersearchlegacy.h
+    fsfloatersearch.h
     fsfloaterteleporthistory.h
     fsfloaterwsassetblacklist.h
     fsgridhandler.h

indra/newview/app_settings/commands.xml

@@ -209,9 +209,9 @@
            label_ref="Command_Search_Label"
            tooltip_ref="Command_Search_Tooltip"
            execute_function="Floater.Toggle"
-           execute_parameters="search"
+           execute_parameters="search_legacy"
            is_running_function="Floater.IsOpen"
-           is_running_parameters="search"
+           is_running_parameters="search_legacy"
            />
   <command name="snapshot"
            available_in_toybox="true"
@@ -429,14 +429,4 @@
            execute_function="View.Mouselook"
            is_enabled_function="View.EnableMouselook"
            />
-  <command name="legacy_search"
-           available_in_toybox="true"
-           icon="lsearch"
-           label_ref="Command_Legacy_Search_Label"
-           tooltip_ref="Command_Legacy_Search_Tooltip"
-           execute_function="Floater.Toggle"
-           execute_parameters="search_legacy"
-           is_running_function="Floater.IsOpen"
-           is_running_parameters="search_legacy"
-           />
 </commands>

indra/newview/app_settings/grids.fallback.xml

@@ -135,6 +135,42 @@
         <key>slurl_base</key>
             <string>hop://grid01.from-ne.com:8002/</string>
         </map>
+    <key>islandoasisgrid.biz:8002</key>
+        <map>
+        <key>LastModified</key>
+            <date>2013-01-21T20:10:35.17Z</date>
+        <key>about</key>
+            <string>http://www.islandoasis.biz/GridStats.aspx</string>
+        <key>gridname</key>
+            <string>Island Oasis</string>
+        <key>gridnick</key>
+            <string>Island_Oasis</string>
+        <key>help</key>
+            <string>http://www.islandoasis.biz/Support.aspx</string>
+        <key>helperuri</key>
+            <string>http://islandoasisgrid:8020/OsCurrency/</string>
+        <key>login_identifier_types</key>
+            <array>
+                <string>agent</string>
+                <string>account</string>
+            </array>
+        <key>loginpage</key>
+            <string>http://www.islandoasis.biz/welcome.aspx</string>
+        <key>loginuri</key>
+            <array>
+                <string>http://islandoasisgrid.biz:8002/</string>
+            </array>
+        <key>name</key>
+            <string>islandoasisgrid.biz:8002</string>
+        <key>password</key>
+            <string>http://www.islandoasis.biz/Login.aspx</string>
+        <key>platform</key>
+            <string>OpenSim</string>
+        <key>register</key>
+            <string>http://www.islandoasis.biz/verification.aspx</string>
+        <key>slurl_base</key>
+            <string>hop://islandoasisgrid.biz:8002/</string>
+        </map>
     <key>localhost:9000</key>
         <map>
         <key>LastModified</key>

indra/newview/app_settings/keywords.ini

@@ -289,6 +289,8 @@ ATTACH_LLLEG		Passed to llAttachToAvatar to attach task to left lower leg
 ATTACH_BELLY		Passed to llAttachToAvatar to attach task to belly
 ATTACH_LEFT_PEC		Passed to llAttachToAvatar to attach task to left pectoral
 ATTACH_RIGHT_PEC	Passed to llAttachToAvatar to attach task to right pectoral
+ATTACH_NECK			Passed to llAttachToAvatar to attach task to neck
+ATTACH_AVATAR_CENTER	Passed to llAttachToAvatar to attach task to avatar center
 ATTACH_BRIDGE		Passed to llAttachToAvatar to attach task to bridge
 ATTACH_HUD_BOTTOM	Passed to llAttachToAvatar to attach task to bottom hud area
 ATTACH_HUD_BOTTOM_LEFT	Passed to llAttachToAvatar to attach task to bottom left hud area

indra/newview/app_settings/quick_preferences.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<quickprefs>
+    <entries
+     control_name="RenderFarClip"
+     control_type="3"
+     increment="8"
+     integer="1"
+     label="Draw Distance"
+     max="1024"
+     min="32" />
+    <entries
+     control_name="RenderMaxPartCount"
+     control_type="3"
+     increment="256"
+     integer="1"
+     label="Max Particles"
+     max="8192"
+     min="0" />
+    <entries
+     control_name="RenderAvatarPhysicsLODFactor"
+     control_type="3"
+     increment="0.05"
+     integer="0"
+     label="Avatar Physics LOD"
+     max="1"
+     min="0" />
+    <entries
+     control_name="RenderVolumeLODFactor"
+     control_type="3"
+     increment="0.125"
+     integer="0"
+     label="LOD Factor"
+     max="4"
+     min="0" />
+    <entries
+     control_name="RenderAvatarMaxVisible"
+     control_type="3"
+     increment="1"
+     integer="1"
+     label="Max Avatars"
+     max="65"
+     min="0" />
+    <entries
+     control_name="AvatarZOffset"
+     control_type="3"
+     increment="0.05"
+     integer="0"
+     label="Height Offset"
+     max="2"
+     min="-2" />
+    <entries
+     control_name="FSNameTagZOffsetCorrection"
+     control_type="3"
+     increment="1"
+     integer="1"
+     label="Tags Offset"
+     max="5"
+     min="-5" />
+    <entries
+     control_name="AvatarNameTagMode"
+     control_type="4"
+     increment="0"
+     integer="0"
+     label="Name Tags"
+     max="2"
+     min="0" />
+    <entries
+     control_name="DebugLookAt"
+     control_type="4"
+     increment="0"
+     integer="0"
+     label="LookAt Target"
+     max="1"
+     min="0" />
+    <entries
+     control_name="DebugShowColor"
+     control_type="4"
+     increment="0"
+     integer="0"
+     label="Color Under Cursor"
+     max="1"
+     min="0" />
+</quickprefs>

indra/newview/app_settings/settings.xml

@@ -3100,7 +3100,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>10.0</real>
+    <real>20.0</real>
   </map>
 
   <key>CameraFNumber</key>
@@ -10587,7 +10587,7 @@ Change of this parameter will affect the layout of buttons in notification toast
   <key>RenderDepthOfField</key>
   <map>
     <key>Comment</key>
-    <string>Whether to use depth of field effect when lighting and shadows are enabled</string>
+    <string>Whether to use depth of field effect when Deferred Rendering is enabled</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -10605,13 +10605,13 @@ Change of this parameter will affect the layout of buttons in notification toast
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>0.7</real>
+    <real>0.5</real>
   </map>
 
   <key>RenderSpotLightsInNondeferred</key>
   <map>
     <key>Comment</key>
-    <string>Whether to support projectors as spotlights when Lighting and Shadows is disabled</string>
+    <string>Whether to support projectors as spotlights when Deferred Rendering is disabled</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -11014,7 +11014,7 @@ Change of this parameter will affect the layout of buttons in notification toast
     <key>RenderAutoMaskAlphaNonDeferred</key>
     <map>
       <key>Comment</key>
-      <string>Use alpha masks where appropriate, in the non-deferred (non-'Lighting and Shadows') graphics mode</string>
+      <string>Use alpha masks where appropriate, in the non-deferred rendering graphics mode</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -11025,7 +11025,7 @@ Change of this parameter will affect the layout of buttons in notification toast
     <key>RenderAutoMaskAlphaDeferred</key>
     <map>
       <key>Comment</key>
-      <string>Use alpha masks where appropriate, in the deferred ('Lighting and Shadows') graphics mode</string>
+      <string>Use alpha masks where appropriate, in the deferred rendering graphics mode</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -18737,6 +18737,32 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <string />
     </map>
+    <key>FSSkinCurrentReadableName</key>
+    <map>
+      <key>Comment</key>
+      <string>The readable name of the currently selected skin.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>HideFromEditor</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>Firestorm</string>
+    </map>
+  <key>FSSkinCurrentThemeReadableName</key>
+    <map>
+      <key>Comment</key>
+      <string>The readable name of the selected theme for the current skin.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>HideFromEditor</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>Grey</string>
+    </map>
   <key>FSMaxMeshRequestsPerSecond</key>
   <map>
     <key>Comment</key>
@@ -19765,6 +19791,31 @@ Change of this parameter will affect the layout of buttons in notification toast
         <integer>0</integer>
     </map>
 
+    <!-- <FS:Zi> Dynamic Quickprefs -->
+    <key>QuickPrefsEditMode</key>
+    <map>
+      <key>Comment</key>
+      <string>Internal, volatile control that defines if the quickprefs floater is in edit mode.</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>QuickPrefsSelectedControl</key>
+    <map>
+      <key>Comment</key>
+	  <string>Internal, volatile control that holds the currently selected control. Used for enabling/disabling editor widgets.</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+	  <string />
+    </map>
+    <!-- </FS:Zi> -->
+
     <!-- <FS:Zi> Backup Settings -->
     <key>SettingsBackupPath</key>
     <map>
@@ -19802,5 +19853,42 @@ Change of this parameter will affect the layout of buttons in notification toast
 	  <integer>1</integer>
     </map>
     <!-- <FS:Zi> -->
+    <!-- <FS:Cron> FIRE-8882 -->
+    <key>FSSnapDomain</key>
+    <map>
+        <key>Comment</key>
+        <string>Direction of snap lines (0 = outside of boundary, 1 = inside boundary)</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>U32</string>
+        <key>Value</key>
+        <real>0</real>
+    </map>
+    <!-- </FS:Cron> -->
+    <key>FSLastSearchTab</key>
+    <map>
+		<key>Comment</key>
+		<string>Last selected tab in search window</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>S32</string>
+		<key>Value</key>
+		<integer>0</integer>
+		<key>Backup</key>
+		<integer>0</integer>
+    </map>
+    <key>FSCloudTexture</key>
+    <map>
+        <key>Comment</key>
+        <string>Windlight cloud texture (don't edit by hand)</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>String</string>
+        <key>Value</key>
+        <string>Default.tga</string>
+    </map>
 </map>
 </llsd>

indra/newview/app_settings/settings_files.xml

@@ -13,6 +13,11 @@
     <file name="Warnings"
           file_name="ignorable_dialogs.xml"
           required="true"/>
+    <!-- <FS:Zi> Dynamic quick prefs -->
+    <file name="QuickPreferences"
+          file_name="quick_preferences.xml"
+          required="false"/>
+    <!-- </FS:Zi> -->
   </group>
   <group name="User"
          path_index="1">

indra/newview/app_settings/settings_firestorm.xml

@@ -95,6 +95,34 @@
     <string>grey</string>
   </map>
 
+  <key>FSSkinCurrentReadableName</key>
+  <map>
+    <key>Comment</key>
+    <string>The readable name of the currently selected skin.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>HideFromEditor</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>Firestorm</string>
+  </map>
+
+  <key>FSSkinCurrentThemeReadableName</key>
+  <map>
+    <key>Comment</key>
+    <string>The readable name of the selected theme for the current skin.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>HideFromEditor</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>Grey</string>
+  </map>
+
   <key>LetterKeysFocusChatBar</key>
   <map>
     <key>Comment</key>

indra/newview/app_settings/settings_hybrid.xml

@@ -83,6 +83,34 @@
     <string>cool_ocean</string>
   </map>
 
+  <key>FSSkinCurrentReadableName</key>
+  <map>
+    <key>Comment</key>
+    <string>The readable name of the currently selected skin.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>HideFromEditor</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>Metaharper Modern</string>
+  </map>
+
+  <key>FSSkinCurrentThemeReadableName</key>
+  <map>
+    <key>Comment</key>
+    <string>The readable name of the selected theme for the current skin.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>HideFromEditor</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>CoolOcean</string>
+  </map>
+
   <key>LetterKeysFocusChatBar</key>
   <map>
     <key>Comment</key>

indra/newview/app_settings/settings_phoenix.xml

@@ -83,6 +83,34 @@
     <string>classic</string>
   </map>
 
+  <key>FSSkinCurrentReadableName</key>
+  <map>
+    <key>Comment</key>
+    <string>The readable name of the currently selected skin.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>HideFromEditor</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>Vintage</string>
+  </map>
+
+  <key>FSSkinCurrentThemeReadableName</key>
+  <map>
+    <key>Comment</key>
+    <string>The readable name of the selected theme for the current skin.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>HideFromEditor</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>Classic</string>
+  </map>
+
   <key>LetterKeysFocusChatBar</key>
   <map>
     <key>Comment</key>

indra/newview/app_settings/settings_v3.xml

@@ -95,6 +95,34 @@
     <string>original_orange</string>
   </map>
 
+  <key>FSSkinCurrentReadableName</key>
+  <map>
+    <key>Comment</key>
+    <string>The readable name of the currently selected skin.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>HideFromEditor</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>Starlight</string>
+  </map>
+
+  <key>FSSkinCurrentThemeReadableName</key>
+  <map>
+    <key>Comment</key>
+    <string>The readable name of the selected theme for the current skin.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>HideFromEditor</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>Original Orange</string>
+  </map>
+
   <key>LetterKeysFocusChatBar</key>
   <map>
     <key>Comment</key>

indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl

@@ -72,24 +72,23 @@ void main()
 	vec3 pos = getPosition(tc).xyz;
 	vec4 ccol = texture2DRect(lightMap, tc).rgba;
 	
-	vec2 dlt = kern_scale * delta / (1.0+norm.xy*norm.xy);
+	vec2 dlt = kern_scale * delta / (vec2(1.0)+norm.xy*norm.xy);
 	dlt /= max(-pos.z*dist_factor, 1.0);
 	
 	vec2 defined_weight = getKern(0).xy; // special case the first (centre) sample's weight in the blur; we have to sample it anyway so we get it for 'free'
 	vec4 col = defined_weight.xyxx * ccol;
 
 	// relax tolerance according to distance to avoid speckling artifacts, as angles and distances are a lot more abrupt within a small screen area at larger distances
-	float pointplanedist_tolerance_pow2 = pos.z*pos.z*0.00005;
+	float pointplanedist_tolerance_pow2 = pos.z*-0.001;
 
 	// perturb sampling origin slightly in screen-space to hide edge-ghosting artifacts where smoothing radius is quite large
-	float tc_mod = 0.5*(tc.x + tc.y); // mod(tc.x+tc.y,2)
-	tc_mod -= floor(tc_mod);
-	tc_mod *= 2.0;
+	vec2 tc_v = fract(0.5 * tc.xy); // we now have floor(mod(tc,2.0))*0.5
+	float tc_mod = 2.0 * abs(tc_v.x - tc_v.y); // diff of x,y makes checkerboard
 	tc += ( (tc_mod - 0.5) * getKern(1).z * dlt * 0.5 );
 
 	for (int i = 1; i < 4; i++)
 	{
-		vec2 samptc = tc + getKern(i).z*dlt;
+	  vec2 samptc = (tc + getKern(i).z * dlt);
 	        vec3 samppos = getPosition(samptc).xyz; 
 		float d = dot(norm.xyz, samppos.xyz-pos.xyz);// dist from plane
 		if (d*d <= pointplanedist_tolerance_pow2)
@@ -100,7 +99,7 @@ void main()
 	}
 	for (int i = 1; i < 4; i++)
 	{
-		vec2 samptc = tc - getKern(i).z*dlt;
+	  vec2 samptc = (tc - getKern(i).z * dlt);
 	        vec3 samppos = getPosition(samptc).xyz; 
 		float d = dot(norm.xyz, samppos.xyz-pos.xyz);// dist from plane
 		if (d*d <= pointplanedist_tolerance_pow2)
@@ -111,7 +110,7 @@ void main()
 	}
 
 	col /= defined_weight.xyxx;
-	col.y *= col.y;
+	col.y *= col.y; // delinearize SSAO effect post-blur
 	
 	frag_color = col;
 }

indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl

@@ -75,23 +75,20 @@ void dofSampleNear(inout vec4 diff, inout float w, float min_sc, vec2 tc)
 
 void main() 
 {
-	vec2 tc = vary_fragcoord.xy;
-	
 	vec4 diff = texture2DRect(diffuseRect, vary_fragcoord.xy);
 	
 	{ 
-		float w = 1.0;
-		
 		float sc = (diff.a*2.0-1.0)*max_cof;
+		float w = 1.0;
 			
-		float PI = 3.14159265358979323846264;
+		const float PI = 3.14159265358979323846264;
 
 		// sample quite uniformly spaced points within a circle, for a circular 'bokeh'		
 		if (sc > 0.5)
 		{
 			while (sc > 0.5)
 			{
-				int its = int(max(1.0,(sc*3.7)));
+				int its = int(max(1.0,(sc*PI)));
 				for (int i=0; i<its; ++i)
 				{
 					float ang = sc+i*2*PI/its; // sc is added for rotary perturbance
@@ -100,7 +97,7 @@ void main()
 					// you could test sample coords against an interesting non-circular aperture shape here, if desired.
 					dofSampleNear(diff, w, sc, vary_fragcoord.xy + vec2(samp_x,samp_y));
 				}
-				sc -= 1.0;
+				sc -= 2.0;
 			}
 		}
 		else if (sc < -0.5)
@@ -108,7 +105,7 @@ void main()
 			sc = abs(sc);
 			while (sc > 0.5)
 			{
-				int its = int(max(1.0,(sc*3.7)));
+			  int its = int(max(1.0,(sc*PI)));
 				for (int i=0; i<its; ++i)
 				{
 					float ang = sc+i*2*PI/its; // sc is added for rotary perturbance
@@ -117,7 +114,7 @@ void main()
 					// you could test sample coords against an interesting non-circular aperture shape here, if desired.
 					dofSample(diff, w, sc, vary_fragcoord.xy + vec2(samp_x,samp_y));
 				}
-				sc -= 1.0;
+				sc -= 2.0;
 			}
 		}
 

indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl

@@ -203,6 +203,13 @@ void calcAtmospherics(vec3 inPositionEye, float ambFactor) {
 	//increase ambient when there are more clouds
 	vec4 tmpAmbient = ambient + (vec4(1.) - ambient) * cloud_shadow * 0.5;
 	
+
+	//haze color
+	setAdditiveColor(
+		vec3(blue_horizon * blue_weight * (sunlight*(1.-cloud_shadow) + tmpAmbient)
+	  + (haze_horizon * haze_weight) * (sunlight*(1.-cloud_shadow) * temp2.x
+		  + tmpAmbient)));
+
 	/*  decrease value and saturation (that in HSV, not HSL) for occluded areas
 	 * // for HSV color/geometry used here, see http://gimp-savvy.com/BOOK/index.html?node52.html
 	 * // The following line of code performs the equivalent of:
@@ -213,12 +220,6 @@ void calcAtmospherics(vec3 inPositionEye, float ambFactor) {
 	 */
 	tmpAmbient = vec4(mix(ssao_effect_mat * tmpAmbient.rgb, tmpAmbient.rgb, ambFactor), tmpAmbient.a);
 
-	//haze color
-	setAdditiveColor(
-		vec3(blue_horizon * blue_weight * (sunlight*(1.-cloud_shadow) + tmpAmbient)
-	  + (haze_horizon * haze_weight) * (sunlight*(1.-cloud_shadow) * temp2.x
-		  + tmpAmbient)));
-
 	//brightness of surface both sunlight and ambient
 	setSunlitColor(vec3(sunlight * .5));
 	setAmblitColor(vec3(tmpAmbient * .25));

indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl

@@ -62,11 +62,8 @@ vec4 getPosition(vec2 pos_screen)
 	return pos;
 }
 
-//calculate decreases in ambient lighting when crowded out (SSAO)
-float calcAmbientOcclusion(vec4 pos, vec3 norm)
+vec2 getKern(int i)
 {
-	float ret = 1.0;
-	
 	vec2 kern[8];
 	// exponentially (^2) distant occlusion samples spread around origin
 	kern[0] = vec2(-1.0, 0.0) * 0.125*0.125;
@@ -78,40 +75,54 @@ float calcAmbientOcclusion(vec4 pos, vec3 norm)
 	kern[6] = vec2(-0.7071, 0.7071) * 0.875*0.875;
 	kern[7] = vec2(0.7071, -0.7071) * 1.000*1.000;
 
+	return kern[i];
+}
+
+//calculate decreases in ambient lighting when crowded out (SSAO)
+float calcAmbientOcclusion(vec4 pos, vec3 norm)
+{
 	vec2 pos_screen = vary_fragcoord.xy;
 	vec3 pos_world = pos.xyz;
 	vec2 noise_reflect = texture2D(noiseMap, vary_fragcoord.xy/128.0).xy;
 		
+  // We treat the first sample as the origin, which definitely doesn't obscure itself thanks to being visible for sampling in the first place.
+  float points = 1.0;
 	float angle_hidden = 0.0;
-	int points = 0;
 		
-	float scale = min(ssao_radius / -pos_world.z, ssao_max_radius);
+  // use a kernel scale that diminishes with distance.
+  // a scale of less than 32 is just wasting good samples, though.
+  float scale = max(32.0, min(ssao_radius / -pos.z, ssao_max_radius));
 		
-	// it was found that keeping # of samples a constant was the fastest, probably due to compiler optimizations unrolling?)
+  // it was found that keeping # of samples a constant was the fastest, probably due to compiler optimizations (unrolling?)
 	for (int i = 0; i < 8; i++)
 	{
-		vec2 samppos_screen = pos_screen + scale * reflect(kern[i], noise_reflect);
-		vec3 samppos_world = getPosition(samppos_screen).xyz; 
+    vec2 samppos_screen = pos_screen + scale * reflect(getKern(i), noise_reflect);
 			
-		vec3 diff = pos_world - samppos_world;
-		float dist2 = dot(diff, diff);
+    // if sample is out-of-screen then give it no weight by continuing
+    if (any(lessThan(samppos_screen.xy, vec2(0.0, 0.0))) ||
+       any(greaterThan(samppos_screen.xy, vec2(screen_res.xy)))) continue;
 			
-		// assume each sample corresponds to an occluding sphere with constant radius, constant x-sectional area
-		// --> solid angle shrinking by the square of distance
-		//radius is somewhat arbitrary, can approx with just some constant k * 1 / dist^2
-		//(k should vary inversely with # of samples, but this is taken care of later)
+    vec3 samppos_world = getPosition(samppos_screen).xyz; 
 			
-		angle_hidden = angle_hidden + float(dot((samppos_world - 0.05*norm - pos_world), norm) > 0.0) * min(1.0/dist2, ssao_factor_inv);
+    vec3 diff = samppos_world - pos.xyz;
 			
-		// 'blocked' samples (significantly closer to camera relative to pos_world) are "no data", not "no occlusion" 
-		points = points + int(diff.z > -1.0);
+    if (diff.z < ssao_factor && diff.z != 0.0)
+    {
+	float dist = length(diff);
+	float angrel = max(0.0, dot(norm.xyz, diff/dist));
+	float distrel = 1.0/(1.0+dist*dist);
+	float samplehidden = min(angrel, distrel);
+
+	angle_hidden += (samplehidden);
+	points += 1.0;
+      }
 	}
 		
-	angle_hidden = min(ssao_factor*angle_hidden/float(points), 1.0);
+  angle_hidden /= points;
 		
-	ret = (1.0 - (float(points != 0) * angle_hidden));
+  float rtn = (1.0 - angle_hidden);
 	
-	return min(ret, 1.0);
+  return (rtn * rtn);
 }
 
 void main() 

indra/newview/app_settings/shaders/class1/deferred/waterF.glsl

@@ -151,8 +151,8 @@ void main()
 	//spec *= shadow;
 	//color.rgb += spec * specular;
 	
-	//color.rgb = atmosTransport(color.rgb);
-	//color.rgb = scaleSoftClip(color.rgb);
+	color.rgb = atmosTransport(color.rgb);
+	color.rgb = scaleSoftClip(color.rgb);
 	//color.a = spec * sunAngle2;
 
 	//wavef.z *= 0.1f;

indra/newview/app_settings/shaders/class1/deferred/waterV.glsl

@@ -85,7 +85,7 @@ void main()
 	pos.w = 1.0;
 	pos = modelview_matrix*pos;
 	
-	calcAtmospherics(pos.xyz);
+	calcAtmospherics(view.xyz);
 		
 	//pass wave parameters to pixel shader
 	vec2 bigWave =  (v.xy) * vec2(0.04,0.04)  + d1 * time * 0.055;

indra/newview/app_settings/shaders/class1/environment/waterV.glsl

@@ -81,8 +81,7 @@ void main()
 	pos.w = 1.0;
 	pos = modelview_matrix*pos;
 	
-	calcAtmospherics(pos.xyz);
-	
+	calcAtmospherics(view.xyz);
 	
 	//pass wave parameters to pixel shader
 	vec2 bigWave =  (v.xy) * vec2(0.04,0.04)  + d1 * time * 0.055;

indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl

@@ -205,7 +205,13 @@ void calcAtmospherics(vec3 inPositionEye, float ambFactor) {
 	//increase ambient when there are more clouds
 	vec4 tmpAmbient = ambient + (vec4(1.) - ambient) * cloud_shadow * 0.5;
 	
-	/*  decrease value and saturation (that in HSV, not HSL) for occluded areas
+	//haze color
+	setAdditiveColor(
+		vec3(blue_horizon * blue_weight * (sunlight*(1.-cloud_shadow) + tmpAmbient)
+	  + (haze_horizon * haze_weight) * (sunlight*(1.-cloud_shadow) * temp2.x
+		  + tmpAmbient)));
+
+         /*  decrease value and saturation (that in HSV, not HSL) for occluded areas
 	 * // for HSV color/geometry used here, see http://gimp-savvy.com/BOOK/index.html?node52.html
 	 * // The following line of code performs the equivalent of:
 	 * float ambAlpha = tmpAmbient.a;
@@ -215,12 +221,6 @@ void calcAtmospherics(vec3 inPositionEye, float ambFactor) {
 	 */
 	tmpAmbient = vec4(mix(ssao_effect_mat * tmpAmbient.rgb, tmpAmbient.rgb, ambFactor), tmpAmbient.a);
 
-	//haze color
-	setAdditiveColor(
-		vec3(blue_horizon * blue_weight * (sunlight*(1.-cloud_shadow) + tmpAmbient)
-	  + (haze_horizon * haze_weight) * (sunlight*(1.-cloud_shadow) * temp2.x
-		  + tmpAmbient)));
-
 	//brightness of surface both sunlight and ambient
 	setSunlitColor(vec3(sunlight * .5));
 	setAmblitColor(vec3(tmpAmbient * .25));

indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl

@@ -98,62 +98,68 @@ vec2 getKern(int i)
 //calculate decreases in ambient lighting when crowded out (SSAO)
 float calcAmbientOcclusion(vec4 pos, vec3 norm)
 {
-	float ret = 1.0;
-
 	vec2 pos_screen = vary_fragcoord.xy;
-	vec3 pos_world = pos.xyz;
 	vec2 noise_reflect = texture2D(noiseMap, vary_fragcoord.xy/128.0).xy;
 		
+  // We treat the first sample as the origin, which definitely doesn't obscure itself thanks to being visible for sampling in the first place.
+  float points = 1.0;
 	float angle_hidden = 0.0;
-	float points = 0;
 		
-	float scale = min(ssao_radius / -pos_world.z, ssao_max_radius);
+  // use a kernel scale that diminishes with distance.
+  // a scale of less than 32 is just wasting good samples, though.
+  float scale = max(32.0, min(ssao_radius / -pos.z, ssao_max_radius));
 	
 	// it was found that keeping # of samples a constant was the fastest, probably due to compiler optimizations (unrolling?)
 	for (int i = 0; i < 8; i++)
 	{
 		vec2 samppos_screen = pos_screen + scale * reflect(getKern(i), noise_reflect);
+
+    // if sample is out-of-screen then give it no weight by continuing
+    if (any(lessThan(samppos_screen.xy, vec2(0.0, 0.0))) ||
+	any(greaterThan(samppos_screen.xy, vec2(screen_res.xy)))) continue;
+
 		vec3 samppos_world = getPosition(samppos_screen).xyz; 
 		
-		vec3 diff = pos_world - samppos_world;
-		float dist2 = dot(diff, diff);
+    vec3 diff = samppos_world - pos.xyz;
 			
-		// assume each sample corresponds to an occluding sphere with constant radius, constant x-sectional area
-		// --> solid angle shrinking by the square of distance
-		//radius is somewhat arbitrary, can approx with just some constant k * 1 / dist^2
-		//(k should vary inversely with # of samples, but this is taken care of later)
+    if (diff.z < ssao_factor // only use sample if it's near enough
+	&& diff.z != 0.0     // Z is very quantized at distance, this lessens noise and eliminates dist==0
+	)
+    {
+	float dist = length(diff);
+	float angrel = max(0.0, dot(norm.xyz, diff/dist)); // how much the origin faces the sample
+	float distrel = 1.0/(1.0+dist*dist); // 'closeness' of origin to sample
 		
-		float funky_val = (dot((samppos_world - 0.05*norm - pos_world), norm) > 0.0) ? 1.0 : 0.0;
-		angle_hidden = angle_hidden + funky_val * min(1.0/dist2, ssao_factor_inv);
+	// origin is obscured by this sample according to how directly the origin is facing the sample and how close the sample is.  It has to score high on both to be a good occluder.  (a*d) seems the most intuitive way to score, but min(a,d) gives a less localized effect...
+	float samplehidden = min(angrel, distrel);
 			
-		// 'blocked' samples (significantly closer to camera relative to pos_world) are "no data", not "no occlusion" 
-		float diffz_val = (diff.z > -1.0) ? 1.0 : 0.0;
-		points = points + diffz_val;
+	angle_hidden += (samplehidden);
+	points += 1.0;
+      }
 	}
 		
-	angle_hidden = min(ssao_factor*angle_hidden/points, 1.0);
+  angle_hidden = angle_hidden / points;
 	
-	float points_val = (points > 0.0) ? 1.0 : 0.0;
-	ret = (1.0 - (points_val * angle_hidden));
+  float rtn = (1.0 - angle_hidden);
 
-	ret = max(ret, 0.0);
-	return min(ret, 1.0);
+  return (rtn * rtn);
 }
 
 float pcfShadow(sampler2DShadow shadowMap, vec4 stc, float scl, vec2 pos_screen)
 {
+        vec2 recip_shadow_res = 1.0 / shadow_res.xy;
 	stc.xyz /= stc.w;
 	stc.z += shadow_bias;
 
-	stc.x = floor(stc.x*shadow_res.x + fract(pos_screen.y*0.666666666))/shadow_res.x;
+	stc.x = floor(stc.x*shadow_res.x + fract(pos_screen.y*0.666666666)) * recip_shadow_res.x;
 	float cs = shadow2D(shadowMap, stc.xyz).x;
 	
 	float shadow = cs;
 	
-	shadow += shadow2D(shadowMap, stc.xyz+vec3(2.0/shadow_res.x, 1.5/shadow_res.y, 0.0)).x;
-    shadow += shadow2D(shadowMap, stc.xyz+vec3(1.0/shadow_res.x, -1.5/shadow_res.y, 0.0)).x;
-    shadow += shadow2D(shadowMap, stc.xyz+vec3(-1.0/shadow_res.x, 1.5/shadow_res.y, 0.0)).x;
-    shadow += shadow2D(shadowMap, stc.xyz+vec3(-2.0/shadow_res.x, -1.5/shadow_res.y, 0.0)).x;
+	shadow += shadow2D(shadowMap, stc.xyz+vec3(2.0*recip_shadow_res.x, 1.5*recip_shadow_res.y, 0.0)).x;
+	shadow += shadow2D(shadowMap, stc.xyz+vec3(1.0*recip_shadow_res.x, -1.5*recip_shadow_res.y, 0.0)).x;
+	shadow += shadow2D(shadowMap, stc.xyz+vec3(-1.0*recip_shadow_res.x, 1.5*recip_shadow_res.y, 0.0)).x;
+	shadow += shadow2D(shadowMap, stc.xyz+vec3(-2.0*recip_shadow_res.x, -1.5*recip_shadow_res.y, 0.0)).x;
 	         
         return shadow*0.2;
 }
@@ -167,8 +173,7 @@ float pcfSpotShadow(sampler2DShadow shadowMap, vec4 stc, float scl, vec2 pos_scr
 	float cs = shadow2D(shadowMap, stc.xyz).x;
 	float shadow = cs;
 
-	vec2 off = 1.0/proj_shadow_res;
-	off.y *= 1.5;
+	vec2 off = vec2(1.0, 1.5) / proj_shadow_res.xy;
 	
 	shadow += shadow2D(shadowMap, stc.xyz+vec3(off.x*2.0, off.y, 0.0)).x;
 	shadow += shadow2D(shadowMap, stc.xyz+vec3(off.x, -off.y, 0.0)).x;

indra/newview/app_settings/windlight/skies/Nacon%27s%20Afternoon.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.77999997138977051</real>
+            <real>0.77999997138977051</real>
+            <real>0.77999997138977051</real>
+            <real>0.25999999046325684</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0</real>
+            <real>2</real>
+            <real>2</real>
+            <real>2</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.2800000011920929</real>
+            <real>0.44679245352745056</real>
+            <real>0.56000000238418579</real>
+            <real>0.56000000238418579</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.14424242079257965</real>
+            <real>0.14424242079257965</real>
+            <real>0.17000000178813934</real>
+            <real>0.17000000178813934</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>0.76999998092651367</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>0.08999999612569809</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.949999809265137</real>
+            <real>10.659999847412109</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.25</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>2.9999999242136255e-005</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>2</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>2.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.19999980926513672</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.59999996423721313</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>1</real>
+            <real>-4.3711388286737929e-008</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>4000</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>21</integer>
+    <key>star_brightness</key>
+        <real>0.22999998927116394</real>
+    <key>sun_angle</key>
+        <real>1.5707963705062866</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.14999999105930328</real>
+            <real>0.099999994039535522</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Dawn.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.44999998807907104</real>
+            <real>0.44999998807907104</real>
+            <real>0.44999998807907104</real>
+            <real>0.14999999105930328</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.19999998807907104</real>
+            <real>1</real>
+            <real>2</real>
+            <real>2</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>1.8600000143051147</real>
+            <real>0.44679245352745056</real>
+            <real>0.3139621913433075</real>
+            <real>1.8600000143051147</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0.070000000298023224</real>
+            <real>0</real>
+            <real>0.14000000059604645</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>0.08999999612569809</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.949999809265137</real>
+            <real>10.659999847412109</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.19999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>7.9999997979030013e-005</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>100</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>2.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.19999980926513672</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.59999996423721313</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.5699999332427979</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.32094338536262512</real>
+            <real>-0.94709837436676025</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>4000</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>21</integer>
+    <key>star_brightness</key>
+        <real>0.22999998927116394</real>
+    <key>sun_angle</key>
+        <real>2.8148672580718994</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.08999999612569809</real>
+            <real>0.08999999612569809</real>
+            <real>0.044999998062849045</real>
+            <real>0.029999999329447746</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Day%20Mood.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.44999998807907104</real>
+            <real>0.44999998807907104</real>
+            <real>0.44999998807907104</real>
+            <real>0.14999999105930328</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>1</real>
+            <real>2</real>
+            <real>2</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.63999998569488525</real>
+            <real>0.44679245352745056</real>
+            <real>0.3139621913433075</real>
+            <real>0.31999999284744263</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0.070000000298023224</real>
+            <real>0</real>
+            <real>0.14000000059604645</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>0.08999999612569809</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.949999809265137</real>
+            <real>10.659999847412109</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.17999999225139618</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>2.9999999242136255e-005</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>2</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>2.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.19999980926513672</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.59999996423721313</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.62769138813018799</real>
+            <real>0.77846229076385498</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>4000</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>21</integer>
+    <key>star_brightness</key>
+        <real>0.22999998927116394</real>
+    <key>sun_angle</key>
+        <real>0.67858403921127319</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.08999999612569809</real>
+            <real>0.08999999612569809</real>
+            <real>0.044999998062849045</real>
+            <real>0.029999999329447746</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Day%20Mood2.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.44999998807907104</real>
+            <real>0.44999998807907104</real>
+            <real>0.44999998807907104</real>
+            <real>0.14999999105930328</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>1</real>
+            <real>2</real>
+            <real>2</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.63999998569488525</real>
+            <real>0.44679245352745056</real>
+            <real>0.3139621913433075</real>
+            <real>0.31999999284744263</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0.070000000298023224</real>
+            <real>0</real>
+            <real>0.14000000059604645</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>0.45999997854232788</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>0.08999999612569809</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.949999809265137</real>
+            <real>10.659999847412109</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.25</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>2.9999999242136255e-005</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>2</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>2.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.19999980926513672</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.59999996423721313</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.53051102161407471</real>
+            <real>-0.84767806529998779</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>4000</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>21</integer>
+    <key>star_brightness</key>
+        <real>0.22999998927116394</real>
+    <key>sun_angle</key>
+        <real>2.5823893547058105</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.08999999612569809</real>
+            <real>0.08999999612569809</real>
+            <real>0.044999998062849045</real>
+            <real>0.029999999329447746</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Fog.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.17999999225139618</real>
+            <real>0.23999999463558197</real>
+            <real>0.31000000238418579</real>
+            <real>0.31000000238418579</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>1</real>
+            <real>0.81000000238418579</real>
+            <real>0.62000000476837158</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.2199999988079071</real>
+            <real>0.45999997854232788</real>
+            <real>0.45999997854232788</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0.69999998807907104</real>
+            <real>0.69999998807907104</real>
+            <real>0.69999998807907104</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.53999996185302734</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.39999997615814209</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00075000000651925802</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>30.200000762939453</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>2.1800000667572021</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>3.7999999523162842</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.5</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2.7200000286102295</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.63999998569488525</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.99361127614974976</real>
+            <real>-0.11285652220249176</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>3447</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.6838937997817993</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.1399999856948853</real>
+            <real>1.1399999856948853</real>
+            <real>1.1399999856948853</real>
+            <real>0.37999999523162842</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Ghost.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0.32999998331069946</real>
+            <real>0.32999998331069946</real>
+            <real>0.10999999940395355</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.079873383045196533</real>
+            <real>0.21999761462211609</real>
+            <real>0.43999999761581421</real>
+            <real>0.2199999988079071</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.21535232663154602</real>
+            <real>0.42697387933731079</real>
+            <real>0.5</real>
+            <real>0.25</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.2199999988079071</real>
+            <real>0.2199999988079071</real>
+            <real>0.2199999988079071</real>
+            <real>0.2199999988079071</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>0.070000000298023224</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>11.539999961853027</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.44999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00042999998549930751</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.51999998092651367</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.75</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.18000000715255737</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.99992102384567261</real>
+            <real>-0.012566247954964638</real>
+            <real>1</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>718.70001220703125</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>23</integer>
+    <key>star_brightness</key>
+        <real>2</real>
+    <key>sun_angle</key>
+        <real>4.7249555587768555</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Morning.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0.57749998569488525</real>
+            <real>0.4987500011920929</real>
+            <real>0.69999998807907104</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.45999997854232788</real>
+            <real>0.77999997138977051</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.08999999612569809</real>
+            <real>0.039999999105930328</real>
+            <real>0</real>
+            <real>0.099999994039535522</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.50999999046325684</real>
+            <real>0.50999999046325684</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.37000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>7.0000001869630069e-005</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>15.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.6100000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.33000001311302185</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>3.5099999904632568</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.062790460884571075</real>
+            <real>-0.99802672863006592</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>2842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>21</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>3.0787608623504639</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>3</real>
+            <real>3</real>
+            <real>3</real>
+            <real>1</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Morning2.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.69999997394426039</real>
+            <real>0.57749997886164373</real>
+            <real>0.49874999905271622</real>
+            <real>0.69999995555196648</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.45999996583802716</real>
+            <real>0.77999998620579447</real>
+            <real>1.0000000630106456</real>
+            <real>1.0000000630106456</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.09000002999817136</real>
+            <real>0.040000024113538313</real>
+            <real>1.9248282967510022e-008</real>
+            <real>0.10000000769751693</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.50999996864795882</real>
+            <real>0.5099999643564237</real>
+            <real>0.50999996006488857</real>
+            <real>0.99999994897842548</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>1.0000000017030004</real>
+            <real>1.0000000017030004</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.12499999806710704</real>
+            <real>1.0000000017030004</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999997043609838</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000017030004</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.499400184360695</real>
+            <real>10.010999736402823</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.37000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000017030004</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>6.9999999536534113e-005</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000017030004</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>15.499999198743296</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000017030004</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.6100000716107488</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000017030004</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>4.9999997142382933</real>
+            <real>0.0010000000492004502</real>
+            <real>-0.33000003022807256</real>
+            <real>1.0000000017030004</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>3.5099999038662446</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000017030004</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.26999997954709531</real>
+            <real>0.19915600154937518</real>
+            <real>0.19915600154937518</real>
+            <real>1.0000000017030004</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.069060027599334717</real>
+            <real>0.99761247634887695</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>2842.0000758341921</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000017030004</real>
+        </array>
+    <key>preset_num</key>
+        <integer>21</integer>
+    <key>star_brightness</key>
+        <real>1.4100757894652816e-008</real>
+    <key>sun_angle</key>
+        <real>0.069115042686462402</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.9999998267037533</real>
+            <real>2.9999998267037533</real>
+            <real>2.9999998239449095</real>
+            <real>0.99999994223458455</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%2010am.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.77999997138977051</real>
+            <real>0.77999997138977051</real>
+            <real>0.77999997138977051</real>
+            <real>0.25999999046325684</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0</real>
+            <real>2</real>
+            <real>2</real>
+            <real>2</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.2800000011920929</real>
+            <real>0.44679245352745056</real>
+            <real>0.56000000238418579</real>
+            <real>0.56000000238418579</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.12999999523162842</real>
+            <real>0.14424242079257965</real>
+            <real>0.11999999731779099</real>
+            <real>0.14999999105930328</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.099999994039535522</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10</real>
+            <real>10</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.70999997854232788</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>2.9999999242136255e-005</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>2</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>2.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>1.1999988555908203</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.59999996423721313</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.49818512797355652</real>
+            <real>0.86707067489624023</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1400</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>21</integer>
+    <key>star_brightness</key>
+        <real>0.22999998927116394</real>
+    <key>sun_angle</key>
+        <real>0.52150440216064453</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.14999999105930328</real>
+            <real>0.099999994039535522</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%204%3A30am.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.84000003337860107</real>
+            <real>0.84000003337860107</real>
+            <real>0.84000003337860107</real>
+            <real>0.2800000011920929</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>1.2600002288818359</real>
+            <real>2</real>
+            <real>2</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.022568579763174057</real>
+            <real>0.039999999105930328</real>
+            <real>0.019999999552965164</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.099999994039535522</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00032999998074956238</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>20</real>
+            <real>0.0010000000474974513</real>
+            <real>-1.1000000238418579</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.36227512359619141</real>
+            <real>-0.93207120895385742</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1369</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0.63999998569488525</real>
+    <key>sun_angle</key>
+        <real>2.7708849906921387</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0.83719938993453979</real>
+            <real>0.84000003337860107</real>
+            <real>0.2800000011920929</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%205am%20END.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.84000003337860107</real>
+            <real>0.84000003337860107</real>
+            <real>0.84000003337860107</real>
+            <real>0.2800000011920929</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>1.2600002288818359</real>
+            <real>2</real>
+            <real>2</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.022568579763174057</real>
+            <real>0.039999999105930328</real>
+            <real>0.019999999552965164</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.099999994039535522</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00032999998074956238</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>20</real>
+            <real>0.0010000000474974513</real>
+            <real>-1.1000000238418579</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>1.7484555314695172e-007</real>
+            <real>1</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1369</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0.63999998569488525</real>
+    <key>sun_angle</key>
+        <real>6.2831854820251465</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.029999999329447746</real>
+            <real>0.83719938993453979</real>
+            <real>0.84000003337860107</real>
+            <real>0.2800000011920929</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%205am%20START.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.42000001668930054</real>
+            <real>0.42000001668930054</real>
+            <real>0.42000001668930054</real>
+            <real>0.14000000059604645</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>1.2600002288818359</real>
+            <real>2</real>
+            <real>2</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.022568579763174057</real>
+            <real>0.039999999105930328</real>
+            <real>0.019999999552965164</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.099999994039535522</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00032999998074956238</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>20</real>
+            <real>0.0010000000474974513</real>
+            <real>-1.1000000238418579</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0</real>
+            <real>1</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1369</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0.63999998569488525</real>
+    <key>sun_angle</key>
+        <real>0</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%205am.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.84000003337860107</real>
+            <real>0.84000003337860107</real>
+            <real>0.84000003337860107</real>
+            <real>0.2800000011920929</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>1.2600002288818359</real>
+            <real>2</real>
+            <real>2</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.022568579763174057</real>
+            <real>0.039999999105930328</real>
+            <real>0.019999999552965164</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.099999994039535522</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00032999998074956238</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>20</real>
+            <real>0.0010000000474974513</real>
+            <real>-1.1000000238418579</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>-1</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1369</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0.63999998569488525</real>
+    <key>sun_angle</key>
+        <real>3.1415927410125732</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%207%3A30pm.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.84000003337860107</real>
+            <real>0.84000003337860107</real>
+            <real>0.84000003337860107</real>
+            <real>0.2800000011920929</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>1.2600002288818359</real>
+            <real>2</real>
+            <real>2</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.022568579763174057</real>
+            <real>0.039999999105930328</real>
+            <real>0.019999999552965164</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.099999994039535522</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00032999998074956238</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>20</real>
+            <real>0.0010000000474974513</real>
+            <real>-1.1000000238418579</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.33873793482780457</real>
+            <real>0.94088077545166016</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1369</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0.63999998569488525</real>
+    <key>sun_angle</key>
+        <real>0.34557521343231201</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0.83719938993453979</real>
+            <real>0.84000003337860107</real>
+            <real>0.2800000011920929</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%208%3A30am.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.22411763608017388</real>
+            <real>0.25058822535416658</real>
+            <real>0.19764705338022287</real>
+            <real>0.18941175678197075</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.21314870774677197</real>
+            <real>1.011764702165828</real>
+            <real>1.0647058807138134</real>
+            <real>1.0647058807138134</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.032941176733549904</real>
+            <real>0.61014069170411545</real>
+            <real>1.0541176513012718</real>
+            <real>1.0541176513012718</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.12999999523162842</real>
+            <real>0.14000000059604645</real>
+            <real>0.11999999731779099</real>
+            <real>0.14000000059604645</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.13529411745422026</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.70999997854232788</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>2.9999999242136255e-005</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>1.1176470592617989</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.661764664224842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.31764675632995676</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.37941175534882965</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.8764706009188119</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.41647058541283888</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.53738623857498169</real>
+            <real>0.84333628416061401</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1678.5294129177928</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0.02705882303416729</real>
+    <key>sun_angle</key>
+        <real>0.56733471155166626</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.4588235177625628</real>
+            <real>0.67058820565833765</real>
+            <real>0.38823530767332104</real>
+            <real>0.64705879520844012</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%208am.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.77999997138977051</real>
+            <real>0.77999997138977051</real>
+            <real>0.77999997138977051</real>
+            <real>0.25999999046325684</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0</real>
+            <real>2</real>
+            <real>2</real>
+            <real>2</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.2800000011920929</real>
+            <real>0.44679245352745056</real>
+            <real>0.56000000238418579</real>
+            <real>0.56000000238418579</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.12999999523162842</real>
+            <real>0.14424242079257965</real>
+            <real>0.11999999731779099</real>
+            <real>0.14999999105930328</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.099999994039535522</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10</real>
+            <real>10</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.70999997854232788</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>2.9999999242136255e-005</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>2</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>2.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>1.1999988555908203</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.59999996423721313</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.49818512797355652</real>
+            <real>0.86707067489624023</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>4000</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>21</integer>
+    <key>star_brightness</key>
+        <real>0.22999998927116394</real>
+    <key>sun_angle</key>
+        <real>0.52150440216064453</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.14999999105930328</real>
+            <real>0.099999994039535522</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Dark%20START.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>1.2600002288818359</real>
+            <real>2</real>
+            <real>2</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.022568579763174057</real>
+            <real>0.039999999105930328</real>
+            <real>0.019999999552965164</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.099999994039535522</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00032999998074956238</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.61000001430511475</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>20</real>
+            <real>0.0010000000474974513</real>
+            <real>-1.1000000238418579</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0</real>
+            <real>1</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1369</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>2</real>
+    <key>sun_angle</key>
+        <real>0</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.029999999329447746</real>
+            <real>0.83719938993453979</real>
+            <real>0.84000003337860107</real>
+            <real>0.2800000011920929</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Midnight.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.84000003337860107</real>
+            <real>0.84000003337860107</real>
+            <real>0.84000003337860107</real>
+            <real>0.2800000011920929</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>1.2600002288818359</real>
+            <real>2</real>
+            <real>2</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.022568579763174057</real>
+            <real>0.039999999105930328</real>
+            <real>0.019999999552965164</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.099999994039535522</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00032999998074956238</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>20</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.85000002384185791</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>1</real>
+            <real>-4.3711388286737929e-008</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1369</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0.63999998569488525</real>
+    <key>sun_angle</key>
+        <real>1.5707963705062866</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.59999996423721313</real>
+            <real>0.83719938993453979</real>
+            <real>0.84000003337860107</real>
+            <real>0.2800000011920929</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Night.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.84000003337860107</real>
+            <real>0.84000003337860107</real>
+            <real>0.84000003337860107</real>
+            <real>0.2800000011920929</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>1.2600002288818359</real>
+            <real>2</real>
+            <real>2</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.022568579763174057</real>
+            <real>0.039999999105930328</real>
+            <real>0.019999999552965164</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.099999994039535522</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00032999998074956238</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>20</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.99999994039535522</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.43711560964584351</real>
+            <real>-0.89940536022186279</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1369</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0.63999998569488525</real>
+    <key>sun_angle</key>
+        <real>2.6892035007476807</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.35999998450279236</real>
+            <real>0.83719938993453979</real>
+            <real>0.84000003337860107</real>
+            <real>0.2800000011920929</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Noon.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.77999997138977051</real>
+            <real>0.77999997138977051</real>
+            <real>0.77999997138977051</real>
+            <real>0.25999999046325684</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0</real>
+            <real>2</real>
+            <real>2</real>
+            <real>2</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.2800000011920929</real>
+            <real>0.44679245352745056</real>
+            <real>0.56000000238418579</real>
+            <real>0.56000000238418579</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.12999999523162842</real>
+            <real>0.14424242079257965</real>
+            <real>0.11999999731779099</real>
+            <real>0.14999999105930328</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.14000000059604645</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.70999997854232788</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>2.9999999242136255e-005</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>1.2000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>2.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>1.1999988555908203</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.59999996423721313</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>1</real>
+            <real>-4.3711388286737929e-008</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>4000</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>21</integer>
+    <key>star_brightness</key>
+        <real>0.22999998927116394</real>
+    <key>sun_angle</key>
+        <real>1.5707963705062866</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.14999999105930328</real>
+            <real>0.099999994039535522</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20%2DA.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.14999997615814209</real>
+            <real>0.17999999225139618</real>
+            <real>0</real>
+            <real>0.059999998658895493</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.37999999523162842</real>
+            <real>0.45999997854232788</real>
+            <real>0.2199999988079071</real>
+            <real>0.45999997854232788</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0.17999999225139618</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.14000000059604645</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.70999997854232788</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00032999998074956238</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.12999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>20</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.74999994039535522</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.43999999761581421</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.031410761177539825</real>
+            <real>0.99950653314590454</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1826</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>1.5</real>
+    <key>sun_angle</key>
+        <real>0.031415928155183792</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.1299998760223389</real>
+            <real>2.0448005199432373</real>
+            <real>1.0735198259353638</real>
+            <real>0.70999997854232788</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20A.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.14999997615814209</real>
+            <real>0.17999999225139618</real>
+            <real>0</real>
+            <real>0.059999998658895493</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.2199999988079071</real>
+            <real>0.71999996900558472</real>
+            <real>0.93999999761581421</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.6319204568862915</real>
+            <real>2</real>
+            <real>2</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.14000000059604645</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.70999997854232788</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00032999998074956238</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.12999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>20</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.74999994039535522</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.43999999761581421</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.062790520489215851</real>
+            <real>0.99802672863006592</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1369</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>1</real>
+    <key>sun_angle</key>
+        <real>0.062831856310367584</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.1299998760223389</real>
+            <real>2.0448005199432373</real>
+            <real>1.0735198259353638</real>
+            <real>0.70999997854232788</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20B.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.074999995529651642</real>
+            <real>0.08999999612569809</real>
+            <real>0</real>
+            <real>0.029999999329447746</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.19191493093967438</real>
+            <real>0.62808448076248169</real>
+            <real>0.81999999284744263</real>
+            <real>0.40999999642372131</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>2</real>
+            <real>0</real>
+            <real>2</real>
+            <real>2</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0</real>
+            <real>0.021999998018145561</real>
+            <real>0.039999999105930328</real>
+            <real>0.039999999105930328</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.14999999105930328</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.70999997854232788</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00032999998074956238</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>20</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.69999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.48999997973442078</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.069060027599334717</real>
+            <real>0.99761247634887695</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1101</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0.5</real>
+    <key>sun_angle</key>
+        <real>0.069115042686462402</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.619999885559082</real>
+            <real>1.5551999807357788</real>
+            <real>0.81647992134094238</real>
+            <real>0.53999996185302734</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20C.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0.14999999105930328</real>
+            <real>0</real>
+            <real>0.26999998092651367</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.24156853556632996</real>
+            <real>0.71999996900558472</real>
+            <real>0.93999999761581421</real>
+            <real>0.93999999761581421</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.6319204568862915</real>
+            <real>1.1200000047683716</real>
+            <real>1.1200000047683716</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.17999999225139618</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0.17999999225139618</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.14000000059604645</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>11.679999351501465</real>
+            <real>10</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.70999997854232788</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00032999998074956238</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.81000000238418579</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.59999996423721313</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.8600000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.43999999761581421</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.075326807796955109</real>
+            <real>0.99715888500213623</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1074</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0.07539822906255722</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.75</real>
+            <real>0.62999999523162842</real>
+            <real>0.84000003337860107</real>
+            <real>0.84000003337860107</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20D.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0.14999999105930328</real>
+            <real>0</real>
+            <real>0.26999998092651367</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.24156853556632996</real>
+            <real>0.71999996900558472</real>
+            <real>0.93999999761581421</real>
+            <real>0.93999999761581421</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.6319204568862915</real>
+            <real>1.1200000047683716</real>
+            <real>1.1200000047683716</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.18999999761581421</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0.18999999761581421</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.14000000059604645</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>11.679999351501465</real>
+            <real>10</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.70999997854232788</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00032999998074956238</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.3500000238418579</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.59999996423721313</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.8600000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.43999999761581421</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.081590615212917328</real>
+            <real>0.99666595458984375</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>859</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0.081681415438652039</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.75</real>
+            <real>0.62999999523162842</real>
+            <real>0.71999996900558472</real>
+            <real>0.75</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20E.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.14999999105930328</real>
+            <real>0.17999999225139618</real>
+            <real>0</real>
+            <real>0.17999999225139618</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.24156853556632996</real>
+            <real>0.71999996900558472</real>
+            <real>0.93999999761581421</real>
+            <real>0.93999999761581421</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.6319204568862915</real>
+            <real>1.1200000047683716</real>
+            <real>1.1200000047683716</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.4699999988079071</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0.4699999988079071</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.14000000059604645</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.70999997854232788</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00032999998074956238</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.5399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.39999961853027344</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.49999997019767761</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.8600000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.43999999761581421</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.087851203978061676</real>
+            <real>0.99613362550735474</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1369</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0.087964601814746857</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.75</real>
+            <real>0.71999996900558472</real>
+            <real>0.37800011038780212</real>
+            <real>0.80999994277954102</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20F.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.14999999105930328</real>
+            <real>0.17999999225139618</real>
+            <real>0.11999999731779099</real>
+            <real>0.17999999225139618</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.24156853556632996</real>
+            <real>0.87999999523162842</real>
+            <real>0.93999999761581421</real>
+            <real>0.93999999761581421</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.6319204568862915</real>
+            <real>1.1200000047683716</real>
+            <real>1.1200000047683716</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.28999999165534973</real>
+            <real>0.14000000059604645</real>
+            <real>0.11999999731779099</real>
+            <real>0.28999999165534973</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.14000000059604645</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.70999997854232788</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00032999998074956238</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>2</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.19999980926513672</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.34999999403953552</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.8600000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.43999999761581421</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.42008578777313232</real>
+            <real>0.90748441219329834</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1369</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0.43353983759880066</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.47999998927116394</real>
+            <real>0.71999996900558472</real>
+            <real>0.42000001668930054</real>
+            <real>0.71999996900558472</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunset%3A%20A.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.14999999105930328</real>
+            <real>0.17999999225139618</real>
+            <real>0.11999999731779099</real>
+            <real>0.17999999225139618</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.24156853556632996</real>
+            <real>0.87999999523162842</real>
+            <real>0.93999999761581421</real>
+            <real>0.93999999761581421</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.6319204568862915</real>
+            <real>1.1200000047683716</real>
+            <real>1.1200000047683716</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.28999999165534973</real>
+            <real>0.14000000059604645</real>
+            <real>0.11999999731779099</real>
+            <real>0.28999999165534973</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.14000000059604645</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.70999997854232788</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00032999998074956238</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>2</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.19999980926513672</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.34999999403953552</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.8600000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.43999999761581421</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.36227512359619141</real>
+            <real>-0.93207120895385742</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>3007</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>2.7708849906921387</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.47999998927116394</real>
+            <real>0.71999996900558472</real>
+            <real>0.42000001668930054</real>
+            <real>0.71999996900558472</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunset%3A%20B.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0.17999999225139618</real>
+            <real>0</real>
+            <real>0.099999994039535522</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0.56000000238418579</real>
+            <real>0</real>
+            <real>0.56000000238418579</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.47999998927116394</real>
+            <real>0.27082312107086182</real>
+            <real>0</real>
+            <real>0.23999999463558197</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0.20999999344348907</real>
+            <real>0</real>
+            <real>0.41999998688697815</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.14000000059604645</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.70999997854232788</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00045999998110346496</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>1.3999999761581421</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.1499999761581421</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.39999961853027344</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.39999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.17999999225139618</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.14401055872440338</real>
+            <real>-0.98957616090774536</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>805</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>2.997079610824585</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>3</real>
+            <real>2.7300000190734863</real>
+            <real>0.41666662693023682</real>
+            <real>3</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunset%3A%20C.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.14999997615814209</real>
+            <real>0.17999999225139618</real>
+            <real>0</real>
+            <real>0.059999998658895493</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.2199999988079071</real>
+            <real>0.71999996900558472</real>
+            <real>0.93999999761581421</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.42970588803291321</real>
+            <real>1.3600000143051147</real>
+            <real>0.68000000715255737</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.14000000059604645</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.70999997854232788</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00032999998074956238</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.34000000357627869</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>10.199999809265137</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.74999994039535522</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.43999999761581421</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.062790460884571075</real>
+            <real>-0.99802672863006592</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1369</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>1</real>
+    <key>sun_angle</key>
+        <real>3.0787608623504639</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.1299998760223389</real>
+            <real>2.0448005199432373</real>
+            <real>1.0735198259353638</real>
+            <real>0.70999997854232788</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunset%3A%20D.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.14999997615814209</real>
+            <real>0.17999999225139618</real>
+            <real>0</real>
+            <real>0.059999998658895493</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.37999999523162842</real>
+            <real>0.45999997854232788</real>
+            <real>0.2199999988079071</real>
+            <real>0.45999997854232788</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0.17999999225139618</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.14000000059604645</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.70999997854232788</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00032999998074956238</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.12999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>20</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.74999994039535522</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.43999999761581421</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.031410444527864456</real>
+            <real>-0.99950659275054932</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1826</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>1.5</real>
+    <key>sun_angle</key>
+        <real>3.1101770401000977</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.1299998760223389</real>
+            <real>2.0448005199432373</real>
+            <real>1.0735198259353638</real>
+            <real>0.70999997854232788</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Nighty%20Fog.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.079999998211860657</real>
+            <real>0.079999998211860657</real>
+            <real>0.079999998211860657</real>
+            <real>0.079999998211860657</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>1</real>
+            <real>0.81000000238418579</real>
+            <real>0.62000000476837158</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.2199999988079071</real>
+            <real>0.45999997854232788</real>
+            <real>0.45999997854232788</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0.69999998807907104</real>
+            <real>0.69999998807907104</real>
+            <real>0.69999998807907104</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.53999996185302734</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.39999997615814209</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00075000000651925802</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>30.200000762939453</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>2.1800000667572021</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>4.2000007629394531</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.64999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2.7200000286102295</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.19999998807907104</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.99361127614974976</real>
+            <real>-0.11285652220249176</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>3447</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.6838937997817993</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20O%2D6am.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.33054998638431243</real>
+            <real>0.33054998638431243</real>
+            <real>0.33054998638431243</real>
+            <real>0.11018333371629296</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.080423966373246003</real>
+            <real>0.2235726453915845</real>
+            <real>0.44715003729959335</real>
+            <real>0.22815837741444511</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.22289033702560346</real>
+            <real>0.427064714973028</real>
+            <real>0.49914732197913736</real>
+            <real>0.25737920767664946</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.21963333011493091</real>
+            <real>0.21931249500003958</real>
+            <real>0.21899165988514824</real>
+            <real>0.21963333011493091</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.12483958242547999</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>11.53729577948252</real>
+            <real>10.013974280172988</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00042839580998887961</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.5212110501925054</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.0068750381469727</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>4.9779998770554812</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.52036664955119249</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.75375835388103951</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.18027500862106649</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.9999927282333374</real>
+            <real>-0.0038118390366435051</real>
+            <real>1</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>733.73938726552296</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>1.9918874502182007</real>
+    <key>sun_angle</key>
+        <real>4.7162008285522461</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.00041250227106104376</real>
+            <real>0.00041250227106104376</real>
+            <real>0.00020625113553052188</real>
+            <real>0.00013750075986607158</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Rise.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.38999998569488525</real>
+            <real>0.19687503576278687</real>
+            <real>0.11999999731779099</real>
+            <real>0.38999998569488525</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.0072000003419816494</real>
+            <real>0.029999999329447746</real>
+            <real>0.059999998658895493</real>
+            <real>0.029999999329447746</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0.070000000298023224</real>
+            <real>0</real>
+            <real>0.14000000059604645</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>0.2800000011920929</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>0.08999999612569809</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.949999809265137</real>
+            <real>10.659999847412109</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.22999998927116394</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00025000001187436283</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>57.400001525878906</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>2.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.19999980926513672</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.59999996423721313</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.34999999403953552</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.28999999165534973</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.29704159498214722</real>
+            <real>0.95486456155776978</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>4000</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>21</integer>
+    <key>star_brightness</key>
+        <real>0.22999998927116394</real>
+    <key>sun_angle</key>
+        <real>0.30159291625022888</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.059999998658895493</real>
+            <real>0.029999999329447746</real>
+            <real>0.011249998584389687</real>
+            <real>0.059999998658895493</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Rosy%20Morning.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.14999999105930328</real>
+            <real>0.17999999225139618</real>
+            <real>0</real>
+            <real>0.17999999225139618</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.24156853556632996</real>
+            <real>0.71999996900558472</real>
+            <real>0.93999999761581421</real>
+            <real>0.93999999761581421</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.6319204568862915</real>
+            <real>1.1200000047683716</real>
+            <real>1.1200000047683716</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.4699999988079071</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0.4699999988079071</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.14000000059604645</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.70999997854232788</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00032999998074956238</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.5399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.39999961853027344</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.49999997019767761</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.8600000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.43999999761581421</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.087851203978061676</real>
+            <real>0.99613362550735474</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1369</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0.087964601814746857</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.75</real>
+            <real>0.71999996900558472</real>
+            <real>0.37800011038780212</real>
+            <real>0.80999994277954102</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Sweet%20Dawn.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.19999998807907104</real>
+            <real>0.17128434777259827</real>
+            <real>0.11999999731779099</real>
+            <real>0.19999998807907104</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.35999998450279236</real>
+            <real>0.0099999997764825821</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.37000000476837158</real>
+            <real>0.31000000238418579</real>
+            <real>0</real>
+            <real>0.37000000476837158</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.37000000476837158</real>
+            <real>0.2800000011920929</real>
+            <real>0.17999999225139618</real>
+            <real>0.43999999761581421</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.90999996662139893</real>
+            <real>0.81000000238418579</real>
+            <real>0.059999998658895493</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.38999998569488525</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>11.170000076293945</real>
+            <real>8.4099998474121094</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.68999999761581421</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00014000000373926014</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>7.4000000953674316</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>4.0999999046325684</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.19999980926513672</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.94999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.68999999761581421</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.099999994039535522</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.7459409236907959</real>
+            <real>-0.66601210832595825</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>3158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>2.2996461391448975</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.17999999225139618</real>
+            <real>0.14000000059604645</real>
+            <real>0.11999999731779099</real>
+            <real>0.17999999225139618</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Sweet%20Morning.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.14117646217346191</real>
+            <real>0.17128434777259827</real>
+            <real>0.19999998807907104</real>
+            <real>0.19999998807907104</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.17000000178813934</real>
+            <real>0.35999998450279236</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.37000000476837158</real>
+            <real>0.29089650511741638</real>
+            <real>0.37000000476837158</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.12210001051425934</real>
+            <real>0.27379998564720154</real>
+            <real>0.37000000476837158</real>
+            <real>0.37000000476837158</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.90999996662139893</real>
+            <real>0.81000000238418579</real>
+            <real>0.059999998658895493</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.38999998569488525</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>11.170000076293945</real>
+            <real>8.4099998474121094</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.68999999761581421</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00014000000373926014</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>7.4000000953674316</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>4.0999999046325684</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.19999980926513672</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.94999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.68999999761581421</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.099999994039535522</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.7459409236907959</real>
+            <real>-0.66601210832595825</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>3158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>2.2996461391448975</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.17999999225139618</real>
+            <real>0.14000000059604645</real>
+            <real>0.12000000476837158</real>
+            <real>0.059999998658895493</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Nacon%27s%20Test.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.14117646217346191</real>
+            <real>0.17128434777259827</real>
+            <real>0.19999998807907104</real>
+            <real>0.19999998807907104</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.17000000178813934</real>
+            <real>0.35999998450279236</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.37000000476837158</real>
+            <real>0.29089650511741638</real>
+            <real>0.37000000476837158</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.12210001051425934</real>
+            <real>0.27379998564720154</real>
+            <real>0.37000000476837158</real>
+            <real>0.37000000476837158</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.90999996662139893</real>
+            <real>0.81000000238418579</real>
+            <real>0.059999998658895493</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.38999998569488525</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>11.170000076293945</real>
+            <real>8.4099998474121094</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.68999999761581421</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00014000000373926014</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>7.4000000953674316</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>4.0999999046325684</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.59999942779541016</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.94999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.68999999761581421</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.099999994039535522</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.22427062690258026</real>
+            <real>-0.97452688217163086</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>3158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>2.915398120880127</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.17999999225139618</real>
+            <real>0.14000000059604645</real>
+            <real>0.12000000476837158</real>
+            <real>0.059999998658895493</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/water/Nacon%27s%20Lake%20Water.xml

@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.012000000104308128</real>
+    <key>fresnelOffset</key>
+        <real>0.37000000476837158</real>
+    <key>fresnelScale</key>
+        <real>0.059999998658895493</real>
+    <key>normScale</key>
+        <array>
+            <real>10</real>
+            <real>10</real>
+            <real>10</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>49085953-8c5c-1cc3-a971-bd19c17be6f5</uuid>
+    <key>scaleAbove</key>
+        <real>0.049999997019767761</real>
+    <key>scaleBelow</key>
+        <real>0.099999994039535522</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.00152587890625</real>
+            <real>0.15472412109375</real>
+            <real>0.12599946558475494</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>9.8491554260253906</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-8.9406967163085938e-008</real>
+            <real>0.47999989986419678</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-8.9406967163085938e-008</real>
+            <real>2.2099997997283936</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/water/Nacon%27s%20Water.xml

@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.16000001132488251</real>
+    <key>fresnelOffset</key>
+        <real>0.31999999284744263</real>
+    <key>fresnelScale</key>
+        <real>0.049999997019767761</real>
+    <key>normScale</key>
+        <array>
+            <real>10</real>
+            <real>4</real>
+            <real>0.60000002384185791</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>2b8d91e4-a106-6b5b-d492-749a1dbf9121</uuid>
+    <key>scaleAbove</key>
+        <real>0.059999998658895493</real>
+    <key>scaleBelow</key>
+        <real>0.14000000059604645</real>
+    <key>underWaterFogMod</key>
+        <real>0.18999999761581421</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.05499267578125</real>
+            <real>0.076749801635742188</real>
+            <real>0.07781982421875</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>6.9644041061401367</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.20999990403652191</real>
+            <real>0.52999991178512573</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-1.1600000858306885</real>
+            <real>-8.9406967163085938e-008</real>
+        </array>
+    </map>
+</llsd>

indra/newview/fsfloatersearch.cpp

@@ -27,7 +27,7 @@
 
 #include "llviewerprecompiledheaders.h"
 
-#include "fsfloatersearchlegacy.h"
+#include "fsfloatersearch.h"
 #include "llagent.h"
 #include "llavatarname.h"
 #include "llavatarnamecache.h"
@@ -44,9 +44,11 @@
 #include "llremoteparcelrequest.h"
 #include "llavatarpropertiesprocessor.h"
 #include "llproductinforequest.h"
+#include "lllogininstance.h"
 #include "llviewercontrol.h"
 #include "llviewerfloaterreg.h"
 #include "llviewergenericmessage.h"
+#include "llviewernetwork.h"
 #include "llviewerregion.h"
 #include "llnotificationsutil.h"
 #include "lldispatcher.h"
@@ -54,6 +56,7 @@
 #include "message.h"
 
 #include "llcombobox.h"
+#include "lltabcontainer.h"
 #include "llfloaterreg.h"
 #include "llloadingindicator.h"
 #include "llradiogroup.h"
@@ -301,8 +304,17 @@ void FSFloaterSearch::onOpen(const LLSD& key)
 	panel_classifieds->onSearchPanelOpen(this);
 }
 
+//virtual
+void FSFloaterSearch::onClose(bool app_quitting)
+{
+	gSavedSettings.setS32("FSLastSearchTab", getChild<LLTabContainer>("ls_tabs")->getCurrentPanelIndex());
+}
+
 BOOL FSFloaterSearch::postBuild()
 {
+	LLTabContainer* tabs = getChild<LLTabContainer>("ls_tabs");
+	if (tabs)
+		tabs->setCommitCallback(boost::bind(&FSFloaterSearch::onTabChange, this));
 	childSetAction("people_profile_btn", boost::bind(&FSFloaterSearch::onBtnPeopleProfile, this));
 	childSetAction("people_message_btn", boost::bind(&FSFloaterSearch::onBtnPeopleIM, this));
 	childSetAction("people_friend_btn", boost::bind(&FSFloaterSearch::onBtnPeopleFriend, this));
@@ -324,11 +336,46 @@ BOOL FSFloaterSearch::postBuild()
 	mDetailMaturity =	getChild<LLIconCtrl>("maturity_icon");
 	flushDetails();
 	
-	mDetailsPanel->setVisible(false);
+	if (mDetailsPanel)
+		mDetailsPanel->setVisible(false);
+	mHasSelection = false;
+	
+	/// Disable websearch on OpenSim because most OpenSim grids don't have one and the ones that do
+	/// suck even more than LL's. (Scary but true!)
+#ifdef HAS_OPENSIM_SUPPORT
+	if (!LLGridManager::getInstance()->isInSLMain() && !LLGridManager::getInstance()->isInSLBeta())
+	{
+		if (tabs)
+		{
+			LLPanel* web_panel = tabs->getPanelByName("panel_ls_web");
+			if (web_panel)
+			{
+				tabs->removeTabPanel(web_panel);
+			}
+		}
+	}
+#endif // HAS_OPENSIM_SUPPORT
+	if (!tabs->selectTab(gSavedSettings.getS32("FSLastSearchTab")))
+		tabs->selectFirstTab();
 	
 	return TRUE;
 }
 
+void FSFloaterSearch::onTabChange()
+{
+	LLPanel* active_panel = getChild<LLTabContainer>("ls_tabs")->getCurrentPanel();
+	LLPanel* panel_web = getChild<LLPanel>("panel_ls_web");
+	
+	if(active_panel == panel_web)
+	{
+		mDetailsPanel->setVisible(false);
+	}
+	else
+	{
+		mDetailsPanel->setVisible(mHasSelection);
+	}
+}
+
 void FSFloaterSearch::onSelectedItem(const LLUUID& selected_item, int type)
 {
 	if (!selected_item.isNull())
@@ -399,6 +446,7 @@ void FSFloaterSearch::displayParcelDetails(const LLParcelData& parcel_data)
 	
 	mParcelGlobal = LLVector3d(parcel_data.global_x, parcel_data.global_y, parcel_data.global_z);
 	mDetailsPanel->setVisible(true);
+	mHasSelection = true;
 	mDetailMaturity->setVisible(true);
 	mDetailTitle->setValue(parcel_data.name);
 	mDetailDesc->setValue(parcel_data.desc);
@@ -423,6 +471,7 @@ void FSFloaterSearch::displayAvatarDetails(LLAvatarData*& avatar_data)
 		}
 		
 		mDetailsPanel->setVisible(true);
+		mHasSelection = true;
 		mDetailTitle->setValue(LLTrans::getString("LoadingData"));
 		mDetailDesc->setValue(avatar_data->about_text);
 		mDetailSnapshot->setValue(avatar_data->image_id);
@@ -445,6 +494,7 @@ void FSFloaterSearch::displayGroupDetails(LLGroupMgrGroupData*& group_data)
 		map["FOUNDER"] = LLSLURL("agent", group_data->mFounderID, "inspect").getSLURLString();
 		
 		mDetailsPanel->setVisible(true);
+		mHasSelection = true;
 		mDetailTitle->setValue(LLTrans::getString("LoadingData"));
 		mDetailDesc->setValue(group_data->mCharter);
 		mDetailSnapshot->setValue(group_data->mInsigniaID);
@@ -476,6 +526,7 @@ void FSFloaterSearch::displayClassifiedDetails(LLAvatarClassifiedInfo*& c_info)
 		map["SLURL"] = LLSLURL("parcel", c_info->parcel_id, "about").getSLURLString();
 		
 		mDetailsPanel->setVisible(true);
+		mHasSelection = true;
 		mDetailMaturity->setVisible(true);
 		mParcelGlobal = c_info->pos_global;
 		mDetailTitle->setValue(c_info->name);
@@ -514,6 +565,7 @@ void FSFloaterSearch::displayEventDetails(U32 eventId, F64 eventEpoch, const std
 	mParcelGlobal = eventGlobalPos;
 	mEventID = eventId;
 	mDetailsPanel->setVisible(true);
+	mHasSelection = true;
 	mDetailMaturity->setVisible(true);
 	mDetailTitle->setValue(eventName);
 	mDetailDesc->setValue(eventDesc);
@@ -2670,3 +2722,102 @@ void FSPanelSearchEvents::processSearchReply(LLMessageSystem* msg, void**)
 	}
 	self->setLoadingProgress(false);
 }
+
+////////////////////////////////////////
+//          WebSearch Panel           //
+////////////////////////////////////////
+
+static LLRegisterPanelClassWrapper<FSPanelSearchWeb> t_panel_fs_search_web("panel_ls_web");
+
+FSPanelSearchWeb::FSPanelSearchWeb()
+: LLPanel()
+, mWebBrowser(NULL)
+{
+	// declare a map that transforms a category name into
+	// the URL suffix that is used to search that category
+	mCategoryPaths = LLSD::emptyMap();
+	mCategoryPaths["all"]          = "search";
+	// We don't use these yet, but someday we will.
+	//mCategoryPaths["people"]       = "search/people";
+	//mCategoryPaths["places"]       = "search/places";
+	//mCategoryPaths["events"]       = "search/events";
+	//mCategoryPaths["groups"]       = "search/groups";
+	//mCategoryPaths["wiki"]         = "search/wiki";
+	//mCategoryPaths["destinations"] = "destinations";
+	//mCategoryPaths["classifieds"]  = "classifieds";
+}
+
+FSPanelSearchWeb::~FSPanelSearchWeb()
+{
+}
+
+FSPanelSearchWeb::SearchQuery::SearchQuery()
+:	category("category", ""), // <- Stupidnesss until we move to full webbrowser replacement
+query("query")
+{}
+
+BOOL FSPanelSearchWeb::postBuild()
+{
+	mWebBrowser = getChild<LLMediaCtrl>("search_browser");
+	if (mWebBrowser)
+	{
+		mWebBrowser->addObserver(this);
+		mWebBrowser->navigateTo(loadURL(), "text/html");
+	}
+    return TRUE;
+}
+
+std::string FSPanelSearchWeb::loadURL()
+{
+	LLSD subs;
+	subs["CATEGORY"] = mCategoryPaths["all"].asString();
+
+	// add the search query string
+	subs["QUERY"] = "";
+	
+	// add the permissions token that login.cgi gave us
+	// We use "search_token", and fallback to "auth_token" if not present.
+	LLSD search_token = LLLoginInstance::getInstance()->getResponse("search_token");
+	if (search_token.asString().empty())
+	{
+		search_token = LLLoginInstance::getInstance()->getResponse("auth_token");
+	}
+	subs["AUTH_TOKEN"] = search_token.asString();
+	
+	// add the user's preferred maturity (can be changed via prefs)
+	std::string maturity;
+	if (gAgent.prefersAdult())
+	{
+		maturity = "42";  // PG,Mature,Adult
+	}
+	else if (gAgent.prefersMature())
+	{
+		maturity = "21";  // PG,Mature
+	}
+	else
+	{
+		maturity = "13";  // PG
+	}
+	subs["MATURITY"] = maturity;
+	
+	std::string url;
+#ifdef HAS_OPENSIM_SUPPORT
+	std::string debug_url = gSavedSettings.getString("SearchURLDebug");
+	if (gSavedSettings.getBOOL("DebugSearch") && !debug_url.empty())
+	{
+		url = debug_url;
+	}
+	else if(LLGridManager::getInstance()->isInOpenSim())
+	{
+		url = LLLoginInstance::getInstance()->hasResponse("search")
+		? LLLoginInstance::getInstance()->getResponse("search").asString()
+		: gSavedSettings.getString("SearchURLOpenSim");
+	}
+	else // we are in SL or SL beta
+#endif // HAS_OPENSIM_SUPPORT
+	{
+		url = gSavedSettings.getString("SearchURL");
+	}
+	url = LLWeb::expandURLSubstitutions(url, subs);
+	return url;
+}

indra/newview/fsfloatersearch.h

@@ -36,6 +36,7 @@
 #include "llavatarpropertiesprocessor.h"
 #include "llgroupmgr.h"
 #include "llavatarnamecache.h"
+#include "llmediactrl.h"
 
 class LLRemoteParcelInfoObserver;
 class LLAvatarPropertiesObserver;
@@ -72,13 +73,16 @@ public:
 	void setLoadingProgress(bool started);
 	static std::string filterShortWords(std::string query_string);
 private:
+	virtual void onClose(bool app_quitting);
 	const LLUUID& getSelectedID() { return mSelectedID; }
 	LLVector3d	mParcelGlobal;
 	LLUUID		mSelectedID;
 	U32			mEventID;
+	bool		mHasSelection;
 	
 	void resetVerbs();
 	void flushDetails();
+	void onTabChange();
 	void onBtnPeopleProfile();
 	void onBtnPeopleIM();
 	void onBtnPeopleFriend();
@@ -316,4 +320,25 @@ private:
 	FSFloaterSearch* mParent;
 };
 
+class FSPanelSearchWeb : public LLPanel, public LLViewerMediaObserver
+{
+	LOG_CLASS(FSFloaterSearch);
+public:
+	struct SearchQuery : public LLInitParam::Block<SearchQuery>
+	{
+		Optional<std::string> category;
+		Optional<std::string> query;
+		
+		SearchQuery();
+	};
+	FSPanelSearchWeb();
+	/*virtual*/ BOOL postBuild();
+	std::string loadURL();
+private:
+	~FSPanelSearchWeb();
+	
+	LLMediaCtrl*	mWebBrowser;
+	LLSD			mCategoryPaths;
+};
+
 #endif // FS_FSFLOATERSEARCH_H

indra/newview/fslslbridge.cpp

@@ -127,7 +127,11 @@ FSLSLBridge :: ~FSLSLBridge()
 
 bool FSLSLBridge :: lslToViewer(std::string message, LLUUID fromID, LLUUID ownerID)
 {
-	if (!gSavedSettings.getBOOL("UseLSLBridge"))
+	// <FS:PP> Attempt to speed up things a little
+	// if (!gSavedSettings.getBOOL("UseLSLBridge"))
+	static LLCachedControl<bool> UseLSLBridge(gSavedSettings, "UseLSLBridge");
+	if (!UseLSLBridge)
+	// </FS:PP>
 		return false;
 
 	lldebugs << message << llendl;
@@ -249,7 +253,11 @@ bool FSLSLBridge :: lslToViewer(std::string message, LLUUID fromID, LLUUID owner
 
 bool FSLSLBridge :: viewerToLSL(std::string message, FSLSLBridgeRequestResponder *responder)
 {
-	if (!gSavedSettings.getBOOL("UseLSLBridge"))
+	// <FS:PP> Attempt to speed up things a little
+	// if (!gSavedSettings.getBOOL("UseLSLBridge"))
+	static LLCachedControl<bool> UseLSLBridge(gSavedSettings, "UseLSLBridge");
+	if (!UseLSLBridge)
+	// </FS:PP>
 		return false;
 
 	if (responder == NULL)
@@ -284,10 +292,18 @@ bool FSLSLBridge :: updateBoolSettingValue(std::string msgVal, bool contentVal)
 //
 void FSLSLBridge :: recreateBridge()
 {
-	if (!gSavedSettings.getBOOL("UseLSLBridge"))
+	// <FS:PP> Attempt to speed up things a little
+	// if (!gSavedSettings.getBOOL("UseLSLBridge"))
+	static LLCachedControl<bool> UseLSLBridge(gSavedSettings, "UseLSLBridge");
+	if (!UseLSLBridge)
+	// </FS:PP>
 		return;
 
-	if (gSavedSettings.getBOOL("NoInventoryLibrary"))
+	// <FS:PP> Attempt to speed up things a little
+	// if (gSavedSettings.getBOOL("NoInventoryLibrary"))
+	static LLCachedControl<bool> NoInventoryLibrary(gSavedSettings, "NoInventoryLibrary");
+	if (NoInventoryLibrary)
+	// </FS:PP>
 	{
 		llwarns << "Asked to create bridge, but we don't have a library. Aborting." << llendl;
 		reportToNearbyChat(LLTrans::getString("fsbridge_no_library"));
@@ -320,10 +336,18 @@ void FSLSLBridge :: recreateBridge()
 
 void FSLSLBridge :: initBridge()
 {
-	if (!gSavedSettings.getBOOL("UseLSLBridge"))
+	// <FS:PP> Attempt to speed up things a little
+	// if (!gSavedSettings.getBOOL("UseLSLBridge"))
+	static LLCachedControl<bool> UseLSLBridge(gSavedSettings, "UseLSLBridge");
+	if (!UseLSLBridge)
+	// </FS:PP>
 		return;
 
-	if (gSavedSettings.getBOOL("NoInventoryLibrary"))
+	// <FS:PP> Attempt to speed up things a little
+	// if (gSavedSettings.getBOOL("NoInventoryLibrary"))
+	static LLCachedControl<bool> NoInventoryLibrary(gSavedSettings, "NoInventoryLibrary");
+	if (NoInventoryLibrary)
+	// </FS:PP>
 	{
 		llwarns << "Asked to create bridge, but we don't have a library. Aborting." << llendl;
 		reportToNearbyChat(LLTrans::getString("fsbridge_no_library"));

indra/newview/fslslpreproc.cpp

@@ -588,8 +588,9 @@ void cache_script(std::string name, std::string content)
 	//reportToNearbyChat("writing "+name+" to cache");
 	std::string path = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"lslpreproc",name);
 	LLAPRFile infile(path.c_str(), LL_APR_WB);
-	apr_file_t *fp = infile.getFileHandle();
-	if(fp)infile.write(content.c_str(), content.length());
+	if( infile.getFileHandle() )
+		infile.write(content.c_str(), content.length());
+
 	infile.close();
 }
 

indra/newview/fsmoneytracker.cpp

@@ -70,7 +70,12 @@ std::string FSMoneyTracker::appendTime()
 	time_t utc_time;
 	utc_time = time_corrected();
 	std::string timeStr ="["+ LLTrans::getString("TimeHour")+"]:[" + LLTrans::getString("TimeMin")+"]";
-	if (gSavedSettings.getBOOL("FSSecondsinChatTimestamps"))
+	
+	// <FS:PP> Attempt to speed up things a little
+	// if (gSavedSettings.getBOOL("FSSecondsinChatTimestamps"))
+	static LLCachedControl<bool> FSSecondsinChatTimestamps(gSavedSettings, "FSSecondsinChatTimestamps");
+	if (FSSecondsinChatTimestamps)
+	// </FS:PP>
 	{
 		timeStr += ":[" + LLTrans::getString("TimeSec")+"]";
 	}

indra/newview/fspanelprefs.cpp

@@ -12,6 +12,7 @@
 #include "llvoavatar.h"
 #include "llvoavatarself.h"
 #include "llspinctrl.h"
+#include "lldiriterator.h"	// <FS:CR> for populating the cloud combo
 
 static LLRegisterPanelClassWrapper<PanelPreferenceFirestorm> t_pref_fs("panel_preference_firestorm");
 
@@ -45,6 +46,7 @@ BOOL PanelPreferenceFirestorm::postBuild()
 	getChild<LLUICtrl>("UseEnvironmentFromRegionAlways")->setCommitCallback(boost::bind(&PanelPreferenceFirestorm::onUseEnvironmentFromRegionAlways, this));
 	// init the enable state of the related wl prefs
 	onUseEnvironmentFromRegionAlways();
+	populateCloudCombo();
 
 	return LLPanelPreference::postBuild();	
 }
@@ -252,3 +254,25 @@ void PanelPreferenceFirestorm::applyTagCombos()
 
 	if(change) LLVOAvatar::invalidateNameTags();
 }
+
+void PanelPreferenceFirestorm::populateCloudCombo()
+{
+	LLComboBox* cloud_combo = getChild<LLComboBox>("cloud_combo");
+	if(cloud_combo)
+	{
+		const std::string cloudDir(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight" + gDirUtilp->getDirDelimiter() + "clouds"));
+
+		LLDirIterator dir_iter(cloudDir, "*.tga");
+		while (1)
+		{
+			std::string file;
+			if (!dir_iter.next(file))
+			{
+				break; // no more files
+			}
+			
+			cloud_combo->add(file);
+		}
+		cloud_combo->setSimple(gSavedSettings.getString("FSCloudTexture"));
+	}
+}

indra/newview/fspanelprefs.h

@@ -23,6 +23,7 @@ public:
 
 	void refreshTagCombos();
 	void applyTagCombos();
+	void populateCloudCombo();
 
 protected:
 	LLComboBox* m_UseLegacyClienttags;

indra/newview/lggbeammaps.cpp

@@ -216,13 +216,21 @@ F32 lggBeamMaps::setUpAndGetDuration()
 				lggBeamData dot;
 				
 				dot.p = LLVector3d(beamData["offset"]);
-				dot.p *= (gSavedSettings.getF32("FSBeamShapeScale")*2.0f);
+				// <FS:PP> Attempt to speed up things a little
+				// dot.p *= (gSavedSettings.getF32("FSBeamShapeScale")*2.0f);
+				static LLCachedControl<F32> FSBeamShapeScale(gSavedSettings, "FSBeamShapeScale");
+				dot.p *= (FSBeamShapeScale*2.0f);
+				// </FS:PP>
 				LLColor4 color = LLColor4(beamData["color"]);
 				dot.c = LLColor4U(color);
 				dots.push_back(dot);
 			}
 			
-			F32 maxBPerQS = gSavedSettings.getF32("FSMaxBeamsPerSecond") / 4.0f;
+			// <FS:PP> Attempt to speed up things a little
+			// F32 maxBPerQS = gSavedSettings.getF32("FSMaxBeamsPerSecond") / 4.0f;
+			static LLCachedControl<F32> FSMaxBeamsPerSecond(gSavedSettings, "FSMaxBeamsPerSecond");
+			F32 maxBPerQS = FSMaxBeamsPerSecond / 4.0f;
+			// </FS:PP>
 			duration = llceil((F32)(myPicture.size()) / maxBPerQS) * 0.25f;
 			llinfos << "reading it all now size is " << myPicture.size() << " and duration is " << duration << llendl;
 		
@@ -354,7 +362,11 @@ std::vector<std::string> lggBeamMaps::getColorsFileNames()
 }
 void lggBeamMaps::stopBeamChat()
 {
-	if(gSavedSettings.getBOOL("FSParticleChat"))
+	// <FS:PP> Attempt to speed up things a little
+	// if(gSavedSettings.getBOOL("FSParticleChat"))
+	static LLCachedControl<bool> FSParticleChat(gSavedSettings, "FSParticleChat");
+	if(FSParticleChat)
+	// </FS:PP>
 	{
 		if(sPartsNow != FALSE)
 		{
@@ -376,7 +388,11 @@ void lggBeamMaps::stopBeamChat()
 }
 void lggBeamMaps::updateBeamChat(LLVector3d currentPos)
 {
-	if(gSavedSettings.getBOOL("FSParticleChat"))
+	// <FS:PP> Attempt to speed up things a little
+	// if(gSavedSettings.getBOOL("FSParticleChat"))
+	static LLCachedControl<bool> FSParticleChat(gSavedSettings, "FSParticleChat");
+	if(FSParticleChat)
+	// </FS:PP>
 	{
 		if(sPartsNow != TRUE)
 		{

indra/newview/llappviewer.cpp

@@ -246,6 +246,8 @@
 #include "llappviewerlistener.h"
 
 #include "ndmemorypool.h" // <FS:ND/> tcmalloc replacement
+#include "ndmallocstats.h" // <FS:ND/> collect stats about memory allocations
+
 
 #if (LL_LINUX || LL_SOLARIS) && LL_GTK
 #include "glib.h"
@@ -734,6 +736,7 @@ public:
 bool LLAppViewer::init()
 {	
 	nd::memorypool::startUp(); // <FS:ND/> tcmalloc replacement
+	nd::allocstats::startUp(); // <FS:ND/> start collecting alloc stats
 
 	//
 	// Start of the application
@@ -1760,6 +1763,10 @@ void LLAppViewer::flushVFSIO()
 
 bool LLAppViewer::cleanup()
 {
+	// <FS:ND> stop collection stats
+	nd::allocstats::tearDown();
+	// </FS:ND>
+
 	//ditch LLVOAvatarSelf instance
 	gAgentAvatarp = NULL;
 
@@ -3830,7 +3837,12 @@ bool LLAppViewer::anotherInstanceRunning()
 		// File exists, try opening with write permissions
 		LLAPRFile outfile ;
 		outfile.open(marker_file, LL_APR_WB);
-		apr_file_t* fMarker = outfile.getFileHandle() ; 
+
+		// <FS:ND> Remove LLVolatileAPRPool/apr_file_t and use FILE* instead
+		// apr_file_t* fMarker = outfile.getFileHandle() ; 
+		LLAPRFile::tFiletype* fMarker = outfile.getFileHandle() ; 
+		// </FS:ND>
+		
 		if (!fMarker)
 		{
 			// Another instance is running. Skip the rest of these operations.
@@ -5203,7 +5215,7 @@ void LLAppViewer::sendLogoutRequest()
 		if (mLogoutMarkerFile)
 		{
 			llinfos << "Created logout marker file " << mLogoutMarkerFileName << llendl;
-    		apr_file_close(mLogoutMarkerFile);
+    		// apr_file_close(mLogoutMarkerFile);
 		}
 		else
 		{

indra/newview/llappviewer.h

@@ -248,7 +248,11 @@ private:
 	LLAPRFile mMarkerFile; // A file created to indicate the app is running.
 
 	std::string mLogoutMarkerFileName;
-	apr_file_t* mLogoutMarkerFile; // A file created to indicate the app is running.
+
+	// <FS:ND> Remove LLVolatileAPRPool/apr_file_t and use FILE* instead
+	// apr_file_t* mLogoutMarkerFile; // A file created to indicate the app is running.
+	LLAPRFile::tFiletype* mLogoutMarkerFile; // A file created to indicate the app is running.
+	// </FS:ND>
 
 	//-TT The skin and theme we are using at startup. might want to make them static.
 	std::string mCurrentSkin;

indra/newview/llbreastmotion.cpp

@@ -198,7 +198,11 @@ LLVector3 LLBreastMotion::calculateAcceleration_local(const LLVector3 &new_char_
 BOOL LLBreastMotion::onUpdate(F32 time, U8* joint_mask)
 {
 	// Skip if disabled globally.
-	if (!gSavedSettings.getBOOL("AvatarPhysics"))
+	// <FS:PP> Attempt to speed up things a little
+	// if (!gSavedSettings.getBOOL("AvatarPhysics"))
+	static LLCachedControl<bool> AvatarPhysics(gSavedSettings, "AvatarPhysics");
+	if (!AvatarPhysics)
+	// </FS:PP>
 	{
 		return TRUE;
 	}
@@ -320,7 +324,11 @@ BOOL LLBreastMotion::onUpdate(F32 time, U8* joint_mask)
 	mBreastVelocity_local_vec.clamp(-mBreastMaxVelocityParam*100.0, mBreastMaxVelocityParam*100.0);
 
 	// Temporary debugging setting to cause all avatars to move, for profiling purposes.
-	if (gSavedSettings.getBOOL("AvatarPhysicsTest"))
+	// <FS:PP> Attempt to speed up things a little
+	// if (gSavedSettings.getBOOL("AvatarPhysicsTest"))
+	static LLCachedControl<bool> AvatarPhysicsTest(gSavedSettings, "AvatarPhysicsTest");
+	if (AvatarPhysicsTest)
+	// </FS:PP>
 	{
 		mBreastVelocity_local_vec[0] = sin(mTimer.getElapsedTimeF32()*4.0)*5.0;
 		mBreastVelocity_local_vec[1] = sin(mTimer.getElapsedTimeF32()*3.0)*5.0;

indra/newview/llcallingcard.cpp

@@ -746,7 +746,12 @@ void LLAvatarTracker::processChangeUserRights(LLMessageSystem* msg, void**)
 void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
 {
 	S32 count = msg->getNumberOfBlocksFast(_PREHASH_AgentBlock);
-	BOOL chat_notify = gSavedSettings.getBOOL("ChatOnlineNotification");
+
+	// <FS:PP> Attempt to speed up things a little
+	// 	BOOL chat_notify = gSavedSettings.getBOOL("ChatOnlineNotification");
+	static LLCachedControl<bool> ChatOnlineNotification(gSavedSettings, "ChatOnlineNotification");
+	BOOL chat_notify = ChatOnlineNotification;
+	// </FS:PP>
 
 	lldebugs << "Received " << count << " online notifications **** " << llendl;
 	if(count > 0)
@@ -783,7 +788,12 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
 			gInventory.addChangedMask(LLInventoryObserver::CALLING_CARD, LLUUID::null);
 		}
 		//[FIX FIRE-3522 : SJ] Notify Online/Offline to Nearby Chat even if chat_notify isnt true
-		if(chat_notify||LGGContactSets::getInstance()->notifyForFriend(agent_id)||gSavedSettings.getBOOL("OnlineOfflinetoNearbyChat"))
+		
+		// <FS:PP> Attempt to speed up things a little
+		// if(chat_notify||LGGContactSets::getInstance()->notifyForFriend(agent_id)||gSavedSettings.getBOOL("OnlineOfflinetoNearbyChat"))
+		static LLCachedControl<bool> OnlineOfflinetoNearbyChat(gSavedSettings, "OnlineOfflinetoNearbyChat");
+		if(chat_notify||LGGContactSets::getInstance()->notifyForFriend(agent_id)||OnlineOfflinetoNearbyChat)
+		// </FS:PP>
 		{
 			// Look up the name of this agent for the notification
 			LLAvatarNameCache::get(agent_id,
@@ -807,11 +817,19 @@ static void on_avatar_name_cache_notify(const LLUUID& agent_id,
 	// Ansariel: No please! Take preference settings into account!
 	LLSD args;
 
-	if ((gSavedSettings.getBOOL("NameTagShowUsernames")) && (gSavedSettings.getBOOL("UseDisplayNames")))
+	// <FS:PP> Attempt to speed up things a little
+	// if ((gSavedSettings.getBOOL("NameTagShowUsernames")) && (gSavedSettings.getBOOL("UseDisplayNames")))
+	static LLCachedControl<bool> NameTagShowUsernames(gSavedSettings, "NameTagShowUsernames");
+	static LLCachedControl<bool> UseDisplayNames(gSavedSettings, "UseDisplayNames");
+	if ((NameTagShowUsernames) && (UseDisplayNames))
+	// </FS:PP>
 	{
 		args["NAME"] = av_name.getCompleteName();
 	}
-	else if (gSavedSettings.getBOOL("UseDisplayNames"))
+	// <FS:PP> Attempt to speed up things a little
+	// else if (gSavedSettings.getBOOL("UseDisplayNames"))
+	else if (UseDisplayNames)
+	// </FS:PP>
 	{
 		args["NAME"] = av_name.mDisplayName;
 	}
@@ -856,7 +874,13 @@ static void on_avatar_name_cache_notify(const LLUUID& agent_id,
 	// online/offline times to be referenced in chat & logged.
 	// [FIRE-3522 : SJ] Only show Online/Offline toast for groups which have enabled "Show notice for this set" and in the settingpage of CS is checked that the messages need to be in Toasts
 	//                  or for groups which have enabled "Show notice for this set" and in the settingpage of CS is checked that the messages need to be in Nearby Chat
-	if ((gSavedSettings.getBOOL("OnlineOfflinetoNearbyChat")) || (gSavedSettings.getBOOL("FSContactSetsNotificationNearbyChat") && LGGContactSets::getInstance()->notifyForFriend(agent_id)))
+	
+	// <FS:PP> Attempt to speed up things a little
+	// if ((gSavedSettings.getBOOL("OnlineOfflinetoNearbyChat")) || (gSavedSettings.getBOOL("FSContactSetsNotificationNearbyChat") && LGGContactSets::getInstance()->notifyForFriend(agent_id)))
+	static LLCachedControl<bool> OnlineOfflinetoNearbyChat(gSavedSettings, "OnlineOfflinetoNearbyChat");
+	static LLCachedControl<bool> FSContactSetsNotificationNearbyChat(gSavedSettings, "FSContactSetsNotificationNearbyChat");
+	if ((OnlineOfflinetoNearbyChat) || (FSContactSetsNotificationNearbyChat && LGGContactSets::getInstance()->notifyForFriend(agent_id)))
+	// </FS:PP>
 	{
 		static LLCachedControl<bool> history_only(gSavedSettings, "OnlineOfflinetoNearbyChatHistory"); // LO - Adding a setting to show online/offline notices only in chat history. Helps prevent your screen from being filled with online notices on login.
 		LLChat chat;
@@ -1021,7 +1045,12 @@ bool LLCollectMappableBuddies::operator()(const LLUUID& buddy_id, LLRelationship
 	{
 		// <FS:Ansariel> Friend names on worldmap should respect display name settings
 		//mMappable.insert(value);
-		if (LLAvatarNameCache::useDisplayNames() && gSavedSettings.getBOOL("NameTagShowUsernames"))
+		
+		// <FS:PP> Attempt to speed up things a little
+		// if (LLAvatarNameCache::useDisplayNames() && gSavedSettings.getBOOL("NameTagShowUsernames"))
+		static LLCachedControl<bool> NameTagShowUsernames(gSavedSettings, "NameTagShowUsernames");
+		if (LLAvatarNameCache::useDisplayNames() && NameTagShowUsernames)
+		// </FS:PP>
 		{
 			buddy_map_t::value_type value(av_name.getCompleteName(), buddy_id);
 			mMappable.insert(value);

indra/newview/lldrawpoolalpha.cpp

@@ -100,11 +100,15 @@ void LLDrawPoolAlpha::renderDeferred(S32 pass)
 
 S32 LLDrawPoolAlpha::getNumPostDeferredPasses() 
 { 
+	static LLCachedControl<bool> RenderDepthOfField(gSavedSettings, "RenderDepthOfField"); // <FS:PP> Attempt to speed up things a little
 	if (LLPipeline::sImpostorRender)
 	{ //skip depth buffer filling pass when rendering impostors
 		return 1;
 	}
-	else if (gSavedSettings.getBOOL("RenderDepthOfField"))
+	// <FS:PP> Attempt to speed up things a little
+	// else if (gSavedSettings.getBOOL("RenderDepthOfField"))
+	else if (RenderDepthOfField)
+	// </FS:PP>
 	{
 		return 2; 
 	}

indra/newview/lldrawpoolbump.cpp

@@ -803,7 +803,11 @@ void LLDrawPoolBump::endBump(U32 pass)
 
 S32 LLDrawPoolBump::getNumDeferredPasses()
 { 
-	if (gSavedSettings.getBOOL("RenderObjectBump"))
+	// <FS:PP> Attempt to speed up things a little
+	// if (gSavedSettings.getBOOL("RenderObjectBump"))
+	static LLCachedControl<bool> RenderObjectBump(gSavedSettings, "RenderObjectBump");
+	if (RenderObjectBump)
+	// </FS:PP>
 	{
 		return 1;
 	}
@@ -1144,7 +1148,11 @@ void LLBumpImageList::generateNormalMapFromAlpha(LLImageRaw* src, LLImageRaw* nr
 
 	S32 src_cmp = src->getComponents();
 
-	F32 norm_scale = gSavedSettings.getF32("RenderNormalMapScale");
+	// <FS:PP> Attempt to speed up things a little
+	// F32 norm_scale = gSavedSettings.getF32("RenderNormalMapScale");
+	static LLCachedControl<F32> RenderNormalMapScale(gSavedSettings, "RenderNormalMapScale");
+	F32 norm_scale = RenderNormalMapScale;
+	// </FS:PP>
 
 	U32 idx = 0;
 	//generate normal map from pseudo-heightfield
@@ -1373,7 +1381,11 @@ void LLBumpImageList::onSourceLoaded( BOOL success, LLViewerTexture *src_vi, LLI
 					LLGLDisable blend(GL_BLEND);
 					gGL.setColorMask(TRUE, TRUE);
 					gNormalMapGenProgram.bind();
-					gNormalMapGenProgram.uniform1f("norm_scale", gSavedSettings.getF32("RenderNormalMapScale"));
+					// <FS:PP> Attempt to speed up things a little
+					// gNormalMapGenProgram.uniform1f("norm_scale", gSavedSettings.getF32("RenderNormalMapScale"));
+					static LLCachedControl<F32> RenderNormalMapScale(gSavedSettings, "RenderNormalMapScale");
+					gNormalMapGenProgram.uniform1f("norm_scale", RenderNormalMapScale);
+					// </FS:PP>
 					gNormalMapGenProgram.uniform1f("stepX", 1.f/bump->getWidth());
 					gNormalMapGenProgram.uniform1f("stepY", 1.f/bump->getHeight());
 

indra/newview/lldrawpoolground.cpp

@@ -58,7 +58,11 @@ void LLDrawPoolGround::prerender()
 
 void LLDrawPoolGround::render(S32 pass)
 {
-	if (mDrawFace.empty() || !gSavedSettings.getBOOL("RenderGround"))
+	// <FS:PP> Attempt to speed up things a little
+	// if (mDrawFace.empty() || !gSavedSettings.getBOOL("RenderGround"))
+	static LLCachedControl<bool> RenderGround(gSavedSettings, "RenderGround");
+	if (mDrawFace.empty() || !RenderGround)
+	// </FS:PP>
 	{
 		return;
 	}	

indra/newview/lldrawpoolterrain.cpp

@@ -66,8 +66,16 @@ LLDrawPoolTerrain::LLDrawPoolTerrain(LLViewerTexture *texturep) :
 	U32 int_format = GL_ALPHA;
 
 	// Hack!
-	sDetailScale = 1.f/gSavedSettings.getF32("RenderTerrainScale");
-	sDetailMode = gSavedSettings.getS32("RenderTerrainDetail");
+
+	// <FS:PP> Attempt to speed up things a little
+	// sDetailScale = 1.f/gSavedSettings.getF32("RenderTerrainScale");
+	// sDetailMode = gSavedSettings.getS32("RenderTerrainDetail");
+	static LLCachedControl<F32> RenderTerrainScale(gSavedSettings, "RenderTerrainScale");
+	static LLCachedControl<S32> RenderTerrainDetail(gSavedSettings, "RenderTerrainDetail");
+	sDetailScale = 1.f/RenderTerrainScale;
+	sDetailMode = RenderTerrainDetail;
+	// </FS:PP>
+
 	mAlphaRampImagep = LLViewerTextureManager::getFetchedTextureFromFile("alpha_gradient.tga", 
 													TRUE, LLGLTexture::BOOST_UI, 
 													LLViewerTexture::FETCHED_TEXTURE,