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

indra/cmake/00-Common.cmake

@@ -269,14 +269,23 @@ if (DARWIN)
   add_definitions(-DLL_DARWIN=1 -D_XOPEN_SOURCE)
   set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch")
+  if(${CMAKE_C_COMPILER} MATCHES "gcc*")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch")
-  # NOTE: it's critical that the optimization flag is put in front.
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch")
-  # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
+    # NOTE: it's critical that the optimization flag is put in front.
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
+    # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
-  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
-  set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
+  elseif(${CMAKE_C_COMPILER} MATCHES "clang*")
+    # NOTE: it's critical that the optimization flag is put in front.
+    # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -msse3")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -msse3")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -msse3")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 -msse3")
+  endif()
 endif (DARWIN)
 
 

indra/cmake/APR.cmake

@@ -33,8 +33,8 @@ else (STANDALONE)
       optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.dylib
       )
     set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.0.dylib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.dylib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.dylib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.dylib
       )
     set(APRICONV_LIBRARIES iconv)
   else (WINDOWS)

indra/cmake/Boost.cmake

@@ -40,10 +40,10 @@ else (STANDALONE)
           debug libboost_regex-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION})
 	
   elseif (DARWIN)
-    set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
+    set(BOOST_FILESYSTEM_LIBRARY boost_filesystem)
-    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
+    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options)
-    set(BOOST_REGEX_LIBRARY boost_regex-mt)
+    set(BOOST_REGEX_LIBRARY boost_regex)
-    set(BOOST_SYSTEM_LIBRARY boost_system-mt)  
+    set(BOOST_SYSTEM_LIBRARY boost_system)  
   elseif (LINUX)
     set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)

indra/cmake/CURL.cmake

@@ -14,6 +14,9 @@ else (STANDALONE)
     optimized libcurl)
   else (WINDOWS)
     set(CURL_LIBRARIES curl)
+    if(LINUX AND WORD_SIZE EQUAL 64)
+      list(APPEND CURL_LIBRARIES idn)
+    endif(LINUX AND WORD_SIZE EQUAL 64)
   endif (WINDOWS)
   set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
 endif (STANDALONE)

indra/cmake/FMODEX.cmake

@@ -18,7 +18,7 @@ if (NOT FMODEX_LIBRARY)
   set(FMODEX_SDK_DIR CACHE PATH "Path to the FMOD Ex SDK.")
   if (FMODEX_SDK_DIR)
     find_library(FMODEX_LIBRARY
-                 fmodex fmodex_vc fmodexL_vc
+                 fmodex_vc fmodexL_vc fmodex fmodexL fmodex64 fmodexL64
                  PATHS
                  ${FMODEX_SDK_DIR}/api/lib
                  ${FMODEX_SDK_DIR}/api

indra/cmake/GooglePerfTools.cmake

@@ -1,12 +1,16 @@
 # -*- cmake -*-
 include(Prebuilt)
 
+if(WORD_SIZE EQUAL 64)
+  set(DISABLE_TCMALLOC TRUE)
+endif(WORD_SIZE EQUAL 64)
+
 if (STANDALONE)
   include(FindGooglePerfTools)
 else (STANDALONE)
-  if (LINUX OR WINDOWS)
+  if (LINUX OR WINDOWS AND NOT WORD_SIZE EQUAL 64)
     use_prebuilt_binary(gperftools)
-  endif (LINUX OR WINDOWS)
+  endif (LINUX OR WINDOWS AND NOT WORD_SIZE EQUAL 64)
   if (WINDOWS)
     set(TCMALLOC_LIBRARIES libtcmalloc_minimal.lib)
     set(TCMALLOC_LINKER_FLAGS "/INCLUDE:\"__tcmalloc\"")

indra/cmake/Hunspell.cmake

@@ -6,7 +6,7 @@ if (STANDALONE)
 else (STANDALONE)
     use_prebuilt_binary(hunspell)
 	
-	set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/hunspell)
+	set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/hunspell)
 
 	if (LINUX OR DARWIN)
 	    set(HUNSPELL_LIBRARY hunspell-1.3)

indra/cmake/JPEG.cmake

@@ -13,8 +13,8 @@ else (STANDALONE)
     set(JPEG_LIBRARIES jpeg)
   elseif (DARWIN)
     set(JPEG_LIBRARIES
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/liblljpeg.a
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/liblljpeg.a
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libjpeg.a
       )
   elseif (WINDOWS)
     set(JPEG_LIBRARIES jpeglib)

indra/cmake/JsonCpp.cmake

@@ -14,7 +14,7 @@ else (STANDALONE)
       debug json_vc${MSVC_SUFFIX}d
       optimized json_vc${MSVC_SUFFIX})
   elseif (DARWIN)
-    set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt)
+    set(JSONCPP_LIBRARIES json_linux-gcc-4.0.1_libmt)
   elseif (LINUX)
     set(JSONCPP_LIBRARIES jsoncpp)
   endif (WINDOWS)

indra/cmake/LLWindow.cmake

@@ -18,7 +18,11 @@ else (STANDALONE)
     use_prebuilt_binary(SDL)
     set (SDL_FOUND TRUE)
     set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR})
-    set (SDL_LIBRARY SDL directfb fusion direct)
+    if(WORD_SIZE EQUAL 64)
+      set (SDL_LIBRARY SDL)
+    else(WORD_SIZE EQUAL 64)
+      set (SDL_LIBRARY SDL directfb fusion direct)
+    endif(WORD_SIZE EQUAL 64)
   endif (LINUX)
 endif (STANDALONE)
 

indra/cmake/Linking.cmake

@@ -10,9 +10,9 @@ if (NOT STANDALONE)
     set(ARCH_PREBUILT_DIRS_RELEASE ${ARCH_PREBUILT_DIRS})
     set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS})
   elseif (DARWIN)
-    set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release)
+    set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
-    set(ARCH_PREBUILT_DIRS ${ARCH_PREBUILT_DIRS_RELEASE})
+    set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release)
-    set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS_RELEASE})
+    set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug)
   endif (WINDOWS)
 endif (NOT STANDALONE)
 

indra/cmake/OpenSSL.cmake

@@ -16,8 +16,6 @@ else (STANDALONE)
   set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
 endif (STANDALONE)
 
-if (LINUX)
+if (LINUX OR DARWIN)
   set(CRYPTO_LIBRARIES crypto)
-elseif (DARWIN)
+endif (LINUX OR DARWIN)
-  set(CRYPTO_LIBRARIES llcrypto)
-endif (LINUX)

indra/cmake/Variables.cmake

@@ -76,37 +76,36 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(DARWIN 1)
 
-  #SDK Compiler and Deployment targets for XCode
+  if(${CMAKE_GENERATOR} MATCHES Xcode) 
-  if (${XCODE_VERSION} VERSION_LESS 4.0.0)
+    #SDK Compiler and Deployment targets for XCode
-    set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
+    if (${XCODE_VERSION} VERSION_LESS 4.0.0)
-    set(CMAKE_XCODE_ATTIBUTE_GCC_VERSION "4.2")
+      set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
-  else (${XCODE_VERSION} VERSION_LESS 4.0.0)
+      set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5)
+      set(CMAKE_XCODE_ATTIBUTE_GCC_VERSION "4.2")
+    else (${XCODE_VERSION} VERSION_LESS 4.0.0)
+      set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk)
+      set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6)
+      set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
+    endif (${XCODE_VERSION} VERSION_LESS 4.0.0)
+  else()
     set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk)
+    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6)
     set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
-  endif (${XCODE_VERSION} VERSION_LESS 4.0.0)
+  endif(${CMAKE_GENERATOR} MATCHES Xcode)
 
-  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5)
+  ## We currently support only 32-bit i386 builds, so use these:
+  set(CMAKE_OSX_ARCHITECTURES i386)
+  set(ARCH i386)
+  set(WORD_SIZE 32)
 
-  # NOTE: To attempt an i386/PPC Universal build, add this on the configure line:
+  ## But if you want to compile for mixed 32/64 bit, try these:
-  # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc'
+  # set(CMAKE_OSX_ARCHITECTURES i386;x86_64)
-  # Build only for i386 by default, system default on MacOSX 10.6 is x86_64
+  # set(ARCH universal)
-  if (NOT CMAKE_OSX_ARCHITECTURES)
+  # set(WORD_SIZE 64)
-    set(CMAKE_OSX_ARCHITECTURES i386)
-  endif (NOT CMAKE_OSX_ARCHITECTURES)
-
-  if (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
-    set(ARCH universal)
-  else (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
-    if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
-      set(ARCH ppc)
-    else (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
-      set(ARCH i386)
-    endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
-  endif (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
 
+  ## Finally, set up the build output directories
   set(LL_ARCH ${ARCH}_darwin)
   set(LL_ARCH_DIR universal-darwin)
-  set(WORD_SIZE 32)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
 

indra/llcommon/llapp.h

@@ -43,10 +43,14 @@ template <typename Type> class LLAtomic32;
 typedef LLAtomic32<U32> LLAtomicU32;
 class LLErrorThread;
 class LLLiveFile;
+
+
 #if LL_LINUX
-typedef struct siginfo siginfo_t;
+	#include <signal.h>
+	//typedef struct siginfo siginfo_t; //Removed as per changes in glibc 2.16 - Drake Arconis
 #endif
 
+
 typedef void (*LLAppErrorHandler)();
 typedef void (*LLAppChildCallback)(int pid, bool exited, int status);
 

indra/llrender/llgl.h

@@ -516,4 +516,5 @@ extern BOOL gGLActive;
 #ifndef GL_DEPTH24_STENCIL8
 #define GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_EXT
 #endif 
+
 #endif // LL_LLGL_H

indra/llrender/llglheaders.h

@@ -783,6 +783,7 @@ extern PFNGLDEBUGMESSAGECONTROLARBPROC glDebugMessageControlARB;
 extern PFNGLDEBUGMESSAGEINSERTARBPROC glDebugMessageInsertARB;
 extern PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
 extern PFNGLGETDEBUGMESSAGELOGARBPROC glGetDebugMessageLogARB;
+
 #elif LL_DARWIN
 //----------------------------------------------------------------------------
 // LL_DARWIN
@@ -825,6 +826,7 @@ extern void glGenerateMipmapEXT(GLenum target) AVAILABLE_MAC_OS_X_VERSION_10_4_A
 #define glGenerateMipmap glGenerateMipmapEXT
 #define GL_MAX_SAMPLES	0x8D57
 #endif
+
 // GL_ARB_draw_buffers
 extern void glDrawBuffersARB(GLsizei n, const GLenum* bufs) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
 
@@ -997,7 +999,7 @@ extern void glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
 }
 #endif
 
-#include <AGL/gl.h>
+#include <OpenGL/gl.h>
 
 #endif // LL_MESA / LL_WINDOWS / LL_DARWIN
 
@@ -1029,4 +1031,5 @@ extern void glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
 #define GL_TEXTURE_FREE_MEMORY_ATI                 0x87FC
 #define GL_RENDERBUFFER_FREE_MEMORY_ATI            0x87FD
 #endif
+
 #endif // LL_LLGLHEADERS_H

indra/llrender/llshadermgr.cpp

@@ -231,7 +231,6 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader)
 	
 	if (features->hasLighting)
 	{
-	
 		if (features->hasWaterFog)
 		{
 			if (features->disableTextureIndex)
@@ -571,7 +570,7 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 		return 0;
 	}
 
-		//we can't have any lines longer than 1024 characters 
+	//we can't have any lines longer than 1024 characters 
 	//or any shaders longer than 4096 lines... deal - DaveP
 	GLcharARB buff[1024];
 	GLcharARB* text[4096];

indra/llwindow/llmousehandler.h

@@ -45,17 +45,20 @@ class LLMouseHandler
 public:
 	LLMouseHandler() {}
 	virtual ~LLMouseHandler() {}
+
 	typedef enum {
 		SHOW_NEVER,
 		SHOW_IF_NOT_BLOCKED,
 		SHOW_ALWAYS,
 	} EShowToolTip;
+
 	typedef enum {
 		CLICK_LEFT,
 		CLICK_MIDDLE,
 		CLICK_RIGHT,
 		CLICK_DOUBLELEFT
 	} EClickType;
+
 	virtual BOOL	handleAnyMouseClick(S32 x, S32 y, MASK mask, EClickType clicktype, BOOL down);
 	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask) = 0;
 	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask) = 0;

indra/llwindow/llwindow.cpp

@@ -113,6 +113,7 @@ LLWindow::LLWindow(LLWindowCallbacks* callbacks, BOOL fullscreen, U32 flags)
 	  mSupportedResolutions(NULL),
 	  mNumSupportedResolutions(0),
 	  mCurrentCursor(UI_CURSOR_ARROW),
+	  mNextCursor(UI_CURSOR_ARROW),
 	  mCursorHidden(FALSE),
 	  mBusyCount(0),
 	  mIsMouseClipping(FALSE),
@@ -125,7 +126,6 @@ LLWindow::LLWindow(LLWindowCallbacks* callbacks, BOOL fullscreen, U32 flags)
 
 LLWindow::~LLWindow()
 {
-
 }
 
 //virtual
@@ -139,6 +139,7 @@ BOOL LLWindow::canDelete()
 {
 	return TRUE;
 }
+
 // virtual
 void LLWindow::incBusyCount()
 {

indra/llwindow/llwindow.h

@@ -104,12 +104,14 @@ public:
 	virtual S32 getBusyCount() const;
 
 	// Sets cursor, may set to arrow+hourglass
-	virtual void setCursor(ECursorType cursor) = 0;
+	virtual void setCursor(ECursorType cursor) { mNextCursor = cursor; };
 	virtual ECursorType getCursor() const;
+	virtual void updateCursor() = 0;
 
 	virtual void captureMouse() = 0;
 	virtual void releaseMouse() = 0;
 	virtual void setMouseClipping( BOOL b ) = 0;
+
 	virtual BOOL isClipboardTextAvailable() = 0;
 	virtual BOOL pasteTextFromClipboard(LLWString &dst) = 0;
 	virtual BOOL copyTextToClipboard(const LLWString &src) = 0;
@@ -196,6 +198,7 @@ protected:
 	LLWindowResolution* mSupportedResolutions;
 	S32			mNumSupportedResolutions;
 	ECursorType	mCurrentCursor;
+	ECursorType	mNextCursor;
 	BOOL		mCursorHidden;
 	S32			mBusyCount;	// how deep is the "cursor busy" stack?
 	BOOL		mIsMouseClipping;  // Is this window currently clipping the mouse

indra/llwindow/llwindowcallbacks.h

@@ -91,5 +91,4 @@ public:
 };
 
 
-
 #endif

indra/llwindow/llwindowheadless.h

@@ -61,7 +61,7 @@ public:
 	/*virtual*/ void showCursorFromMouseMove() {};
 	/*virtual*/ void hideCursorUntilMouseMove() {};
 	/*virtual*/ BOOL isCursorHidden() {return FALSE;};
-	/*virtual*/ void setCursor(ECursorType cursor) {};
+	/*virtual*/ void updateCursor() {};
 	//virtual ECursorType getCursor() { return mCurrentCursor; };
 	/*virtual*/ void captureMouse() {};
 	/*virtual*/ void releaseMouse() {};

indra/llwindow/llwindowmacosx-objc.mm

@@ -50,6 +50,11 @@ void setupCocoa()
 	{
 		NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 		
+		// The following prevents the Cocoa command line parser from trying to open 'unknown' arguements as documents.
+		// ie. running './secondlife -set Language fr' would cause a pop-up saying can't open document 'fr' 
+		// when init'ing the Cocoa App window.		
+		[[NSUserDefaults standardUserDefaults] setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"];
+		
 		// This is a bit of voodoo taken from the Apple sample code "CarbonCocoa_PictureCursor":
 		//   http://developer.apple.com/samplecode/CarbonCocoa_PictureCursor/index.html
 		
@@ -60,6 +65,8 @@ void setupCocoa()
 		[[[NSWindow alloc] init] release];
 
 		[pool release];
+		
+		inited = true;
 	}
 }
 

indra/llwindow/llwindowmacosx.cpp

@@ -484,7 +484,6 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
 			true,
 			(long)this);
 
-
 		if (!mWindow)
 		{
 			setupFailure("Window creation error", "Error", OSMB_OK);
@@ -581,16 +580,16 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
 					AGL_NO_RECOVERY,
 					AGL_DOUBLEBUFFER,
 					AGL_CLOSEST_POLICY,
-						AGL_ACCELERATED,
+					AGL_ACCELERATED,
-						AGL_SAMPLE_BUFFERS_ARB, mFSAASamples > 0 ? 1 : 0,
+					AGL_SAMPLE_BUFFERS_ARB, mFSAASamples > 0 ? 1 : 0,
-						AGL_SAMPLES_ARB, mFSAASamples,
+					AGL_SAMPLES_ARB, mFSAASamples,
-						AGL_RED_SIZE, 8,
+					AGL_RED_SIZE, 8,
-						AGL_GREEN_SIZE, 8,
+					AGL_GREEN_SIZE, 8,
-						AGL_BLUE_SIZE, 8,
+					AGL_BLUE_SIZE, 8,
-						AGL_ALPHA_SIZE, 8,
+					AGL_ALPHA_SIZE, 8,
-						AGL_DEPTH_SIZE, 24,
+					AGL_DEPTH_SIZE, 24,
-						AGL_STENCIL_SIZE, 8,
+					AGL_STENCIL_SIZE, 8,
-						AGL_NONE
+					AGL_NONE
 				};
 
 				LL_DEBUGS("Window") << "createContext: creating windowed pixelformat" << LL_ENDL;
@@ -1042,6 +1041,7 @@ void LLWindowMacOSX::hide()
 	HideWindow(mWindow);
 }
 
+//virtual
 void LLWindowMacOSX::minimize()
 {
 	setMouseClipping(FALSE);
@@ -1049,6 +1049,7 @@ void LLWindowMacOSX::minimize()
 	CollapseWindow(mWindow, true);
 }
 
+//virtual
 void LLWindowMacOSX::restore()
 {
 	show();
@@ -1169,6 +1170,8 @@ void LLWindowMacOSX::gatherInput()
 
 		}
 	}
+	
+	updateCursor();
 }
 
 BOOL LLWindowMacOSX::getPosition(LLCoordScreen *position)
@@ -1441,7 +1444,7 @@ static void fixOrigin(void)
 	::GetPortBounds(port, &portrect);
 	if((portrect.left != 0) || (portrect.top != 0))
 	{
-		// Mozilla sometimes changes our port origin.  Fuckers.
+		// Mozilla sometimes changes our port origin.
 		::SetOrigin(0,0);
 	}
 }
@@ -2133,6 +2136,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 				{
 					UInt32 modifiers = 0;
 
+
 					// First, process the raw event.
 					{
 						EventRef rawEvent = NULL;
@@ -2843,7 +2847,7 @@ static void initPixmapCursor(int cursorid, int hotspotX, int hotspotY)
 	gCursors[cursorid] = createImageCursor(fullpath.c_str(), hotspotX, hotspotY);
 }
 
-void LLWindowMacOSX::setCursor(ECursorType cursor)
+void LLWindowMacOSX::updateCursor()
 {
 	OSStatus result = noErr;
 
@@ -2851,30 +2855,30 @@ void LLWindowMacOSX::setCursor(ECursorType cursor)
 	{
 		// A drag is in progress...remember the requested cursor and we'll
 		// restore it when it is done
-		mCurrentCursor = cursor;
+		mCurrentCursor = mNextCursor;
 		return;
 	}
 		
-	if (cursor == UI_CURSOR_ARROW
+	if (mNextCursor == UI_CURSOR_ARROW
 		&& mBusyCount > 0)
 	{
-		cursor = UI_CURSOR_WORKING;
+		mNextCursor = UI_CURSOR_WORKING;
 	}
 	
-	if(mCurrentCursor == cursor)
+	if(mCurrentCursor == mNextCursor)
 		return;
 
 	// RN: replace multi-drag cursors with single versions
-	if (cursor == UI_CURSOR_ARROWDRAGMULTI)
+	if (mNextCursor == UI_CURSOR_ARROWDRAGMULTI)
 	{
-		cursor = UI_CURSOR_ARROWDRAG;
+		mNextCursor = UI_CURSOR_ARROWDRAG;
 	}
-	else if (cursor == UI_CURSOR_ARROWCOPYMULTI)
+	else if (mNextCursor == UI_CURSOR_ARROWCOPYMULTI)
 	{
-		cursor = UI_CURSOR_ARROWCOPY;
+		mNextCursor = UI_CURSOR_ARROWCOPY;
 	}
 
-	switch(cursor)
+	switch(mNextCursor)
 	{
 	default:
 	case UI_CURSOR_ARROW:
@@ -2926,7 +2930,7 @@ void LLWindowMacOSX::setCursor(ECursorType cursor)
 	case UI_CURSOR_TOOLBUY:
 	case UI_CURSOR_TOOLOPEN:
 	case UI_CURSOR_TOOLPAY:
-		result = setImageCursor(gCursors[cursor]);
+		result = setImageCursor(gCursors[mNextCursor]);
 		break;
 
 	}
@@ -2936,7 +2940,7 @@ void LLWindowMacOSX::setCursor(ECursorType cursor)
 		InitCursor();
 	}
 
-	mCurrentCursor = cursor;
+	mCurrentCursor = mNextCursor;
 }
 
 ECursorType LLWindowMacOSX::getCursor() const
@@ -2967,9 +2971,9 @@ void LLWindowMacOSX::initCursors()
 	initPixmapCursor(UI_CURSOR_TOOLPLAY, 1, 1);
 	initPixmapCursor(UI_CURSOR_TOOLPAUSE, 1, 1);
 	initPixmapCursor(UI_CURSOR_TOOLMEDIAOPEN, 1, 1);
-	initPixmapCursor(UI_CURSOR_TOOLSIT, 1, 1);
+	initPixmapCursor(UI_CURSOR_TOOLSIT, 20, 15);
-	initPixmapCursor(UI_CURSOR_TOOLBUY, 1, 1);
+	initPixmapCursor(UI_CURSOR_TOOLBUY, 20, 15);
-	initPixmapCursor(UI_CURSOR_TOOLOPEN, 1, 1);
+	initPixmapCursor(UI_CURSOR_TOOLOPEN, 20, 15);
 	initPixmapCursor(UI_CURSOR_TOOLPAY, 1, 1);
 
 	initPixmapCursor(UI_CURSOR_SIZENWSE, 10, 10);

indra/llwindow/llwindowmacosx.h

@@ -73,7 +73,7 @@ public:
 	/*virtual*/ void showCursorFromMouseMove();
 	/*virtual*/ void hideCursorUntilMouseMove();
 	/*virtual*/ BOOL isCursorHidden();
-	/*virtual*/ void setCursor(ECursorType cursor);
+	/*virtual*/ void updateCursor();
 	/*virtual*/ ECursorType getCursor() const;
 	/*virtual*/ void captureMouse();
 	/*virtual*/ void releaseMouse();

indra/llwindow/llwindowmesaheadless.h

@@ -65,7 +65,7 @@ public:
 	/*virtual*/ void showCursorFromMouseMove() {};
 	/*virtual*/ void hideCursorUntilMouseMove() {};
 	/*virtual*/ BOOL isCursorHidden() {return FALSE;};
-	/*virtual*/ void setCursor(ECursorType cursor) {};
+	/*virtual*/ void updateCursor() {};
 	//virtual ECursorType getCursor() { return mCurrentCursor; };
 	/*virtual*/ void captureMouse() {};
 	/*virtual*/ void releaseMouse() {};

indra/llwindow/llwindowsdl.cpp

@@ -39,6 +39,7 @@
 
 #include "llwindowcallbacks.h"
 #include "llkeyboardsdl.h"
+
 #include "llerror.h"
 #include "llgl.h"
 #include "llstring.h"
@@ -221,15 +222,14 @@ LLWindowSDL::LLWindowSDL(LLWindowCallbacks* callbacks,
 #endif // LL_X11
 
 #if LL_GTK
-	// We MUST be the first to initialize GTK, i.e. we have to beat
+	// We MUST be the first to initialize GTK so that GTK doesn't get badly
-	// our embedded Mozilla to the punch so that GTK doesn't get badly
 	// initialized with a non-C locale and cause lots of serious random
 	// weirdness.
 	ll_try_gtk_init();
 #endif // LL_GTK
 
-	// Get the original aspect ratio of the main device.
+	// Assume 4:3 aspect ratio until we know better
-	mOriginalAspectRatio = 1024.0 / 768.0;  // !!! *FIX: ? //(double)CGDisplayPixelsWide(mDisplay) / (double)CGDisplayPixelsHigh(mDisplay);
+	mOriginalAspectRatio = 1024.0 / 768.0;
 
 	if (title.empty())
 		mWindowTitle = "SDL Window";  // *FIX: (???)
@@ -425,7 +425,6 @@ static int x11_detect_VRAM_kb()
 BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, BOOL fullscreen, BOOL disable_vsync)
 {
 	//bool			glneedsinit = false;
-//    const char *gllibname = null;
 
 	llinfos << "createContext, fullscreen=" << fullscreen <<
 	    " size=" << width << "x" << height << llendl;
@@ -856,11 +855,13 @@ void LLWindowSDL::hide()
     // *FIX: What to do with SDL?
 }
 
+//virtual
 void LLWindowSDL::minimize()
 {
     // *FIX: What to do with SDL?
 }
 
+//virtual
 void LLWindowSDL::restore()
 {
     // *FIX: What to do with SDL?
@@ -1680,12 +1681,13 @@ void check_vm_bloat()
 	}
 #endif // LL_LINUX
 }
+
+
 // virtual
 void LLWindowSDL::processMiscNativeEvents()
 {
 #if LL_GTK
 	// Pump GTK events to avoid starvation for:
-	// * Embedded Gecko
 	// * DBUS servicing
 	// * Anything else which quietly hooks into the default glib/GTK loop
     if (ll_try_gtk_init())
@@ -1721,7 +1723,7 @@ void LLWindowSDL::processMiscNativeEvents()
 
 void LLWindowSDL::gatherInput()
 {
-	const Uint32 CLICK_THRESHOLD = 500;  // milliseconds
+    const Uint32 CLICK_THRESHOLD = 500;  // milliseconds
     static int leftClick = 0;
     static int rightClick = 0;
     static Uint32 lastLeftDown = 0;
@@ -1747,16 +1749,17 @@ void LLWindowSDL::gatherInput()
 		    mKeyScanCode = event.key.keysym.scancode;
 		    mKeyVirtualKey = event.key.keysym.unicode;
 		    mKeyModifiers = event.key.keysym.mod;
-                gKeyboard->handleKeyDown(event.key.keysym.sym, event.key.keysym.mod);
-		// part of the fix for SL-13243
-		if (SDLCheckGrabbyKeys(event.key.keysym.sym, TRUE) != 0)
-			SDLReallyCaptureInput(TRUE);
 
-                if (event.key.keysym.unicode)
+		    gKeyboard->handleKeyDown(event.key.keysym.sym, event.key.keysym.mod);
-				{
+		    // part of the fix for SL-13243
-					handleUnicodeUTF16(event.key.keysym.unicode,
+		    if (SDLCheckGrabbyKeys(event.key.keysym.sym, TRUE) != 0)
-									   gKeyboard->currentMask(FALSE));
+			    SDLReallyCaptureInput(TRUE);
-				}
+
+		    if (event.key.keysym.unicode)
+		    {
+			    handleUnicodeUTF16(event.key.keysym.unicode,
+					       gKeyboard->currentMask(FALSE));
+		    }
                 break;
 
             case SDL_KEYUP:
@@ -1767,8 +1770,8 @@ void LLWindowSDL::gatherInput()
 		    if (SDLCheckGrabbyKeys(event.key.keysym.sym, FALSE) == 0)
 			    SDLReallyCaptureInput(FALSE); // part of the fix for SL-13243
 
-		gKeyboard->handleKeyUp(event.key.keysym.sym, event.key.keysym.mod);
+		    gKeyboard->handleKeyUp(event.key.keysym.sym, event.key.keysym.mod);
-                break;
+		    break;
 
             case SDL_MOUSEBUTTONDOWN:
             {
@@ -1933,6 +1936,8 @@ void LLWindowSDL::gatherInput()
         }
     }
 	
+	updateCursor();
+
 #if LL_X11
     // This is a good time to stop flashing the icon if our mFlashTimer has
     // expired.
@@ -2018,7 +2023,7 @@ static SDL_Cursor *makeSDLCursorFromBMP(const char *filename, int hotx, int hoty
 	return sdlcursor;
 }
 
-void LLWindowSDL::setCursor(ECursorType cursor)
+void LLWindowSDL::updateCursor()
 {
 	if (ATIbug) {
 		// cursor-updating is very flaky when this bug is
@@ -2026,11 +2031,11 @@ void LLWindowSDL::setCursor(ECursorType cursor)
 		return;
 	}
 
-	if (mCurrentCursor != cursor)
+	if (mCurrentCursor != mNextCursor)
 	{
-		if (cursor < UI_CURSOR_COUNT)
+		if (mNextCursor < UI_CURSOR_COUNT)
 		{
-			SDL_Cursor *sdlcursor = mSDLCursors[cursor];
+			SDL_Cursor *sdlcursor = mSDLCursors[mNextCursor];
 			// Try to default to the arrow for any cursors that
 			// did not load correctly.
 			if (!sdlcursor && mSDLCursors[UI_CURSOR_ARROW])
@@ -2038,9 +2043,9 @@ void LLWindowSDL::setCursor(ECursorType cursor)
 			if (sdlcursor)
 				SDL_SetCursor(sdlcursor);
 		} else {
-			llwarns << "Tried to set invalid cursor number " << cursor << llendl;
+			llwarns << "Tried to set invalid cursor number " << mNextCursor << llendl;
 		}
-		mCurrentCursor = cursor;
+		mCurrentCursor = mNextCursor;
 	}
 }
 

indra/llwindow/llwindowsdl.h

@@ -78,7 +78,7 @@ public:
 	/*virtual*/ void showCursorFromMouseMove();
 	/*virtual*/ void hideCursorUntilMouseMove();
 	/*virtual*/ BOOL isCursorHidden();
-	/*virtual*/ void setCursor(ECursorType cursor);
+	/*virtual*/ void updateCursor();
 	/*virtual*/ void captureMouse();
 	/*virtual*/ void releaseMouse();
 	/*virtual*/ void setMouseClipping( BOOL b );
@@ -102,7 +102,7 @@ public:
 	/*virtual*/ void gatherInput();
 	/*virtual*/ void swapBuffers();
 
-    /*virtual*/ void delayInputProcessing() { };
+	/*virtual*/ void delayInputProcessing() { };
 
 	// handy coordinate space conversion routines
 	/*virtual*/ BOOL convertCoords(LLCoordScreen from, LLCoordWindow *to);

indra/llwindow/llwindowwin32.cpp

@@ -677,6 +677,7 @@ void LLWindowWin32::hide()
 	ShowWindow(mWindowHandle, SW_HIDE);
 }
 
+//virtual
 void LLWindowWin32::minimize()
 {
 	setMouseClipping(FALSE);
@@ -684,7 +685,7 @@ void LLWindowWin32::minimize()
 	ShowWindow(mWindowHandle, SW_MINIMIZE);
 }
 
-
+//virtual
 void LLWindowWin32::restore()
 {
 	ShowWindow(mWindowHandle, SW_RESTORE);
@@ -1019,6 +1020,7 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
 		dw_style = WS_OVERLAPPEDWINDOW;
 	}
 
+
 	// don't post quit messages when destroying old windows
 	mPostQuit = FALSE;
 
@@ -1070,6 +1072,8 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
 		return FALSE;
 	}
 
+	LL_INFOS("Window") << "Device context retrieved." << llendl ;
+
 	if (!(pixel_format = ChoosePixelFormat(mhDC, &pfd)))
 	{
 		close();
@@ -1078,6 +1082,8 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
 		return FALSE;
 	}
 
+	LL_INFOS("Window") << "Pixel format chosen." << llendl ;
+
 	// Verify what pixel format we actually received.
 	if (!DescribePixelFormat(mhDC, pixel_format, sizeof(PIXELFORMATDESCRIPTOR),
 		&pfd))
@@ -1653,13 +1659,13 @@ void LLWindowWin32::initCursors()
 	mCursor[ UI_CURSOR_PIPETTE ] = LoadCursor(module, TEXT("TOOLPIPETTE"));
 
 	// Color cursors
-	mCursor[UI_CURSOR_TOOLSIT] = loadColorCursor(TEXT("TOOLSIT"));
+	mCursor[ UI_CURSOR_TOOLSIT ] = loadColorCursor(TEXT("TOOLSIT"));
-	mCursor[UI_CURSOR_TOOLBUY] = loadColorCursor(TEXT("TOOLBUY"));
+	mCursor[ UI_CURSOR_TOOLBUY ] = loadColorCursor(TEXT("TOOLBUY"));
-	mCursor[UI_CURSOR_TOOLPAY] = loadColorCursor(TEXT("TOOLPAY"));
+	mCursor[ UI_CURSOR_TOOLPAY ] = loadColorCursor(TEXT("TOOLPAY"));
-	mCursor[UI_CURSOR_TOOLOPEN] = loadColorCursor(TEXT("TOOLOPEN"));
+	mCursor[ UI_CURSOR_TOOLOPEN ] = loadColorCursor(TEXT("TOOLOPEN"));
-	mCursor[UI_CURSOR_TOOLPLAY] = loadColorCursor(TEXT("TOOLPLAY"));
+	mCursor[ UI_CURSOR_TOOLPLAY ] = loadColorCursor(TEXT("TOOLPLAY"));
-	mCursor[UI_CURSOR_TOOLPAUSE] = loadColorCursor(TEXT("TOOLPAUSE"));
+	mCursor[ UI_CURSOR_TOOLPAUSE ] = loadColorCursor(TEXT("TOOLPAUSE"));
-	mCursor[UI_CURSOR_TOOLMEDIAOPEN] = loadColorCursor(TEXT("TOOLMEDIAOPEN"));
+	mCursor[ UI_CURSOR_TOOLMEDIAOPEN ] = loadColorCursor(TEXT("TOOLMEDIAOPEN"));
 
 	// Note: custom cursors that are not found make LoadCursor() return NULL.
 	for( S32 i = 0; i < UI_CURSOR_COUNT; i++ )
@@ -1673,18 +1679,18 @@ void LLWindowWin32::initCursors()
 
 
 
-void LLWindowWin32::setCursor(ECursorType cursor)
+void LLWindowWin32::updateCursor()
 {
-	if (cursor == UI_CURSOR_ARROW
+	if (mNextCursor == UI_CURSOR_ARROW
 		&& mBusyCount > 0)
 	{
-		cursor = UI_CURSOR_WORKING;
+		mNextCursor = UI_CURSOR_WORKING;
 	}
 
-	if( mCurrentCursor != cursor )
+	if( mCurrentCursor != mNextCursor )
 	{
-		mCurrentCursor = cursor;
+		mCurrentCursor = mNextCursor;
-		SetCursor( mCursor[cursor] );
+		SetCursor( mCursor[mNextCursor] );
 	}
 }
 
@@ -1764,6 +1770,8 @@ void LLWindowWin32::gatherInput()
 
 	mInputProcessingPaused = FALSE;
 
+	updateCursor();
+
 	// clear this once we've processed all mouse messages that might have occurred after
 	// we slammed the mouse position
 	mMousePositionModified = FALSE;

indra/llwindow/llwindowwin32.h

@@ -72,7 +72,7 @@ public:
 	/*virtual*/ void showCursorFromMouseMove();
 	/*virtual*/ void hideCursorUntilMouseMove();
 	/*virtual*/ BOOL isCursorHidden();
-	/*virtual*/ void setCursor(ECursorType cursor);
+	/*virtual*/ void updateCursor();
 	/*virtual*/ ECursorType getCursor() const;
 	/*virtual*/ void captureMouse();
 	/*virtual*/ void releaseMouse();

indra/newview/CMakeLists.txt

@@ -474,8 +474,6 @@ set(viewer_SOURCE_FILES
     llviewerfoldertype.cpp
     llviewergenericmessage.cpp
     llviewergesture.cpp
-    #llviewerimage.cpp
-    #llviewerimagelist.cpp
     llviewerinventory.cpp
     llviewerjoint.cpp
     llviewerjointattachment.cpp
@@ -976,8 +974,6 @@ set(viewer_HEADER_FILES
     llviewerfoldertype.h
     llviewergenericmessage.h
     llviewergesture.h
-    #llviewerimage.h
-    #llviewerimagelist.h
     llviewerinventory.h
     llviewerjoint.h
     llviewerjointattachment.h
@@ -1372,23 +1368,28 @@ if (FMOD OR FMODEX)
   endif (FMOD)
 
   if (DARWIN)
-    set(fmodwrapper_SOURCE_FILES fmodwrapper.cpp)
+    if(FMOD)
-    add_library(fmodwrapper SHARED ${fmodwrapper_SOURCE_FILES})
+      set(fmodwrapper_SOURCE_FILES fmodwrapper.cpp)
-    if (FMODEX)
+      add_library(fmodwrapper SHARED ${fmodwrapper_SOURCE_FILES})
-      set(fmodwrapper_needed_LIBRARIES ${FMODEX_LIBRARY} ${CARBON_LIBRARY})
+      if (FMODEX)
-    endif (FMODEX)
+        set(fmodwrapper_needed_LIBRARIES ${FMODEX_LIBRARY} ${CARBON_LIBRARY})
-    if (FMOD)
+      endif (FMODEX)
-      set(fmodwrapper_needed_LIBRARIES ${FMOD_LIBRARY} ${CARBON_LIBRARY})
+      if (FMOD)
-    endif (FMOD)
+        set(fmodwrapper_needed_LIBRARIES ${FMOD_LIBRARY} ${CARBON_LIBRARY})
-    set_target_properties(
+      endif (FMOD)
-      fmodwrapper
+      set_target_properties(
-      PROPERTIES
+        fmodwrapper
-      BUILD_WITH_INSTALL_RPATH 1
+        PROPERTIES
-      INSTALL_NAME_DIR "@executable_path/../Resources"
+        BUILD_WITH_INSTALL_RPATH 1
-      LINK_FLAGS "-unexported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/fmod_hidden_symbols.exp"
+        INSTALL_NAME_DIR "@executable_path/../Resources"
-      )
+        LINK_FLAGS "-unexported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/fmod_hidden_symbols.exp"
-    set(FMODWRAPPER_LIBRARY fmodwrapper)
+        )
-    target_link_libraries(fmodwrapper ${fmodwrapper_needed_LIBRARIES})
+      set(FMODWRAPPER_LIBRARY fmodwrapper)
+      target_link_libraries(fmodwrapper ${fmodwrapper_needed_LIBRARIES})
+    endif(FMOD)
+    if(FMODEX)
+      set(FMODWRAPPER_LIBRARY ${FMODEX_LIBRARY})
+    endif(FMODEX)
   else (DARWIN)
     # fmodwrapper unnecessary on linux or windows, for fmod and fmodex
     if (FMODEX)
@@ -1798,7 +1799,7 @@ endif (WINDOWS)
 if (DARWIN)
 # Don't do this here -- it's taken care of by viewer_manifest.py
 #  add_custom_command(TARGET ${VIEWER_BINARY_NAME} POST_BUILD
-#    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin/
+#    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib/release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin/
-#    DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib
+#    DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib/release/libllqtwebkit.dylib
 #  )
 endif (DARWIN)

indra/newview/English.lproj/InfoPlist.strings

@@ -2,6 +2,6 @@
 
 CFBundleName = "Singularity";
 
-CFBundleShortVersionString = "Singularity Viewer 1.5.0.0";
+CFBundleShortVersionString = "Singularity Viewer 1.7.0.0";
-CFBundleGetInfoString = "Singularity Viewer 1.5.0.0, Copyright 2010 Siana Gearz";
+CFBundleGetInfoString = "Singularity Viewer 1.7.0.0, Copyright 2012 Siana Gearz";
 

indra/newview/Info-Singularity.plist

@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string>singularity.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.secondlife.indra.viewer</string>
+	<string>org.singularityviewer.singularity</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

indra/newview/app_settings/client_tags_sg1.xml

@@ -786,6 +786,18 @@
         <real>0.7843137254902</real>
         <real>1</real>
       </array>
+    </map>
+	<key>5886ec80-cf56-11e1-9b23-0800200c9a66</key>
+    <map>
+      <key>name</key>
+      <string>Voodoo</string>
+      <key>color</key>
+      <array>
+        <real>0.70588235294118</real>
+        <real>0.7843137254902</real>
+        <real>0.7843137254902</real>
+        <real>1</real>
+      </array>
     </map>
     <key>734bae36-a197-b087-ee2d-a098d58fed55</key>
     <map>

indra/newview/app_settings/settings_ascent_coa.xml

@@ -214,6 +214,8 @@
           <string>F32</string>
           <key>Value</key>
           <real>0.5</real>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>BuildPrefs_Ysize</key>
         <map>
@@ -225,6 +227,8 @@
           <string>F32</string>
           <key>Value</key>
           <real>0.5</real>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>BuildPrefs_Zsize</key>
         <map>
@@ -236,6 +240,8 @@
           <string>F32</string>
           <key>Value</key>
           <real>0.5</real>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_Phantom</key>
         <map>
@@ -247,6 +253,8 @@
           <string>Boolean</string>
           <key>Value</key>
           <integer>0</integer>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_Temporary</key>
         <map>
@@ -258,6 +266,8 @@
           <string>Boolean</string>
           <key>Value</key>
           <integer>0</integer>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_Physical</key>
         <map>
@@ -269,6 +279,8 @@
           <string>Boolean</string>
           <key>Value</key>
           <integer>0</integer>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_EmbedItem</key>
         <map>
@@ -280,6 +292,8 @@
           <string>Boolean</string>
           <key>Value</key>
           <integer>0</integer>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>BuildPrefs_Material</key>
         <map>
@@ -291,6 +305,8 @@
           <string>String</string>
           <key>Value</key>
           <string>Wood</string>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_Color</key>
         <map>
@@ -307,6 +323,8 @@
             <real>1.0</real>
             <real>1.0</real>
           </array>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_Texture</key>
         <map>
@@ -318,6 +336,8 @@
           <string>String</string>
           <key>Value</key>
           <string>89556747-24cb-43ed-920b-47caed15465f</string>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_Alpha</key>
         <map>
@@ -329,6 +349,8 @@
           <string>F32</string>
           <key>Value</key>
           <real>0.0</real>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_Glow</key>
         <map>
@@ -340,6 +362,8 @@
           <string>F32</string>
           <key>Value</key>
           <real>0.0</real>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_FullBright</key>
         <map>
@@ -351,6 +375,8 @@
           <string>Boolean</string>
           <key>Value</key>
           <integer>0</integer>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_Shiny</key>
         <map>
@@ -362,6 +388,21 @@
           <string>String</string>
           <key>Value</key>
           <string>None</string>
+          <key>IsCOA</key>
+          <integer>1</integer>
+        </map>
+        <key>LiruEnableBuildPrefs</key>
+        <map>
+          <key>Comment</key>
+          <string>When false, disables all defaults set in the building preferences panel, without resetting them.</string>
+          <key>Persist</key>
+          <integer>1</integer>
+          <key>Type</key>
+          <string>Boolean</string>
+          <key>Value</key>
+          <string>1</string>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
 	</map>
 </llsd>

indra/newview/app_settings/windlight/days/%5BTarnix%5D%20UltraBright.xml

@@ -0,0 +1,20 @@
+<llsd>
+    <array>
+        <array>
+            <real>0.24652767181396484</real>
+            <string>[Tarnix] Ultrabright Night</string>
+        </array>
+        <array>
+            <real>0.24999989569187164</real>
+            <string>[Tarnix] Ultrabright Morning</string>
+        </array>
+        <array>
+            <real>0.49652755260467529</real>
+            <string>[Tarnix] Ultrabright Day</string>
+        </array>
+        <array>
+            <real>0.90277743339538574</real>
+            <string>[Tarnix] Ultrabright Night</string>
+        </array>
+    </array>
+</llsd>

indra/newview/app_settings/windlight/days/Realistic%20Daycycle.xml

@@ -0,0 +1,36 @@
+<llsd>
+    <array>
+        <array>
+            <real>0</real>
+            <string>Realistic Night</string>
+        </array>
+        <array>
+            <real>0.12499994784593582</real>
+            <string>Realistic 3AM</string>
+        </array>
+        <array>
+            <real>0.24652767181396484</real>
+            <string>Realistic 6AM</string>
+        </array>
+        <array>
+            <real>0.37499985098838806</real>
+            <string>A-9AM</string>
+        </array>
+        <array>
+            <real>0.49999979138374329</real>
+            <string>Realistic</string>
+        </array>
+        <array>
+            <real>0.62499970197677612</real>
+            <string>A-3PM</string>
+        </array>
+        <array>
+            <real>0.74999970197677612</real>
+            <string>Realistic 6PM</string>
+        </array>
+        <array>
+            <real>0.87499958276748657</real>
+            <string>Realistic 9PM</string>
+        </array>
+    </array>
+</llsd>

indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Dramatic%20Fog%202.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.0462114512920379638671875</real>
+            <real>0.05376493558287620544433594</real>
+            <real>0.0709760487079620361328125</real>
+            <real>0.02365868352353572845458984</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.1467447141720501502248908</real>
+            <real>0.4041820112504588280444295</real>
+            <real>0.8083723277382617311559443</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.2301578534514239215980069</real>
+            <real>0.3007703710769140670322486</real>
+            <real>0.3251373821004301944981307</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.2784517256901799520107943</real>
+            <real>0.2784517256901799520107943</real>
+            <real>0.2784517256901799520107943</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164306640625</real>
+            <real>0.526096999645233154296875</real>
+            <real>0.9492304265646138716761016</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164306640625</real>
+            <real>0.526096999645233154296875</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.3682807419706036755613354</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.69985902430791213646444</real>
+            <real>10.50173369741952456024592</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.269999980926513671875</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0004900000058114528656005859</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>12.90000057220458984375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>2.45044231414794921875</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.87999999523162841796875</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.799999237060546875</real>
+            <real>0.001000000047497451305389404</real>
+            <real>-1.19999992847442626953125</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>3.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.199999988079071044921875</real>
+            <real>0.1991560012102127075195312</real>
+            <real>0.1991560012102127075195312</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.529998958110809326171875</real>
+            <real>0.555569469928741455078125</real>
+            <real>-0.640658795833587646484375</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1333</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0.589999973773956298828125</real>
+    <key>sun_angle</key>
+        <real>0.5890476703643798828125</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.397439671540726457976689</real>
+            <real>1.479949096350015480538787</real>
+            <real>2.570202271922596537478967</real>
+            <real>0.9015665961795940042122766</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Dramatic%20Fog.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.01848458126187324523925781</real>
+            <real>0.02150597609579563140869141</real>
+            <real>0.02839041873812675476074219</real>
+            <real>0.009463473223149776458740234</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.1467447141720501502248908</real>
+            <real>0.4041820112504588280444295</real>
+            <real>0.8083723277382617311559443</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.2301578534514239215980069</real>
+            <real>0.3007703710769140670322486</real>
+            <real>0.3251373821004301944981307</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.2784517256901799520107943</real>
+            <real>0.2784517256901799520107943</real>
+            <real>0.2784517256901799520107943</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164306640625</real>
+            <real>0.526096999645233154296875</real>
+            <real>0.9492304265646138716761016</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164306640625</real>
+            <real>0.526096999645233154296875</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.3682807419706036755613354</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.69985902430791213646444</real>
+            <real>10.50173369741952456024592</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.269999980926513671875</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0004900000058114528656005859</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>12.90000057220458984375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>2.19911479949951171875</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.09000003337860107421875</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>4.867557667375535856990609</real>
+            <real>0.001000000047497451305389404</real>
+            <real>-0.4737372158712260805657479</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>3.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.199999988079071044921875</real>
+            <real>0.1991560012102127075195312</real>
+            <real>0.1991560012102127075195312</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.6726734638214111328125</real>
+            <real>0.555569469928741455078125</real>
+            <real>-0.4887258112430572509765625</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1333</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0.589999973773956298828125</real>
+    <key>sun_angle</key>
+        <real>0.5890476703643798828125</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.397439671540726457976689</real>
+            <real>1.479949096350015480538787</real>
+            <real>2.570202271922596537478967</real>
+            <real>0.9015665961795940042122766</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20End%2Dof%2Dworld.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.22705078125</real>
+            <real>0.0897216796875</real>
+            <real>0.00732421875</real>
+            <real>0.07568359375</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.171875</real>
+            <real>0.171875</real>
+            <real>0.171875</real>
+            <real>0.0859375</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0.31999999284744263</real>
+            <real>0.31999999284744263</real>
+            <real>0.15999999642372131</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.079999998211860657</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.25999999046325684</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00060999998822808266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>46.900001525878906</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>5.1522121429443359</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>12.799999237060547</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.99999994039535522</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.8899999856948853</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.86294835805892944</real>
+            <real>0.30070748925209045</real>
+            <real>-0.40607285499572754</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>427</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>21</integer>
+    <key>star_brightness</key>
+        <real>0.81000000238418579</real>
+    <key>sun_angle</key>
+        <real>2.836158275604248</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.08233642578125</real>
+            <real>1.07391357421875</real>
+            <real>1.07391357421875</real>
+            <real>0.36077880859375</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Mystical%20Forest.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.50390625</real>
+            <real>0.50390625</real>
+            <real>0.50390625</real>
+            <real>0.16796875</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.97999995946884155</real>
+            <real>0.97999995946884155</real>
+            <real>0.97999995946884155</real>
+            <real>0.48999997973442078</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.47999998927116394</real>
+            <real>0.53999996185302734</real>
+            <real>0.45999997854232788</real>
+            <real>0.53999996185302734</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.079999998211860657</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.25999999046325684</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00013000000035390258</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>24.30000114440918</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.958406925201416</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.6899999380111694</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>15.59999942779541</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.59999996423721313</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.2699999809265137</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.29358875751495361</real>
+            <real>0.91531205177307129</real>
+            <real>0.27569809556007385</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>483</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>1.9853105545043945</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.3799998760223389</real>
+            <real>1.3799998760223389</real>
+            <real>1.3799998760223389</real>
+            <real>0.45999997854232788</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Rainy%20Forest.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.0099999997764825821</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0.0099999997764825821</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.68000000715255737</real>
+            <real>0.49999505281448364</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.070000000298023224</real>
+            <real>0.85394656658172607</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.53962135314941406</real>
+            <real>0.53962135314941406</real>
+            <real>0.53962135314941406</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.69569224119186401</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.10999999195337296</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.3765256404876709</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0004099999787285924</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>12.800000190734863</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>2.1991147994995117</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.0199999809265137</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5.3999996185302734</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.39999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2.9500000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.45999997854232788</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.68231838941574097</real>
+            <real>0.53729885816574097</real>
+            <real>-0.49573326110839844</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1352.0999755859375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>10</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0.56723111867904663</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.77999997138977051</real>
+            <real>1.2300000190734863</real>
+            <real>1.2300000190734863</real>
+            <real>0.40999999642372131</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Rusted%20Perception.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>0</real>
+            <real>0.05468752607703208923339844</real>
+            <real>0.109375</real>
+            <real>0.0546875</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>2</real>
+            <real>2</real>
+            <real>2</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.5396213531494140625</real>
+            <real>0.5396213531494140625</real>
+            <real>0.5396213531494140625</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.695692241191864013671875</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.1099999919533729553222656</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498046875</real>
+            <real>10.0109996795654296875</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.3765256404876708984375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0004099999787285923957824707</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>12.80000019073486328125</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>5.026547908782958984375</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.819999992847442626953125</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>17.799999237060546875</real>
+            <real>0.001000000047497451305389404</real>
+            <real>-0.4999999701976776123046875</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2.9500000476837158203125</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.459999978542327880859375</real>
+            <real>0.1991560012102127075195312</real>
+            <real>0.1991560012102127075195312</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.79077517986297607421875</real>
+            <real>0.555569469928741455078125</real>
+            <real>0.2569381296634674072265625</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1352.0999755859375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>10</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0.5890476703643798828125</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.8857421875</real>
+            <real>1.8592071533203125</real>
+            <real>0.8642578125</real>
+            <real>0.9619140625</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Shine.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.21194984018802643</real>
+            <real>0.25700280070304871</real>
+            <real>0.25999999046325684</real>
+            <real>0.25999999046325684</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.10031381994485855</real>
+            <real>0.2849995493888855</real>
+            <real>0.56999999284744263</real>
+            <real>0.56999999284744263</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.15806557238101959</real>
+            <real>0.31211116909980774</real>
+            <real>0.52999997138977051</real>
+            <real>0.52999997138977051</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0.72737622261047363</real>
+            <real>0.73626559972763062</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.89999997615814209</real>
+            <real>0.93999999761581421</real>
+            <real>0.74000000953674316</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.11999999731779099</real>
+            <real>0.20999999344348907</real>
+            <real>0.029999999329447746</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.25999999046325684</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>9.993240904292179</real>
+            <real>10.010000228881836</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00013000000035390258</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>10.100000381469727</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.8955750465393066</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.4699999094009399</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>11.200000762939453</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.64999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.35999998450279236</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.11999999731779099</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.66304093599319458</real>
+            <real>0.24868990480899811</real>
+            <real>-0.70606660842895508</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>789</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>24</integer>
+    <key>star_brightness</key>
+        <real>0.18999999761581421</real>
+    <key>sun_angle</key>
+        <real>0.25132742524147034</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.25</real>
+            <real>1.2599999904632568</real>
+            <real>0.59999996423721313</real>
+            <real>2.25</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Smooth%20spot.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.36328125</real>
+            <real>0.321533203125</real>
+            <real>0.22265625</real>
+            <real>0.12109375</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.97999995946884155</real>
+            <real>0.97999995946884155</real>
+            <real>0.97999995946884155</real>
+            <real>0.48999997973442078</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0.31999999284744263</real>
+            <real>0.31999999284744263</real>
+            <real>0.15999999642372131</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.079999998211860657</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.25999999046325684</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00031000000308267772</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>6.8000001907348633</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>4.2725663185119629</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.33000001311302185</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.8899999856948853</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.46939900517463684</real>
+            <real>0.85491263866424561</real>
+            <real>0.22088223695755005</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>752</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>2.1162102222442627</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.4300000667572021</real>
+            <real>2.0399999618530273</real>
+            <real>1.8600000143051147</real>
+            <real>2.4300000667572021</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Day.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.5859375</real>
+            <real>0.5859375</real>
+            <real>0.5859375</real>
+            <real>0.1953125</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.2447581589221954345703125</real>
+            <real>0.4487232863903045654296875</real>
+            <real>0.7599999904632568359375</real>
+            <real>0.37999999523162841796875</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.6136362552642822265625</real>
+            <real>0.6136362552642822265625</real>
+            <real>0.8549020290374755859375</real>
+            <real>0.42745101451873779296875</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.4099999964237213134765625</real>
+            <real>0.4099999964237213134765625</real>
+            <real>0.4099999964237213134765625</real>
+            <real>0.4099999964237213134765625</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164306640625</real>
+            <real>0.526096999645233154296875</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164306640625</real>
+            <real>0.526096999645233154296875</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.4199999868869781494140625</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.19999980926513671875</real>
+            <real>10.0109996795654296875</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.269999980926513671875</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>9.999999747378751635551453e-05</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.4000000059604644775390625</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.1415927410125732421875</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.769999980926513671875</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.001000000047497451305389404</real>
+            <real>-1.10000002384185791015625</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.88999998569488525390625</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.1599999964237213134765625</real>
+            <real>0.1991560012102127075195312</real>
+            <real>0.1991560012102127075195312</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>1.003947020460603523073218e-13</real>
+            <real>1</real>
+            <real>-1.148381556959066074341536e-06</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1493</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.57079517841339111328125</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.1299998760223388671875</real>
+            <real>1.8660809993743896484375</real>
+            <real>1.490999698638916015625</real>
+            <real>0.709999978542327880859375</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Morning.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>0.24475815892219543</real>
+            <real>0.44872328639030457</real>
+            <real>0.75999999046325684</real>
+            <real>0.37999999523162842</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.49548381567001343</real>
+            <real>0.49548381567001343</real>
+            <real>0.63999998569488525</real>
+            <real>0.31999999284744263</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</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</real>
+            <real>0.96999996900558472</real>
+            <real>0.08999999612569809</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.40999996662139893</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.359999656677246</real>
+            <real>10.340000152587891</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.2800000011920929</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>9.9999997473787516e-006</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0</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.1000000238418579</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-1.1000000238418579</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>3.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.15999999642372131</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>667</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>1.1299999952316284</real>
+    <key>sun_angle</key>
+        <real>6.2395515441894531</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.6986236572265625</real>
+            <real>1.1374046802520752</real>
+            <real>0.4810638427734375</real>
+            <real>0.5662078857421875</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Night.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>0.3486154782113272121435443</real>
+            <real>0.449369331229434954000368</real>
+            <real>0.603132514577153000523424</real>
+            <real>0.6937349534321981536777457</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.3662028399132433720275515</real>
+            <real>0.3662028399731497851909978</real>
+            <real>0.4375903419326376275755308</real>
+            <real>0.6640963995887574355947436</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.3169694886788358978435554</real>
+            <real>0.3169694886788358978435554</real>
+            <real>0.3169694886788358978435554</real>
+            <real>0.7085542303539185127192468</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164306640625</real>
+            <real>0.526096999645233154296875</real>
+            <real>0.9392771101574294290159628</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164306640625</real>
+            <real>0.526096999645233154296875</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.4199999868869781494140625</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.35150370716937828774462</real>
+            <real>10.01099989455784466940713</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.269999980926513671875</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0002012048324333540389764752</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.1975903555777060727205452</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.00100000003430226265706271</real>
+            <real>-0.4799999904774563952436495</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2.463735011225950621849279</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.07903613876588544417955973</real>
+            <real>0.199156002811505972172057</real>
+            <real>0.199156002811505972172057</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.59130990505218505859375</real>
+            <real>-0.8064444065093994140625</real>
+            <real>1</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1196.065065097033084384748</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>2</real>
+    <key>sun_angle</key>
+        <real>5.6505031585693359375</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.08699999749660491943359375</real>
+            <real>0.118706881999969482421875</real>
+            <real>0.2129999846220016479492188</real>
+            <real>0.07099999487400054931640625</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Realistic%203AM.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.22259476780891418</real>
+            <real>0.26450252532958984</real>
+            <real>0.35999998450279236</real>
+            <real>0.11999999731779099</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.23999616268583132</real>
+            <real>0.239999227803052</real>
+            <real>0.24000028550619668</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615400241566114</real>
+            <real>0.22615400241566114</real>
+            <real>0.22615400241566114</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.88000000953681223</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</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.499400354105791</real>
+            <real>10.011000104419489</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0003000046529240592</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>7</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.0000000000023022</real>
+            <real>0.0010000000214220922</real>
+            <real>-0.47999999165507345</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>4.6348559691012062e-006</real>
+            <real>0.19915600437461423</real>
+            <real>0.19915600437461423</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>1</real>
+            <real>2.3722609512333293e-006</real>
+            <real>1</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>906.19008370909478</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>1.9999420642852783</real>
+    <key>sun_angle</key>
+        <real>4.7123866081237793</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.11344550549983978</real>
+            <real>0.11571422964334488</real>
+            <real>0.21467949450016022</real>
+            <real>0.071559831500053406</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Realistic%206AM.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.80999994277954102</real>
+            <real>0.46289783716201782</real>
+            <real>0.62999993562698364</real>
+            <real>0.26999998092651367</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.30247950553894043</real>
+            <real>0.83312696218490601</real>
+            <real>1.6662704944610596</real>
+            <real>0.83313524723052979</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.20673196017742157</real>
+            <real>0.40988314151763916</real>
+            <real>0.47999998927116394</real>
+            <real>0.47999998927116394</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22616604226328718</real>
+            <real>0.22616604226328718</real>
+            <real>0.22616604226328718</real>
+            <real>0.99997219085526012</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.88000025272481253</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</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.49940013883861</real>
+            <real>10.010999679576344</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.00056000001495704055</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.69999998807907104</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>4.6000003814697266</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.94999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.66999995708465576</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.15999999642372131</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.094108223915100098</real>
+            <real>0.99556195735931396</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>877</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0.094247691333293915</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.8055419921875</real>
+            <real>2.5958919525146484</real>
+            <real>2.3507080078125</real>
+            <real>0.9351806640625</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Realistic%206PM.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.58785861730575562</real>
+            <real>0.46682888269424438</real>
+            <real>0.46682891249656677</real>
+            <real>0.1959528774023056</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.18964982032775879</real>
+            <real>0.52235734462738037</real>
+            <real>1.0447251796722412</real>
+            <real>0.52236258983612061</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.11289128661155701</real>
+            <real>0.22382725775241852</real>
+            <real>0.26210871338844299</real>
+            <real>0.1310543566942215</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.87999999523162842</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</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.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00052999996114522219</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.69999998807907104</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>1.8000006675720215</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.29999998211860657</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2.1150000095367432</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.17600001394748688</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.23768773674964905</real>
+            <real>-0.97134160995483398</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>767</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>2.9016079902648926</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.9921875</real>
+            <real>1.9921875</real>
+            <real>1.9921875</real>
+            <real>0.6640625</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Realistic%209PM.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.20404692765200849</real>
+            <real>0.24246276689169122</real>
+            <real>0.33000383615406292</real>
+            <real>0.1100123608103587</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.070311017334461212</real>
+            <real>0.070312172174453735</real>
+            <real>0.070313982665538788</real>
+            <real>0.035156991332769394</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.23999616268583132</real>
+            <real>0.239999227803052</real>
+            <real>0.24000028550619668</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615400241566114</real>
+            <real>0.22615400241566114</real>
+            <real>0.22615400241566114</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.88000000953681223</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</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.499400354105791</real>
+            <real>10.011000104419489</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00023999999393709004</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>4.2000002861022949</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.0000000000023022</real>
+            <real>0.0010000000214220922</real>
+            <real>-0.47999999165507345</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</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.70710688829421997</real>
+            <real>0.70710664987564087</real>
+            <real>1</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1534</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>1.9999420642852783</real>
+    <key>sun_angle</key>
+        <real>3.9269909858703613</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.16206490993499756</real>
+            <real>0.16530600190162659</real>
+            <real>0.30668509006500244</real>
+            <real>0.10222836583852768</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Realistic%20Night.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.080595135688781738</real>
+            <real>0.095768749713897705</real>
+            <real>0.13034236431121826</real>
+            <real>0.043447453528642654</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.1181640625</real>
+            <real>0.14753724634647369</real>
+            <real>0.2255859375</real>
+            <real>0.11279296875</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.1328125</real>
+            <real>0.1328125</real>
+            <real>0.1328125</real>
+            <real>0.1328125</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.88000000953711155</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.49940035411295</real>
+            <real>10.011000104431371</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>5.999999848427251e-005</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>75.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</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.44999998807907104</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</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>1</real>
+            <real>3.0028815672267228e-005</real>
+            <real>1</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>438</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>26</integer>
+    <key>star_brightness</key>
+        <real>2</real>
+    <key>sun_angle</key>
+        <real>4.7123589515686035</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.092010498046875</real>
+            <real>0.11404039710760117</real>
+            <real>0.142364501953125</real>
+            <real>0.047454833984375</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/skies/Realistic.xml

@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.9140625</real>
+            <real>0.9140625</real>
+            <real>0.9140625</real>
+            <real>0.3046875</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>1.3854242563247681</real>
+            <real>1.5503612756729126</real>
+            <real>1.8020757436752319</real>
+            <real>0.90103787183761597</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.174346923828125</real>
+            <real>0.20045472681522369</real>
+            <real>0.278778076171875</real>
+            <real>0.1393890380859375</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.236663818359375</real>
+            <real>0.26210832595825195</real>
+            <real>0.278961181640625</real>
+            <real>0.278961181640625</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0.52999997138977051</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.48999997973442078</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.47999998927116394</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.069999694824219</real>
+            <real>10.01099967956543</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>0.00017999998817685992</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>3</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.5999994277954102</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.49999997019767761</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.42999997735023499</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.68000000715255737</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.91269159317016602</real>
+            <real>-0.40864911675453186</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1342</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.9917697906494141</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.210693359375</real>
+            <real>1.2674446105957031</real>
+            <real>1.461181640625</real>
+            <real>0.487060546875</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/water/%5BML%5D%20Caribbean%20Water.xml

@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.05800000205636024475097656</real>
+    <key>fresnelOffset</key>
+        <real>0.4299999773502349853515625</real>
+    <key>fresnelScale</key>
+        <real>0.1400000005960464477539062</real>
+    <key>normScale</key>
+        <array>
+            <real>2.2000000476837158203125</real>
+            <real>1.10000002384185791015625</real>
+            <real>0.800000011920928955078125</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.03999999910593032836914062</real>
+    <key>scaleBelow</key>
+        <real>0.329999983310699462890625</real>
+    <key>underWaterFogMod</key>
+        <real>0</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.234375</real>
+            <real>1.00000011920928955078125</real>
+            <real>0.999999940395355224609375</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>12.9960384368896484375</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-0.2000000476837158203125</real>
+            <real>-0.2400000095367431640625</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-0.190000057220458984375</real>
+            <real>0</real>
+        </array>
+    </map>
+</llsd>

indra/newview/app_settings/windlight/water/Realistic.xml

@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.026000000536441803</real>
+    <key>fresnelOffset</key>
+        <real>0.38999998569488525</real>
+    <key>fresnelScale</key>
+        <real>0.059999998658895493</real>
+    <key>normScale</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>7c88a167-157c-6b31-34ae-e0041360e54e</uuid>
+    <key>scaleAbove</key>
+        <real>0</real>
+    <key>scaleBelow</key>
+        <real>0.17999999225139618</real>
+    <key>underWaterFogMod</key>
+        <real>0.41999998688697815</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.0745849609375</real>
+            <real>0.10957146435976028</real>
+            <real>0.1285400390625</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>19.698312759399414</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>-0.16000008583068848</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.48999977111816406</real>
+            <real>-0.38000011444091797</real>
+        </array>
+    </map>
+</llsd>

indra/newview/featuretable.txt

@@ -42,6 +42,7 @@ RenderObjectBump			1	1
 RenderLocalLights			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	12.0
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
@@ -86,6 +87,7 @@ RenderObjectBump			1	0
 RenderLocalLights			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
+RenderTerrainScale			1	12.0
 RenderTerrainLODFactor		1	1
 RenderTransparentWater		1	0
 RenderTreeLODFactor			1	0
@@ -117,6 +119,7 @@ RenderObjectBump			1	1
 RenderLocalLights			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	9.0
 RenderTerrainLODFactor		1	1.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
@@ -149,6 +152,7 @@ RenderObjectBump			1	1
 RenderLocalLights			1	1
 RenderReflectionDetail		1	2
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	7.0
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
@@ -179,6 +183,7 @@ RenderObjectBump			1	1
 RenderLocalLights			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	5.0
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0

indra/newview/featuretable_linux.txt

@@ -42,6 +42,7 @@ RenderMaxPartCount			1	8192
 RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	12.0
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
@@ -83,6 +84,7 @@ RenderMaxPartCount			1	512
 RenderObjectBump			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
+RenderTerrainScale			1	12.0
 RenderTerrainLODFactor		1	1
 RenderTransparentWater		1	0
 RenderTreeLODFactor			1	0
@@ -114,6 +116,7 @@ RenderMaxPartCount			1	2048
 RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	9.0
 RenderTerrainLODFactor		1	1.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
@@ -145,6 +148,7 @@ RenderMaxPartCount			1	4096
 RenderObjectBump			1	1
 RenderReflectionDetail		1	2
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	7.0
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
@@ -156,7 +160,7 @@ WLSkyDetail					1	48
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderFastAlpha				1	0
+RenderFSAASamples			1	0
 RenderUseFBO				1	0
 
 
@@ -177,6 +181,7 @@ RenderMaxPartCount			1	8192
 RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	5.0
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
@@ -266,6 +271,7 @@ RenderAvatarVP				0	0
 RenderObjectBump			0	0
 RenderMaxPartCount			1	1024
 RenderTerrainDetail 		1	0
+RenderTerrainScale			1	12.0
 RenderUseImpostors			0	0
 RenderVBOEnable				1	0
 RenderReflectionDetail		0	0

indra/newview/featuretable_mac.txt

@@ -42,6 +42,7 @@ RenderMaxPartCount			1	8192
 RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	12.0
 RenderTerrainLODFactor			1	2.0
 RenderTransparentWater			1	1
 RenderTreeLODFactor			1	1.0
@@ -62,7 +63,7 @@ RenderDeferred				1	1
 RenderDeferredSSAO			1	1
 RenderShadowDetail			1	2
 WatchdogDisabled				1	1
-RenderUseStreamVBO			1	1
+ShyotlRenderUseStreamVBO			1	1
 RenderFSAASamples			1	16
 RenderMaxTextureIndex		1	16
 RenderUseFBO				1	0
@@ -86,6 +87,7 @@ RenderMaxPartCount			1	512
 RenderObjectBump			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
+RenderTerrainScale			1	12.0
 RenderTerrainLODFactor		1	1
 RenderTransparentWater		1	0
 RenderTreeLODFactor			1	0
@@ -117,6 +119,7 @@ RenderMaxPartCount			1	2048
 RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	9.0
 RenderTerrainLODFactor		1	1.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
@@ -149,6 +152,7 @@ RenderMaxPartCount			1	4096
 RenderObjectBump			1	1
 RenderReflectionDetail		1	2
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	7.0
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
@@ -181,6 +185,7 @@ RenderMaxPartCount			1	8192
 RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	5.0
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0

indra/newview/linux_tools/wrapper.sh

@@ -59,8 +59,15 @@
 ##   you're building your own viewer, bear in mind that the executable
 ##   in the bin directory will be stripped: you should replace it with
 ##   an unstripped binary before you run.
-#export LL_WRAPPER='gdb --args'
+if [ -n "$ASCENDED_DEVELOPER" ]; then
-#export LL_WRAPPER='valgrind --smc-check=all --error-limit=no --log-file=secondlife.vg --leak-check=full --suppressions=/usr/lib/valgrind/glibc-2.5.supp --suppressions=secondlife-i686.supp'
+	if [ "$ASCENDED_DEVELOPER" = "1" ]; then
+		export LL_WRAPPER='gdb --args'
+	elif [ "$ASCENDED_DEVELOPER" = "2" ]; then
+		export LL_WRAPPER='valgrind --smc-check=all --error-limit=no --log-file=secondlife.vg --leak-check=full --suppressions=/usr/lib/valgrind/glibc-2.5.supp --suppressions=secondlife-i686.supp'
+	elif [ "$ASCENDED_DEVELOPER" = "3" ]; then
+		export LL_WRAPPER='strace -f -ff -o singularity.strace'
+	fi
+fi
 
 ## - This allows one to set an arbitrary value for LD_PRELOAD.
 ##   It won't work if LL_TCMALLOC is set because that uses it's

indra/newview/llfloaterfriends.cpp

@@ -1184,7 +1184,7 @@ void LLPanelFriends::onClickImport_filepicker_continued(AIFilePicker* filepicker
 		if(!content.has("can_mod"))continue;
 
 		LLUUID agent_id = LLUUID(iter->first);
-		if(merging && importstatellsd.has(agent_id.asString()))continue;//dont need to request what weve already requested from another list import and have not got a reply yet
+		if(merging && importstatellsd.has(agent_id.asString()))continue;//dont need to request what we've already requested from another list import and have not got a reply yet
 
 		std::string agent_name = content["name"];
 		if(!is_agent_friend(agent_id))//dont need to request what we have

indra/newview/llfloatersnapshot.cpp

@@ -1708,7 +1708,7 @@ void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, BOOL
 		S32 original_width = 0 , original_height = 0 ;
 		previewp->getSize(original_width, original_height) ;
 		
-		if (width == 0 || height == 0)
+		if (width == 0 || height == 0 || gSavedSettings.getBOOL("RenderUIInSnapshot") || gSavedSettings.getBOOL("RenderHUDInSnapshot"))
 		{
 			// take resolution from current window size
 			previewp->setSize(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight());

indra/newview/llmanip.cpp

@@ -355,11 +355,17 @@ LLVector3 LLManip::getPivotPoint()
 {
 	static LLCachedControl<bool> actual_root("AscentBuildPrefs_ActualRoot");
 	static LLCachedControl<bool> pivot_as_percent("AscentBuildPrefs_PivotIsPercent");
-	static LLCachedControl<F32> pivot_x("AscentBuildPrefs_PivotX");
+	LLVector3 offset(50,50,50);
-	static LLCachedControl<F32> pivot_y("AscentBuildPrefs_PivotY");
+	//Are we are using the defaults?
-	static LLCachedControl<F32> pivot_z("AscentBuildPrefs_PivotZ");
+	if(gSavedSettings.getBOOL("LiruEnableBuildPrefs"))
-	LLVector3 offset(pivot_x,pivot_y,pivot_z);
+	{
-
+		static LLCachedControl<F32> pivot_x("AscentBuildPrefs_PivotX");
+		static LLCachedControl<F32> pivot_y("AscentBuildPrefs_PivotY");
+		static LLCachedControl<F32> pivot_z("AscentBuildPrefs_PivotZ");
+		offset = LLVector3(pivot_x,pivot_y,pivot_z);
+	}
+	else
+		pivot_as_percent = true;
 	if (mObjectSelection->getFirstRootObject(TRUE) && (mObjectSelection->getObjectCount() == 1 || actual_root) && mObjectSelection->getSelectType() != SELECT_TYPE_HUD)
 	{
 		if(pivot_as_percent)

indra/newview/llpaneldisplay.cpp

@@ -250,6 +250,10 @@ BOOL LLPanelDisplay::postBuild()
 	mCtrlShadowDetail->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
 	mCtrlShadowDetail->setCallbackUserData(this);
 
+	//----------------------------------------------------------------------------
+	// Terrain Scale
+	mCtrlTerrainScale = getChild<LLComboBox>("TerrainScaleCombo");
+
 	//----------------------------------------------------------------------------
 	// Enable Avatar Shaders
 	mCtrlAvatarVP = getChild<LLCheckBoxCtrl>("AvatarVertexProgram");
@@ -350,6 +354,7 @@ BOOL LLPanelDisplay::postBuild()
 	mLightingText = getChild<LLTextBox>("LightingDetailText");
 	mMeshDetailText = getChild<LLTextBox>("MeshDetailText");
 	mShadowDetailText = getChild<LLTextBox>("ShadowDetailText");
+	mTerrainScaleText = getChild<LLTextBox>("TerrainScaleText");
 
 	refresh();
 
@@ -417,10 +422,10 @@ void LLPanelDisplay::refresh()
 	mDeferred = gSavedSettings.getBOOL("RenderDeferred");
 	mDeferredDoF = gSavedSettings.getBOOL("RenderDepthOfField");
 
-	// reflection radio
+	// combo boxes
 	mReflectionDetail = gSavedSettings.getS32("RenderReflectionDetail");
-
 	mShadowDetail = gSavedSettings.getS32("RenderShadowDetail");
+	mTerrainScale = gSavedSettings.getF32("RenderTerrainScale");
 
 	// avatar settings
 	mAvatarImpostors = gSavedSettings.getBOOL("RenderUseImpostors");
@@ -606,6 +611,13 @@ void LLPanelDisplay::disableUnavailableSettings()
 		mCtrlReflectionDetail->setValue(FALSE);
 	}
 
+	// disabled terrain scale
+	if(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderTerrainScale"))
+	{
+		mCtrlTerrainScale->setEnabled(false);
+		mCtrlTerrainScale->setValue(false);
+	}
+
 	// disabled av
 	if(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderAvatarVP"))
 	{
@@ -678,10 +690,12 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
 
 	llassert(mRadioTerrainDetail != NULL);
 	llassert(mCtrlReflectionDetail != NULL);
+	llassert(mCtrlTerrainScale != NULL);
 
 	llassert(mMeshDetailText != NULL);
 	llassert(mShaderText != NULL);
 	llassert(mReflectionText != NULL);
+	llassert(mTerrainScaleText != NULL);
 	llassert(mAvatarText != NULL);
 	llassert(mLightingText != NULL);
 	llassert(mTerrainText != NULL);
@@ -728,6 +742,7 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
 
 	mRadioTerrainDetail->setVisible(!isHidden);
 	mCtrlReflectionDetail->setVisible(!isHidden);
+	mCtrlTerrainScale->setVisible(!isHidden);
 
 	mCtrlDeferred->setVisible(!isHidden);
 	mCtrlDeferredDoF->setVisible(!isHidden);
@@ -742,6 +757,7 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
 	mDrawDistanceMeterText1->setVisible(!isHidden);
 	mDrawDistanceMeterText2->setVisible(!isHidden);
 	mShadowDetailText->setVisible(!isHidden);
+	mTerrainScaleText->setVisible(!isHidden);
 
 	// hide one meter text if we're making things visible
 	if(!isHidden)
@@ -771,6 +787,7 @@ void LLPanelDisplay::cancel()
 
 	gSavedSettings.setS32("RenderReflectionDetail", mReflectionDetail);
 	gSavedSettings.setS32("RenderShadowDetail", mShadowDetail);
+	gSavedSettings.setF32("RenderTerrainScale", mTerrainScale);
 
 	gSavedSettings.setBOOL("RenderUseImpostors", mAvatarImpostors);
 	gSavedSettings.setS32("RenderAvatarMaxVisible", mNonImpostors);

indra/newview/llpaneldisplay.h

@@ -84,7 +84,6 @@ protected:
 	LLComboBox		*mCtrlFullScreen;               // Fullscreen resolution
 	LLCheckBoxCtrl	*mCtrlAutoDetectAspect;			// automatically detect aspect ratio
 	LLComboBox		*mCtrlAspectRatio;				// user provided aspect ratio
-	LLComboBox		*mCtrlReflectionDetail;
 
 	LLCheckBoxCtrl	*mCtrlWindowed;					// windowed mode
 	LLComboBox      *mCtrlWindowSize;               // window size for windowed mode
@@ -114,7 +113,9 @@ protected:
 	LLCheckBoxCtrl	*mCtrlShaderEnable;
 	LLCheckBoxCtrl	*mCtrlDeferred;
 	LLCheckBoxCtrl	*mCtrlDeferredDoF;
+	LLComboBox		*mCtrlReflectionDetail;
 	LLComboBox		*mCtrlShadowDetail;
+	LLComboBox		*mCtrlTerrainScale;
 	LLCheckBoxCtrl	*mCtrlAvatarImpostors;
 	LLCheckBoxCtrl	*mCtrlAvatarCloth;
 	LLCheckBoxCtrl	*mCtrlLightingDetail2;
@@ -144,6 +145,7 @@ protected:
 	LLTextBox		*mSkyFactorText;
 	LLTextBox		*mPostProcessText;
 	LLTextBox		*mShadowDetailText;
+	LLTextBox		*mTerrainScaleText;
 
 	BOOL mFSAutoDetectAspect;
 	F32 mAspectRatio;
@@ -162,6 +164,7 @@ protected:
 
 	S32 mReflectionDetail;
 	S32 mShadowDetail;
+	F32 mTerrainScale;
 
 	BOOL mAvatarImpostors;
 	S32 mNonImpostors;

indra/newview/lltoolplacer.cpp

@@ -223,19 +223,25 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
 
 	// Set params for new object based on its PCode.
 	LLQuaternion	rotation;
-	LLVector3		scale = LLVector3(
+	LLVector3		scale = DEFAULT_OBJECT_SCALE;
-		gSavedSettings.getF32("BuildPrefs_Xsize"),
-		gSavedSettings.getF32("BuildPrefs_Ysize"),
-		gSavedSettings.getF32("BuildPrefs_Zsize"));
 
 	U8				material = LL_MCODE_WOOD;
-	if(gSavedSettings.getString("BuildPrefs_Material")== "Stone") material = LL_MCODE_STONE;
+	static LLCachedControl<bool> enable_BP("LiruEnableBuildPrefs", true);
-	else if(gSavedSettings.getString("BuildPrefs_Material")== "Metal") material = LL_MCODE_METAL;
+	static LLCachedControl<bool> duplicate("CreateToolCopySelection", true);
-	//if(gSavedSettings.getString("BuildPrefs_Material")== "Wood") material = LL_MCODE_WOOD; redundant
+	//If we are using the defaults, and we aren't duplicating
-	else if(gSavedSettings.getString("BuildPrefs_Material")== "Flesh") material = LL_MCODE_FLESH;
+	if(enable_BP && !duplicate)
-	else if(gSavedSettings.getString("BuildPrefs_Material")== "Rubber") material = LL_MCODE_RUBBER;
+	{
-	else if(gSavedSettings.getString("BuildPrefs_Material")== "Plastic") material = LL_MCODE_PLASTIC;
+		scale = LLVector3(
-
+			gSavedSettings.getF32("BuildPrefs_Xsize"),
+			gSavedSettings.getF32("BuildPrefs_Ysize"),
+			gSavedSettings.getF32("BuildPrefs_Zsize"));
+		if(gSavedSettings.getString("BuildPrefs_Material")== "Stone") material = LL_MCODE_STONE;
+		else if(gSavedSettings.getString("BuildPrefs_Material")== "Metal") material = LL_MCODE_METAL;
+		//if(gSavedSettings.getString("BuildPrefs_Material")== "Wood") material = LL_MCODE_WOOD; redundant
+		else if(gSavedSettings.getString("BuildPrefs_Material")== "Flesh") material = LL_MCODE_FLESH;
+		else if(gSavedSettings.getString("BuildPrefs_Material")== "Rubber") material = LL_MCODE_RUBBER;
+		else if(gSavedSettings.getString("BuildPrefs_Material")== "Plastic") material = LL_MCODE_PLASTIC;
+	}
 	BOOL			create_selected = FALSE;
 	LLVolumeParams	volume_params;
 	
@@ -292,7 +298,7 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
 	gMessageSystem->addU8Fast(_PREHASH_Material,	material);
 
 	U32 flags = 0;		// not selected
-	if (use_physics)
+	if (use_physics || (enable_BP && !duplicate && gSavedSettings.getBOOL("EmeraldBuildPrefs_Physical")))
 	{
 		flags |= FLAGS_USE_PHYSICS;
 	}
@@ -477,8 +483,9 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
 	
 	// Pack in name value pairs
 	gMessageSystem->sendReliable(regionp->getHost());
-	//Actually call expectRez so that importtracker can do its thing
+	//If we are using the defaults, and we aren't duplicating
-	gImportTracker.expectRez();
+	if(enable_BP && !duplicate)	//then, actually call expectRez so that importtracker can do its thing, which sadly only works close up.
+		gImportTracker.expectRez();
 	// Spawns a message, so must be after above send
 	if (create_selected)
 	{

indra/newview/llviewercontrol.cpp

@@ -122,6 +122,13 @@ static bool handleTerrainDetailChanged(const LLSD& newvalue)
 	return true;
 }
 
+static bool handleTerrainScaleChanged(const LLSD& inputvalue)
+{
+	LLSD newvalue = 1.f / inputvalue.asReal();
+	LLDrawPoolTerrain::sDetailScale = newvalue.asReal();
+	return true;
+}
+
 bool handleStateMachineMaxTimeChanged(const LLSD& newvalue)
 {
 	AIStateMachine::updateSettings();
@@ -621,6 +628,7 @@ void settings_setup_listeners()
 	gSavedSettings.getControl("FirstPersonAvatarVisible")->getSignal()->connect(boost::bind(&handleRenderAvatarMouselookChanged, _2));
 	gSavedSettings.getControl("RenderFarClip")->getSignal()->connect(boost::bind(&handleRenderFarClipChanged, _2));
 	gSavedSettings.getControl("RenderTerrainDetail")->getSignal()->connect(boost::bind(&handleTerrainDetailChanged, _2));
+	gSavedSettings.getControl("RenderTerrainScale")->getSignal()->connect(boost::bind(&handleTerrainScaleChanged, _2));
 	gSavedSettings.getControl("OctreeStaticObjectSizeFactor")->getSignal()->connect(boost::bind(&handleRepartition, _2));
 	gSavedSettings.getControl("OctreeDistanceFactor")->getSignal()->connect(boost::bind(&handleRepartition, _2));
 	gSavedSettings.getControl("OctreeMaxNodeCapacity")->getSignal()->connect(boost::bind(&handleRepartition, _2));

indra/newview/llviewerfoldertype.cpp

@@ -125,15 +125,15 @@ LLViewerFolderDictionary::LLViewerFolderDictionary()
 	addEntry(LLFolderType::FT_LOST_AND_FOUND, 		new ViewerFolderEntry("Lost And Found",	   		"inv_folder_lostandfound.tga",		"inv_folder_lostandfound.tga",	TRUE,		false));
 	addEntry(LLFolderType::FT_ANIMATION, 			new ViewerFolderEntry("Animations",				"inv_folder_animation.tga",			"inv_folder_animation.tga",		FALSE,		false));
 	addEntry(LLFolderType::FT_GESTURE, 				new ViewerFolderEntry("Gestures",				"inv_folder_gesture.tga",			"inv_folder_gesture.tga",		FALSE,		false));
-	addEntry(LLFolderType::FT_FAVORITE, 			new ViewerFolderEntry("Favorites",				"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	FALSE,		false));
+	addEntry(LLFolderType::FT_FAVORITE, 			new ViewerFolderEntry("Favorites",				"inv_folder_favorite.tga",			"inv_folder_favorite.tga",		FALSE,		false));
 
-	addEntry(LLFolderType::FT_CURRENT_OUTFIT, 		new ViewerFolderEntry("Current Outfit",			"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	TRUE,		false));
+	addEntry(LLFolderType::FT_CURRENT_OUTFIT, 		new ViewerFolderEntry("Current Outfit",			"inv_folder_outfit.tga",			"inv_folder_outfit.tga",		TRUE,		false));
-	addEntry(LLFolderType::FT_OUTFIT, 				new ViewerFolderEntry("New Outfit",				"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	TRUE,		false));
+	addEntry(LLFolderType::FT_OUTFIT, 				new ViewerFolderEntry("New Outfit",				"inv_folder_outfit.tga",			"inv_folder_outfit.tga",		TRUE,		false));
-	addEntry(LLFolderType::FT_MY_OUTFITS, 			new ViewerFolderEntry("My Outfits",				"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	TRUE,		false));
+	addEntry(LLFolderType::FT_MY_OUTFITS, 			new ViewerFolderEntry("My Outfits",				"inv_folder_outfit.tga",			"inv_folder_outfit.tga",		TRUE,		false));
-	addEntry(LLFolderType::FT_MESH, 				new ViewerFolderEntry("Meshes",					"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	FALSE,		false));
+	addEntry(LLFolderType::FT_MESH, 				new ViewerFolderEntry("Meshes",					"inv_folder_mesh.tga",				"inv_folder_mesh.tga",			FALSE,		false));
 	
-	addEntry(LLFolderType::FT_INBOX, 				new ViewerFolderEntry("Inbox",					"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	FALSE,		false));
+	addEntry(LLFolderType::FT_INBOX, 				new ViewerFolderEntry("Inbox",					"inv_folder_inbox.tga",				"inv_folder_inbox.tga",			FALSE,		false));
-	addEntry(LLFolderType::FT_OUTBOX, 				new ViewerFolderEntry("Outbox",					"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	FALSE,		false));
+	addEntry(LLFolderType::FT_OUTBOX, 				new ViewerFolderEntry("Outbox",					"inv_folder_outbox.tga",			"inv_folder_outbox",			FALSE,		false));
 
 	addEntry(LLFolderType::FT_BASIC_ROOT, 			new ViewerFolderEntry("Basic Root",				"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	FALSE,		false));
 		 

indra/newview/skins/default/textures/textures.xml

@@ -105,11 +105,16 @@
   <texture name="inv_folder_bodypart.tga"/>
   <texture name="inv_folder_callingcard.tga"/>
   <texture name="inv_folder_clothing.tga"/>
+  <texture name="inv_folder_favorite.tga"/>
   <texture name="inv_folder_gesture.tga"/>
+  <texture name="inv_folder_inbox.tga"/>
   <texture name="inv_folder_landmark.tga"/>
   <texture name="inv_folder_lostandfound.tga"/>
+  <texture name="inv_folder_mesh.tga"/>
   <texture name="inv_folder_notecard.tga"/>
   <texture name="inv_folder_object.tga"/>
+  <texture name="inv_folder_outfit.tga"/>
+  <texture name="inv_folder_outbox.tga"/>
   <texture name="inv_folder_plain_closed.tga"/>
   <texture name="inv_folder_plain_open.tga"/>
   <texture name="inv_folder_script.tga"/>
@@ -370,6 +375,9 @@
   <texture name="icn_label_music.tga"/>
   <texture name="icn_label_media.tga"/>
   <texture name="arrow_down.tga"/>
+  <texture name="arrow_up.tga"/>
+  <texture name="arrow_left.tga"/>
+  <texture name="arrow_right.tga"/>
   <texture name="cloud-particle.j2c" use_mips="true"/>
   
   <texture name="skin_thumbnail_default.png" preload="true" />
@@ -399,4 +407,7 @@
   <texture name="view-refresh-5.png"/>
   <texture name="go-home-4.png"/>
 
+  <texture name="Inv_WindLight.png" preload="true"/>
+  <texture name="Inv_WaterLight.png" preload="true"/>
+
 </textures>

indra/newview/skins/default/xui/en-us/floater_about.xml

@@ -14,7 +14,7 @@
 Singularity Viewer is developed and maintained by Siana Gearz, Shyotl Kuhr, Aleric Inglewood, Narv Czervik, Tigh MacFanatic, Inusaito Kanya, Sovereign Engineer and Latif Khalifa, with contributions by Fractured Crystal, Fritigern Gothly, Henri Beauchamp, McCabe Maxsted, Kadah Coba, Kitty Barnett, nhede Core, Nomade Zhao, Revolution Smythe, Selvone Franizzi, Thickbrick Sleaford, Zauber Parecelsus, Wolfspirit Magic and others. Singularity is based upon Ascent source code. Credits for Ascent include Hg Beeks, Charley Levenque, Hazim Gazov, Zwagoth Klaar, Qarl Fizz, and others. Ascent is based upon the Inertia source code.
 
 Singularity Viewer includes source code contributions of the following residents: Able Whitman, Adam Marker, Agathos Frascati, Aimee Trescothick, Alejandro Rosenthal, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ann Congrejo, Argent Stonecutter, Asuka Neely, Balp Allen, Benja Kepler, Biancaluce Robbiani, Blakar Ogre, blino Nakamura, Boroondas Gupte, Bulli Schumann, bushing Spatula, Carjay McGinnis, Catherine Pfeffer, Celierra Darling, Cron Stardust, Dale Glass, Drewan Keats, Dylan Haskell, Dzonatas Sol, Eddy Stryker, EponymousDylan Ra, Eva Nowicka, Farallon Greyskin, Feep Larsson, Flemming Congrejo, Fluf Fredriksson, Fractured Crystal, Fremont Cunningham, Geneko Nemeth, Gigs Taggart, Ginko Bayliss, Grazer Kline, Gudmund Shepherd, Hamncheese Omlet, HappySmurf Papp, Henri Beauchamp, Hikkoshi Sakai, Hiro Sommambulist, Hoze Menges, Ian Kas, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Joghert LeSabre, Kage Pixel, Ken March, Kerutsen Sellery, Khyota Wulluf, Kunnis Basiat, Lisa Lowe, Lockhart Cordoso, 
-maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas
+maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas, Franxisco Romano, Damian Zhaoying
 
 Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, 
 Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, 

indra/newview/skins/default/xui/en-us/floater_active_speakers.xml

@@ -23,7 +23,7 @@
 			<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga"
 			     image_unselected="icn_speaker_dark.tga" label="" left_delta="115"
 			     name="mute_btn" toggle="true" tool_tip="Mute voice for this resident"
-			     width="25" />
+			     width="25" scale_image="false" />
 		</panel>
 	</panel>
 </floater>

indra/newview/skins/default/xui/en-us/floater_dictionaries.xml

@@ -2,7 +2,7 @@
 <floater border="false" can_close="true" can_minimize="true" bottom="500" left="500" can_resize="false" height="180" name="EmeraldIRC_dictionaries" title="Download new Dictionaries" width="300">
      <text bottom="-50" follows="left|top" font="SansSerifSmall" height="20" left="15" name="EmDics_txt" width="300">
 Below is a list of additional dictionaries that can
-be downloaded from the Imprudence website.
+be downloaded from the viewer's website.
 
 Please select the dictionary you wish to have available
 for install, and then press the download button.</text>

indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml

@@ -25,7 +25,7 @@
 		width="300"/>
 	<spinner bottom_delta="-24" control_name="RenderFogRatio" decimal_digits="1" height="16" increment="0.1" initial_val="4" label="Fog Distance Ratio:" label_width="138" left="10" max_val="10" min_val="0.5" name="fog" width="202"/>
 	<text bottom_delta="-50" height="40" left="10" name="note">
-		Note: the Gamma and Fog Distance Ratio settings are	unavailable
+		Note: the Gamma and Fog Distance Ratio settings are unavailable
         (since useless) when the Atmospheric Shaders are enabled.
 	</text>
 	<button bottom="10" height="20" label="OK" label_selected="OK" left="-110" name="OK" scale_image="true" width="90"/>

indra/newview/skins/default/xui/en-us/floater_instant_message.xml

@@ -19,7 +19,7 @@
 	<button bottom="-37" follows="top" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End" name="end_call_btn" visible="false" width="80"/>
 	<panel border="false" bottom="-34" follows="left|top" height="20" left_delta="50" name="speaker_controls" width="100">
 		<volume_slider bottom="0" follows="bottom" height="15" increment="0.05" initial_val="0.5" max_val="1.0" min_val="0.0" name="speaker_volume" width="56"/>
-		<button bottom="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" left_delta="56" name="mute_btn" tool_tip="Mute voice" width="25"/>
+		<button bottom="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" left_delta="56" name="mute_btn" tool_tip="Mute voice" width="25"/>
 	</panel>
 	<text_editor bottom="28" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"	enabled="false" follows="left|top|right|bottom" height="228" left="5" max_length="2147483647" name="im_history" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="488" word_wrap="true"/>
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5" follows="left|right" font="SansSerif" height="20" label="Click here to instant message" max_length="2147483647" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="423" spell_check="true"/>

indra/newview/skins/default/xui/en-us/menu_inventory.xml

@@ -50,7 +50,7 @@
 		<on_click filter="" function="Inventory.DoCreate" userdata="gesture" />
 	</menu_item_call>
 	<menu bottom_delta="0" color="MenuDefaultBgColor" drop_shadow="true" height="175" left="0"
-	     mouse_opaque="false" name="New Clothes" opaque="true" tear_off="false"
+	     label="New Clothes" mouse_opaque="false" name="New Clothes" opaque="true" tear_off="false"
 	     width="125">
 		<menu_item_call bottom_delta="-18" height="18" label="New Shirt" left="0" mouse_opaque="true"
 		     name="New Shirt" width="128">
@@ -102,7 +102,7 @@
     </menu_item_call>
 	</menu>
 	<menu bottom_delta="0" color="MenuDefaultBgColor" drop_shadow="true" height="175" left="0"
-	     mouse_opaque="false" name="New Body Parts" opaque="true" tear_off="false"
+	     label="New Body Parts" mouse_opaque="false" name="New Body Parts" opaque="true" tear_off="false"
 	     width="125">
 		<menu_item_call bottom_delta="-18" height="18" label="New Shape" left="0" mouse_opaque="true"
 		     name="New Shape" width="128">

indra/newview/skins/default/xui/en-us/menu_viewer.xml

@@ -490,7 +490,7 @@
 		<menu_item_separator bottom="-94" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator" width="185" />
 		<menu_item_call bottom="-113" enabled="true" height="19" label="Create Landmark Here" left="0"
-		     mouse_opaque="true" name="Create Landmark Here" width="185">
+		     mouse_opaque="true" name="Create Landmark Here" shortcut="control|shift|D" width="185">
 			<on_click function="World.CreateLandmark" userdata="" />
 			<on_enable function="World.EnableCreateLandmark" userdata="" />
 		</menu_item_call>

indra/newview/skins/default/xui/en-us/panel_audio.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="false" height="100" label="Audio &amp; Video" name="Media panel" width="250">
 	<slider control_name="AudioLevelMaster" follows="top" height="15" increment="0.005" initial_val="0.5" label="Master" label_width="55" left="10" max_val="1" min_val="0" name="System Volume" show_text="false" volume="true" width="181"/>
-	<button bottom_delta="0" control_name="MuteAudio" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_audio" toggle="true" width="25"/>
+	<button bottom_delta="0" control_name="MuteAudio" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" right="-28" name="mute_audio" toggle="true" width="25"/>
 	<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="top" height="15" increment="0.005" initial_val="0.5" label="Music" label_width="55" left="10" max_val="1" min_val="0" name="Music Volume" show_text="false" volume="true" width="181"/>
-	<button bottom_delta="0" control_name="MuteMusic" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_music" toggle="true" width="25"/>
+	<button bottom_delta="0" control_name="MuteMusic" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" right="-28" name="mute_music" toggle="true" width="25"/>
 	<slider control_name="AudioLevelMedia" follows="top" height="15" increment="0.005" initial_val="0.5" label="Media" label_width="55" left="10" max_val="1" min_val="0" name="Media Volume" show_text="false" volume="true" width="181"/>
-	<button bottom_delta="0" control_name="MuteMedia" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_media" toggle="true" width="25"/>
+	<button bottom_delta="0" control_name="MuteMedia" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" right="-28" name="mute_media" toggle="true" width="25"/>
 	<slider control_name="AudioLevelVoice" follows="top" height="15" increment="0.005" initial_val="0.5" label="Voice" label_width="55" left="10" max_val="1" min_val="0" name="Voice Volume" show_text="false" volume="true" width="181"/>
-	<button bottom_delta="0" control_name="MuteVoice" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_voice" toggle="true" width="25"/>
+	<button bottom_delta="0" control_name="MuteVoice" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" right="-28" name="mute_voice" toggle="true" width="25"/>
 	<slider control_name="AudioLevelSFX" follows="top" height="15" increment="0.005" initial_val="0.5" label="Sounds" label_width="55" left="10" max_val="1" min_val="0" name="SFX Volume" show_text="false" volume="true" width="181"/>
-	<button bottom_delta="0" control_name="MuteSounds" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_sfx" toggle="true" width="25"/>
+	<button bottom_delta="0" control_name="MuteSounds" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" right="-28" name="mute_sfx" toggle="true" width="25"/>
 	<slider control_name="AudioLevelAmbient" follows="top" height="15" increment="0.005" initial_val="0.5" label="Ambient" label_width="55" left="10" max_val="1" min_val="0" name="Wind Volume" show_text="false" volume="true" width="181"/>
-	<button bottom_delta="0" control_name="MuteAmbient" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_wind" toggle="true" width="25"/>
+	<button bottom_delta="0" control_name="MuteAmbient" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" right="-28" label="" name="mute_wind" toggle="true" width="25"/>
 	<slider control_name="AudioLevelUI" follows="top" height="15" increment="0.005" initial_val="0.5" label="UI" label_width="55" left="10" max_val="1" min_val="0" name="UI Volume" show_text="false" volume="true" width="181"/>
-	<button bottom_delta="0" control_name="MuteUI" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_ui" toggle="true" width="25"/>
+	<button bottom_delta="0" control_name="MuteUI" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" right="-28" label="" name="mute_ui" toggle="true" width="25"/>
 </panel>

indra/newview/skins/default/xui/en-us/panel_master_volume.xml

@@ -8,7 +8,7 @@
 	     initial_val="0.5" left_delta="22" max_val="1" min_val="0"
 	     mouse_opaque="true" name="volume_slider"
 	     tool_tip="Change the volume using this slider" width="50" />
-	<button bottom="-20" control_name="MuteAudio" height="20"
+	<button bottom="-20" control_name="MuteAudio" height="20" scale_image="false"
 	     image_selected="icn_speaker-muted_dark.tga"
 	     image_unselected="icn_speaker_dark.tga" label="" left_delta="52"
 	     name="mute_master" toggle="true" width="25" />

indra/newview/skins/default/xui/en-us/panel_media_controls.xml

@@ -63,7 +63,7 @@
 	     initial_val="0.5" left_delta="15" max_val="1" min_val="0"
 	     mouse_opaque="true" name="volume_slider" tool_tip="Master Volume"
 	     width="56" />
-	<button bottom="-19" control_name="MuteAudio" height="20"
+	<button bottom="-19" control_name="MuteAudio" height="20" scale_image="false" 
 	     image_selected="icn_speaker-muted_dark.tga"
 	     image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
 	     name="mute_master" toggle="true" tool_tip="Master Mute" width="24" />

indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml

@@ -3,7 +3,7 @@
 	<text bottom="-22" height="12" left="10" name="muting_text">Volume:</text>
 	<text bottom="-215" name="streaming_prefs_text">Streaming Preferences:</text>
 	<text bottom="-300" height="12" name="audio_prefs_text">Audio Preferences:</text>
-	<panel border="true" bottom="-175" filename="panel_audio.xml" height="140" label="Volume" left="142" name="Volume Panel" width="260"/>
+	<panel border="true" bottom="-200" filename="panel_audio.xml" height="165" label="Volume" left="142" name="Volume Panel" width="260"/>
 	<check_box bottom="-220" control_name="AudioStreamingMusic" height="16" initial_value="true" label="Play Streaming Music When Available (uses more bandwidth)" left="142" name="streaming_music"/>
 	<check_box bottom_delta="-20" control_name="AudioStreamingVideo" follows="top" height="16" initial_value="true" label="Play Streaming Media When Available (uses more bandwidth)" name="streaming_video"/>
 	<check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" follows="top" height="16" initial_value="true" label="Automatically play media" left="162" name="auto_streaming_video"/>

indra/newview/skins/default/xui/en-us/panel_preferences_general.xml

@@ -44,11 +44,11 @@
 		<combo_item name="System Default Language" value="default">System Default</combo_item>
 		<combo_item name="English" value="en-us">English</combo_item>		
 		<!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string.--> 
+		<combo_item name="Spanish" value="es">Español(Spanish)</combo_item>
 		<combo_item name="French" value="fr">Français(French)</combo_item>
 		<!-- Also, with the above advice in mind, keep completed UI translations above this line.-->
 		<combo_item name="Danish" value="da">Dansk(Danish)*</combo_item>
 		<combo_item name="Deutsch(German)" value="de">Deutsch(German)*</combo_item>
-		<combo_item name="Spanish" value="es">Español(Spanish)*</combo_item>
 		<combo_item name="Italian" value="it">Italiano(Italian)*</combo_item>
 		<combo_item name="Hungarian" value="hu">Magyar(Hungarian)*</combo_item>
 		<combo_item name="Dutch" value="nl">Nederlands(Dutch)*</combo_item>

indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml

@@ -46,7 +46,14 @@
 	<check_box bottom_delta="-17" control_name="RenderDeferred" initial_value="true" label="Lighting and Shadows" tool_tip="Deferred Shading" left_delta="0" name="RenderDeferred"/>
     <check_box bottom_delta="-17" control_name="RenderDeferredSSAO" height="16" initial_value="true" label="Ambient Occlusion" left_delta="0" name="UseSSAO"/>
 	<check_box bottom_delta="-17" control_name="RenderDepthOfField"	initial_value="true" label="Depth of Field" left_delta="0" name="RenderDepthOfField"/>
-  <text bottom_delta="-60" height="12" left="15" name="ShadowDetailText">Shadows:</text>
+  <text bottom_delta="-20" height="12" left="15" name="TerrainScaleText">Terrain Scale:</text>
+  <combo_box bottom_delta="-22" control_name="RenderTerrainScale" label="Terrain Scale" left_delta="-2" name="TerrainScaleCombo" width="160" height="16">
+    <combo_item name="Low" value="12">Low</combo_item>
+    <combo_item name="Medium" value="9">Medium</combo_item>
+	<combo_item name="High" value="7">High</combo_item>
+    <combo_item name="Ultra" value="5">Ultra</combo_item>
+  </combo_box>
+  <text bottom_delta="-20" height="12" left="15" name="ShadowDetailText">Shadows:</text>
   <combo_box bottom_delta="-22" control_name="RenderShadowDetail" label="Shadow Detail" left_delta="-2" name="ShadowDetailCombo" width="160" height="16">
 	  <combo_item name="0" value="0">Disabled</combo_item>
 	  <combo_item name="1" value="1">Sun/Moon</combo_item>

indra/newview/skins/default/xui/en-us/panel_preferences_input.xml

@@ -15,5 +15,6 @@
 	<check_box bottom_delta="-24" follows="top" initial_value="false" label="Automatic Edit Camera Movement" left="148" name="edit_camera_movement" tool_tip="Use automatic camera positioning when entering and exiting edit mode"/>
 	<check_box bottom_delta="-18" follows="top" height="16" initial_value="false" label="Automatic Appearance Camera Movement" left="148" name="appearance_camera_movement" tool_tip="Use automatic camera positioning while in edit mode"/>
 	<check_box bottom_delta="-18" follows="top" height="16" initial_value="false" label="Unsit Avatar on Camera Reset" left="148" name="unsit_on_camera_reset" tool_tip="Stand up automatically when you press Esc and the camera switches to third person mode"/>
+	<check_box bottom_delta="-18" follows="top" height="16" label="Disable Camera Constraints" left="148" control_name="DisableCameraConstraints" name="DisableCameraConstraints" tool_tip="Prevent the camera from automatically zooming when you approach walls, objects, etc., too closely."/>
 	<button bottom_delta="-30" follows="top" font="SansSerif" height="20" label="Joystick Setup" name="joystick_setup_button" width="155"/>
 </panel>

indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml

@@ -18,7 +18,7 @@
 				<button bottom="-28" enabled="false" follows="left|top" height="20" image_overlay="icon_avatar_offline.tga" label="" left="4" name="profile_btn" right="34" scale_image="true"/>
 				<text bottom_delta="9" follows="left|top|right" left_delta="34" name="resident_name" valign="center" width="140">Rumplstiltskin Califragilistic</text>
 				<volume_slider bottom_delta="-29" follows="left|top" height="15" increment="0.05" initial_val="0.5" left="0" max_val="1.0" min_val="0.0" name="speaker_volume" width="110"/>
-				<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" left_delta="110" name="mute_btn" tool_tip="Mute voice for this resident" width="25"/>
+				<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" left_delta="110" name="mute_btn" tool_tip="Mute voice for this resident" width="25"/>
 				<check_box bottom_delta="-25" enabled="false" follows="left|top" height="25" label="Mute Text" left="3" name="mute_text_btn"/>
 			</panel>
 		</layout_panel>

indra/newview/skins/default/xui/es/alerts.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<alerts>
+</alerts>
+<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->

indra/newview/skins/default/xui/es/floater_about.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_about" title="Acerca de Singularity Viewer">
+  <tab_container name="about_tab">
+    <panel label="Información" help_topic="about_support_tab" name="support_panel">
+      <button label="Copiar al portapapeles" name="copy_btn"/>
+    </panel>
+
+    <panel label="Créditos" help_topic="about_credits_tab" name="credits_panel">
+      <text_editor name="credits_editor">
+Singularity Viewer es desarrollado y mantenido por Siana Gearz, Shyotl Kuhr, Aleric Inglewood, Narv Czervik, Tigh MacFanatic, Inusaito Kanya, Sovereign Engineer y Latif Khalifa, con contribuciones de Fractured Crystal, Fritigern Gothly, Henri Beauchamp, McCabe Maxsted, Kadah Coba, Kitty Barnett, nhede Core, Nomade Zhao, Revolution Smythe, Selvone Franizzi, Thickbrick Sleaford, Zauber Parecelsus, Wolfspirit Magic y otros. Singularity está basado en el código fuente del Visor Ascent. Los créditos del Visor Ascent incluyen a Hg Beeks, Charley Levenque, Hazim Gazov, Zwagoth Klaar, Qarl Fizz, y otros. El Visor Ascent está basado en el código fuente del visor Inertia.
+
+Singularity Viewer incluye código fuente aportado por los siguientes residentes: Able Whitman, Adam Marker, Agathos Frascati, Aimee Trescothick, Alejandro Rosenthal, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ann Congrejo, Argent Stonecutter, Asuka Neely, Balp Allen, Benja Kepler, Biancaluce Robbiani, Blakar Ogre, blino Nakamura, Boroondas Gupte, Bulli Schumann, bushing Spatula, Carjay McGinnis, Catherine Pfeffer, Celierra Darling, Cron Stardust, Dale Glass, Drewan Keats, Dylan Haskell, Dzonatas Sol, Eddy Stryker, EponymousDylan Ra, Eva Nowicka, Farallon Greyskin, Feep Larsson, Flemming Congrejo, Fluf Fredriksson, Fractured Crystal, Fremont Cunningham, Geneko Nemeth, Gigs Taggart, Ginko Bayliss, Grazer Kline, Gudmund Shepherd, Hamncheese Omlet, HappySmurf Papp, Henri Beauchamp, Hikkoshi Sakai, Hiro Sommambulist, Hoze Menges, Ian Kas, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Joghert LeSabre, Kage Pixel, Ken March, Kerutsen Sellery, Khyota Wulluf, Kunnis Basiat, Lisa Lowe, Lockhart Cordoso, 
+maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas, Franxisco Romano, Damian Zhaoying
+
+Second Life llega a ti gracias a Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, 
+Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, 
+Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, 
+Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl y muchos otro más.
+
+Linden Lab agradece a los siguientes residentes: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota 
+Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
+      </text_editor>
+    </panel>
+
+    <panel label="Licenses" name="licenses_panel">
+      <text_editor name="licenses_editor"> 
+3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
+APR Copyright (C) 2000-2012 The Apache Software Foundation
+Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
+cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
+DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
+expat Copyright (C) 1998-2000 Thai Open Source Software Center Ltd., 2001-2006 Expat maintainers.
+FMOD Sound System, Copyright (C) 1994-2012 Firelight Technologies Pty, Ltd.
+FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+GL Copyright (C) 1999-2004 Brian Paul.
+GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
+google-perftools Copyright (C) 2005, Google Inc.
+jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
+jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+ogg/vorbis Copyright (C) 2002, Xiph.org Foundation
+OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
+PCRE Copyright (c) 1997-2012 University of Cambridge
+SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
+zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
+
+<!--Translate: This software contains source code provided by NVIDIA Corporation.-->
+
+All rights reserved.  Ver licenses.txt para mayor información.
+
+Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+      </text_editor>
+    </panel>
+  </tab_container>  
+  <string name="you_are_at">Estás en [POSITION]</string>
+</floater>

indra/newview/skins/default/xui/es/floater_about_land.xml

@@ -0,0 +1,579 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floaterland" title="Acerca del terreno">
+	<tab_container name="landtab">
+		<panel label="General" name="land_general_panel">
+			<text name="Name:">
+				Nombre:
+			</text>
+			<text name="Description:">
+				Descripción:
+			</text>
+			<text name="LandType">
+				Tipo:
+			</text>
+			<text name="LandTypeText">
+				Mainland / Homestead
+			</text>
+			<text name="ContentRating">
+				Calificación:
+			</text>
+			<text name="ContentRatingText">
+				Adulto
+			</text>
+			<text name="Owner:">
+				Propietario:
+			</text>
+			<text name="OwnerText">
+				Leyla Linden
+			</text>
+			<button label="Perfil..." label_selected="Perfil..." name="Profile..."/>
+			<string name="group_owned_text">
+				(Propiedad del Grupo)
+			</string>
+			<string name="profile_text">
+				Perfil...
+			</string>
+			<string name="info_text">
+				Información...
+			</string>
+			<string name="public_text">
+				(público)
+			</string>
+			<string name="none_text">
+				(ninguno)
+			</string>
+			<text name="Group:">
+				Grupo:
+			</text>
+			<button label="Definir..." label_selected="Definir..." name="Set..."/>
+			<button bottom="-160"  label="Info" name="group_profile"/>
+			<check_box label="Permitir transferir al grupo" name="check deed" tool_tip="Un oficial del grupo puede transferir este terreno al grupo. El terreno será sostenido por el grupo en sus asignaciones de terreno."/>
+			<button label="Transferir..." label_selected="Transferir..." name="Deed..." tool_tip="Sólo puedes transferir un terreno si eres un oficial del grupo seleccionado."/>
+			<check_box label="El propietario hace una contribución transfiriendo" name="check contrib" tool_tip="Cuando el terreno se transfiere al grupo, el antiguo propietario contribuye con una asignación suficiente de terreno."/>
+			<text name="For Sale:">
+				En Venta:
+			</text>
+			<text name="Not for sale.">
+				No está en Venta.
+			</text>
+			<text name="For Sale: Price L$[PRICE].">
+				Precio: [CURRENCY][PRICE] ([CURRENCY][PRICE_PER_SQM]/m².).
+			</text>
+			<text name="SalePending"/>
+			<button label="Vender el Terreno..." label_selected="Vender el Terreno..." name="Sell Land..."/>
+			<text name="For sale to">
+				En venta a: [BUYER]
+			</text>
+			<text name="Sell with landowners objects in parcel.">
+				  Los objetos se incluyen en la venta.
+			</text>
+			<text name="Selling with no objects in parcel.">
+				  Los objetos no se incluyen en la venta.
+			</text>
+			<button label="Cancelar la venta del terreno" label_selected="Cancelar la venta del terreno" name="Cancel Land Sale"/>
+			<text name="Claimed:">
+				Reclamada:
+			</text>
+			<text name="DateClaimText">
+				Mar 15 Ago 13:47:25 2006
+			</text>
+			<text name="PriceLabel">
+				Superficie:
+			</text>
+			<text name="PriceText">
+				4048 m²
+			</text>
+			<text name="Traffic:">
+				Tráfico:
+			</text>
+			<text name="DwellText">
+				0
+			</text>
+			<button label="Comprar terreno..." label_selected="Comprar terreno..." name="Buy Land..." width="120"/>
+			<button label="Comprar para el grupo..." label_selected="Comprar para el grupo..." name="Buy For Group..." width="160" left="280"/>
+			<button label="Comprar un Pase..." label_selected="Comprar un Pase..." name="Buy Pass..." tool_tip="Un pase te da acceso temporal a este terreno." width="120"/>
+			<button label="Abandonar terreno..." label_selected="Abandonar terreno..." name="Abandon Land..." width="160" left="280"/>
+			<button label="Reclamar tereno..." label_selected="Reclamar terreno..." name="Reclaim Land..."/>
+			<button label="Venta Linden..." label_selected="Venta Linden..." name="Linden Sale..." tool_tip="El terreno debe estar en propiedad, con contenido, y no estar en subasta."/>
+			<string name="new users only">
+				Sólo usuarios nuevos
+			</string>
+			<string name="anyone">
+				Cualquiera
+			</string>
+			<string name="area_text">
+				Superficie
+			</string>
+			<string name="area_size_text">
+				[AREA] m²
+			</string>
+			<string name="auction_id_text">
+				ID de la subasta: [ID]
+			</string>
+			<string name="need_tier_to_modify">
+				Debe aprobar su compra para modificar este terreno.
+			</string>
+			<string name="sale_pending_text">
+				(Venta pendiente)
+			</string>
+			<string name="no_selection_text">
+				No se ha seleccionado una parcela.
+Ve al Menú Mundo &gt; Acerca del terreno o selecciona otra parcela para ver sus características.
+			</string>
+		</panel>
+		<panel label="Convenio" name="land_covenant_panel" >
+			<text name="estate_section_lbl">
+				Estado:
+			</text>
+			<text name="estate_name_lbl">
+				Nombre:
+			</text>
+			<text name="estate_name_text">
+				mainland
+			</text>
+			<text name="estate_owner_lbl">
+				Propietario:
+			</text>
+			<text name="estate_owner_text">
+				(ninguno)
+			</text>
+			<text_editor name="covenant_editor">
+				No se ha aportado un contrato para este estado.
+			</text_editor>
+			<text name="covenant_timestamp_text">
+				Última modificación Mie 31 Dic 16:00:00 1969
+			</text>
+			<text name="region_section_lbl">
+				Región:
+			</text>
+			<text name="region_name_lbl">
+				Nombre:
+			</text>
+			<text name="region_name_text">
+				leyla
+			</text>
+			<text name="region_landtype_lbl">
+				Tipo:
+			</text>
+			<text name="region_landtype_text">
+				Mainland / Homestead
+			</text>
+			<text name="region_maturity_lbl">
+				Calificación:
+			</text>
+			<text name="region_maturity_text">
+				Adulto
+			</text>
+			<text name="resellable_lbl">
+				Revender:
+			</text>
+			<text name="resellable_clause">
+				El terreno de esta región no se podrá revender.
+			</text>
+			<text name="changeable_lbl">
+				Subdividir:
+			</text>
+			<text name="changeable_clause">
+				El terreno de esta región no se podrá unir/subdividir.
+			</text>
+			<string name="can_resell">
+				El terreno comprado en esta región se podrá revender.
+			</string>
+			<string name="can_not_resell">
+				El terreno comprado en esta región no se podrá revender.
+			</string>
+			<string name="can_change">
+				El terreno comprado en esta región se podrá unir o subdividir.
+			</string>
+			<string name="can_not_change">
+				El terreno comprado en esta región no se podrá unir o dividir.
+			</string>
+		</panel>
+		<panel label="Objetos" name="land_objects_panel">
+			<text name="parcel_object_bonus">
+				Plus de Objectos en la Región: [BONUS]
+			</text>
+			<text name="Simulator primitive usage:">
+				Uso de primitivas en el Simulador:
+			</text>
+			<text name="objects_available" left="180" width="250">
+				[COUNT] de un máximo de [MAX] ([AVAILABLE] disponibles)
+			</text>
+			<string name="objects_available_text" left="180" width="250">
+				[COUNT] de un máximo de  [MAX] ([AVAILABLE] disponibles)
+			</string>
+			<string name="objects_deleted_text" left="180" width="250">
+				[COUNT] de un máximo de [MAX] ([DELETED] serán borrados)
+			</string>
+			<text name="Primitives parcel supports:">
+				Prims que acepta la parcela:
+			</text>
+			<text name="object_contrib_text" left="180">
+				[COUNT]
+			</text>
+			<text name="Primitives on parcel:">
+				Prims en la parcela:
+			</text>
+			<text name="total_objects_text" left="180">
+				[COUNT]
+			</text>
+			<text name="Owned by parcel owner:">
+				Del propietario de la parcela:
+			</text>
+			<text name="owner_objects_text" left="180">
+				[COUNT]
+			</text>
+			<button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-150"/>
+			<button label="Retornar..." label_selected="Retornar..." name="ReturnOwner..." tool_tip="Return objects to their owners." right="-20"/>
+			<text name="Set to group:">
+				Del grupo:
+			</text>
+			<text name="group_objects_text" left="180">
+				[COUNT]
+			</text>
+			<button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-150"/>
+			<button label="Retornar..." label_selected="Retornar..." name="ReturnGroup..." tool_tip="Retornar objetos a sus propietarios." right="-20"/>
+			<text name="Owned by others:">
+				Propiedad de Otros:
+			</text>
+			<text name="other_objects_text" left="180">
+				[COUNT]
+			</text>
+			<button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-150"/>
+			<button label="Retornar..." label_selected="Retornar..." name="ReturnOther..." tool_tip="Retornar objetos a sus propietarios." right="-20"/>
+			<text name="Selected / sat upon:">
+				Selecc./con gente sentada:
+			</text>
+			<text name="selected_objects_text" left="180">
+				[COUNT]
+			</text>
+			<text name="Autoreturn" width="350">
+				Autoretorno de objetos a otros residentes (minutos; 0 para desactivar):
+			</text>
+			<line_editor name="clean other time" right="-25"/>
+			<text name="Object Owners:" width="250">
+				Propietarios de los objetos:
+			</text>
+			<button label="Actualizar la lista" label_selected="Actualizar la lista" name="Refresh List" left="190" width="50"/>
+			<button label="Retornar objetos..." label_selected="Retornar objetos..." name="Return objects..." left="300" width="120"/>
+			<name_list name="owner list">
+				<column name="type" label="Tipo"/>
+				<column name="online_status"/>
+				<column name="name" label="Nombre"/>
+				<column name="count" label="Cantidad"/>
+				<column name="mostrecent" label="Recientes"/>
+			</name_list>
+		</panel>
+		<panel label="Opciones" name="land_options_panel">
+			<text name="allow_label">
+				Permitir a otros residentes:
+			</text>
+			<check_box label="Editar Terreno" name="edit land check" tool_tip="Si se marca, cualquiera podrá modificar tu terreno. Mejor dejarlo desmarcado, pues siempre puedes modificar tu terreno."/>
+			<check_box label="Crear Hitos" name="check landmark"/>
+			<check_box label="Volar" name="check fly" tool_tip="Si se marca, los residentes podrán volar en tu terreno. Si no, sólo podrán volar al cruzarlo o hasta que aterricen en él."/>
+			<text name="allow_label2" left="160">
+				Crear Objetos:
+			</text>
+			<check_box label="Todos los Residentes" name="edit objects check" left="240"/>
+			<check_box label="Grupo" name="edit group objects check"/>
+			<text name="allow_label3" left="160">
+				Dejar Objetos:
+			</text>
+			<check_box label="Todos los Residentes" name="all object entry check" left="240"/>
+			<check_box label="Grupo" name="group object entry check"/>
+			<text name="allow_label4" left="160">
+				Ejecutar Scripts:
+			</text>
+			<check_box label="Todos los Residentes" name="check other scripts" left="240"/>
+			<check_box label="Grupo" name="check group scripts"/>
+			<text name="land_options_label">
+				Opciones del terreno:
+			</text>
+			<check_box label="Seguro (sin daño)" name="check safe" tool_tip="Marcado, convierte el terreno en 'seguro', desactivando el daño en combate. Si no, se activa el daño en combate."/>
+			<string name="push_restrict_text">
+				Sin empujones
+			</string>
+			<string name="push_restrict_region_text">
+				Sin empujones (Prevalece lo marcado en la Región)
+			</string>
+			<check_box name="PushRestrictCheck" tool_tip="Previene scripts que empujen. Marcando esta opción evitará que en tu terreno haya comportamientos destructivos."/>
+			<check_box label="Mostrar parcela en la busqueda ([DIRECTORYFEE]) en" name="ShowDirectoryCheck" tool_tip="Permitir que aparezca esta parcela en los resultados de la búsqueda" left="14"/>
+			<string name="search_enabled_tooltip">
+				Permitir que aparezca esta parcela en los resultados de la búsqueda
+			</string>
+			<string name="search_disabled_small_tooltip">
+				Esta opción está desactivada porque la parcela tiene 128 m² o menos.
+Sólo las parcelas más grandes pueden listarse en la búsqueda.
+			</string>
+			<string name="search_disabled_permissions_tooltip">
+				Esta opción no esta activada porque no puedes modificar las opciones de la parcela.
+			</string>
+			<combo_box name="land category with adult" left="280">
+				<combo_item name="AnyCategory">
+					Cualquier Categoría
+				</combo_item>
+				<combo_item name="LindenLocation">
+					Localización Linden
+				</combo_item>
+				<combo_item name="Adult">
+					Adulto
+				</combo_item>
+				<combo_item name="Arts&amp;Culture">
+					Arte y Cultura
+				</combo_item>
+				<combo_item name="Business">
+					Negocios
+				</combo_item>
+				<combo_item name="Educational">
+					Educativo
+				</combo_item>
+				<combo_item name="Gaming">
+					Juegos de azar
+				</combo_item>
+				<combo_item name="Hangout">
+					Entretenimiento
+				</combo_item>
+				<combo_item name="NewcomerFriendly">
+					Para recién llegados
+				</combo_item>
+				<combo_item name="Parks&amp;Nature">
+					Parques y Naturaleza
+				</combo_item>
+				<combo_item name="Residential">
+					Residencial
+				</combo_item>
+				<combo_item name="Shopping">
+					Compras
+				</combo_item>
+				<combo_item name="Other">
+					Otros
+				</combo_item>
+				<combo_item name="Rental">
+					Alquiler
+				</combo_item>
+			</combo_box>
+			<!-- The following combo box is identical to the previous one, except for the
+				fact that the Adult item is missing. This seems to be the only way to safely
+				delete the adult item with our UI toolkit.
+				Once we have completed the transition period, the one WITH adult can be deleted. -->
+			<combo_box name="land category" left="280">
+				<combo_item name="AnyCategory">
+					Cualquier Categoría
+				</combo_item>
+				<combo_item name="LindenLocation">
+					Localización Linden
+				</combo_item>
+				<combo_item name="Arts&amp;Culture">
+					Arte y Cultura
+				</combo_item>
+				<combo_item name="Business">
+					Negocios
+				</combo_item>
+				<combo_item name="Educational">
+					Educativo
+				</combo_item>
+				<combo_item name="Gaming">
+					Juegos de Azar
+				</combo_item>
+				<combo_item name="Hangout">
+					Entretenimiento
+				</combo_item>
+				<combo_item name="NewcomerFriendly">
+					Para recién llegados
+				</combo_item>
+				<combo_item name="Parks&amp;Nature">
+					Parques y Naturaleza
+				</combo_item>
+				<combo_item name="Residential">
+					Residencial
+				</combo_item>
+				<combo_item name="Shopping">
+					Compras
+				</combo_item>
+				<combo_item name="Other" value="other">
+					Otros
+				</combo_item>
+				<combo_item name="Rental" value="rental">
+					Alquiler
+				</combo_item>
+			</combo_box>
+			<button label="?" label_selected="?" name="?" left="420"/>
+			<check_box label="Contenido Mature" name="MatureCheck"/>
+			<string name="mature_check_mature">
+				Contenido Mature
+			</string>
+			<string name="mature_check_adult">
+				Contenido Adulto
+			</string>
+			<string name="mature_check_mature_tooltip">
+				La información o el contenido de su parcela se considera mature.
+			</string>
+			<string name="mature_check_adult_tooltip">
+				La información o el contenido de su parcela se considera adulto.
+			</string>
+			<text name="allow_label5">
+				Permitir a residentes en otras parcelas:
+			</text>
+			<check_box label="Ver Avatares" name="SeeAvatarsCheck" tool_tip="Premite a los residentes en otras parcelas ver y conversar con los residentes en esta parcela, y tu prodrás verlos y conversar también con ellos."/>
+			<string name="see_avs_text">
+				Ver y conversar con residentes en esta parcela
+			</string>
+			<text name="Snapshot:">
+				 Foto:
+			</text>
+			<texture_picker name="snapshot_ctrl" tool_tip="Pulsa aquí para elegir una imagen"/>
+			<text name="landing_point">
+				Punto de llegada: [LANDING]
+			</text>
+			<string name="landing_point_none">
+				(ninguno)
+			</string>
+			<button label="Definir" label_selected="Definir" name="Set" tool_tip="Configura el punto de llegada donde aparecerán los visitantes. Configúralo a la posición de tu avatar dentro de esta parcela."/>
+			<button label="Borrar" label_selected="Borrar" name="Clear" tool_tip="Borra el punto de llegada."/>
+			<text name="Teleport Routing: ">
+				Punto de Teleporte:
+			</text>
+			<combo_box name="landing type" tool_tip="Punto de Teleporte -- define como manejar los teleportes en tu terreno.">
+				<combo_item name="Blocked" value="Blocked">
+					Bloqueado
+				</combo_item>
+				<combo_item name="LandingPoint" value="Landing Point">
+					Punto de Llegada
+				</combo_item>
+				<combo_item name="Anywhere" value="Anywhere">
+					Cualquiera
+				</combo_item>
+			</combo_box>
+		</panel>
+		<panel label="Media" name="land_media_panel">
+			<text name="with media:" width="70">
+				Tipo de media:
+			</text>
+			<combo_box name="media type" tool_tip="Especifica si la URL es una película, página web u otro tipo de media" left="90"/>
+			<text name="mime_type"/>
+			<text name="at URL:">
+				URL base:
+			</text>
+			<line_editor name="media_url"/>
+			<button label="Definir..." label_selected="Definir..." name="set_media_url"/>
+			<text name="at URL2:">
+				URL actual:
+			</text>
+			<text name="current_url"/>
+			<button label="Reiniciar..." label_selected="Reiniciar..." name="reset_media_url"/>
+			<text name="media_reset" tool_tip="Tiempo transcurrido para revertir al URL por defecto de la parcela (0 para no retornar el valor defecto)" width="300">
+				Retornar al URL por defecto en:
+			</text>
+			<spinner name="media_reset_time" tool_tip="Tiempo transcurrido para revertir al URL por defecto de la parcela (0 para no retornar el valor defecto)" left_delta="170"/>
+			<text name="minutes">
+				minutos
+			</text>
+			<text name="Description:">
+				Descripción:
+			</text>
+			<line_editor name="url_description" tool_tip="Texto mostrado al lado del botón Ejecutar/Cargar" />
+			<text name="Media texture:">
+				Textura:
+			</text>
+			<texture_picker label="" name="media texture" tool_tip="Pulsa aquí para elegir una textura"/>
+			<text name="replace_texture_help">
+				Los objetos que usen esta textura mostrarán la
+película o la web cuando pulse la flecha de ejecución.
+
+Selecciona la miniatura para elegir una textura diferente.
+			</text>
+			<text name="Options:">
+				Opciones:
+			</text>
+			<check_box label="Bucle" name="media_loop" tool_tip="El media se ejecuta en bucle permanente. Cuando haya terminado su ejecución, se reiniciará desde el comienzo."/>
+			<check_box label="Escala automática" name="media_auto_scale" tool_tip="Marcando esta opción, se ajustará el tamaño del contenido automáticamente. Puede ser ligeramente más lento y con menor calidad visual, pero no tendrás que ajustar ni alinear ninguna textura."/>
+			<text name="media_size" tool_tip="Tamaño para mostrar la webs, déjalo en  0 para el valor por defecto."  width="100">
+				Tamaño de Media:
+			</text>
+			<spinner name="media_size_width" tool_tip="Ancho para mostrar la webs, déjalo en  0 para el valor por defecto." left="110"/>
+			<spinner name="media_size_height" tool_tip="Alto para mostrar la webs, déjalo en  0 para el valor por defecto."/>
+			<text name="pixels">
+				pixeles
+			</text>
+			<text name="Interaction:">
+				  Interactivo:
+			</text>
+			<radio_group name="radio_navigate_allow">
+				<radio_item name="Anyone" tool_tip="Cualquier residente puede interactuar con el media.">
+					Cualquiera
+				</radio_item>
+				<radio_item name="Group" tool_tip="Sólo miembros del Grupo con permiso de control puede interactuar con el media.">
+					Grupo
+				</radio_item>
+			</radio_group>
+		</panel>
+		<panel name="land_audio_panel">
+			<text name="MusicURL:">
+				URL de la música:
+			</text>
+			<line_editor name="music_url" left="110"/>
+			<text name="Sound:">
+				Música:
+			</text>
+			<check_box label="Restringir gestos y sonidos de objetos a esta parcela" name="check_sound_local"/>
+			<button label="?" label_selected="?" name="?"/>
+			<text name="Avatar Sounds:">
+				Sonidos de Avatares:
+			</text>
+			<check_box label="Cualquiera" name="all av sound check"/>
+			<check_box label="Grupo" name="group av sound check"/>
+			<text name="Voice:">
+				Voz:
+			</text>
+			<radio_group name="parcel_voice_channel">
+				<radio_item name="Estate" tool_tip="Utilizar el canal de voz del estado.">
+					Canal del Estado
+				</radio_item>
+				<radio_item name="Parcel" tool_tip="Restringir la Voz a esta parcela.">
+					Canal de la Parcela
+				</radio_item>
+				<radio_item name="Disabled" tool_tip="Deshabilitar la voz en esta parcela.">
+					Deshabilitada
+				</radio_item>
+			</radio_group>
+		</panel>
+		<panel label="Acceso" name="land_access_panel">
+			<text name="Limit access to this parcel to:">
+				Acceso a esta parcela
+			</text>
+			<check_box label="Permitir Acceso Público" name="public_access"/>
+			<text name="Only Allow">
+				Bloquear acceso por:
+			</text>
+			<check_box label="Residentes que no tengan información de pago en archivo" name="limit_payment" tool_tip="Prohibir a residentes no identificados."/>
+			<check_box label="Residentes no verificados como adultos" name="limit_age_verified" tool_tip="Prohibir a los residentes que no han verificado su edad. Ver support.secondlife.com para mayor información."/>
+			<string name="estate_override">
+				Una o mas de estas opciones está configurada a nivel del Estado
+			</string>
+			<check_box label="Permitir Acceso al Grupo: [GROUP]" name="GroupCheck" tool_tip="Definir el Grupo en la pestaña General."/>
+			<check_box label="Vender pases para:" name="PassCheck" tool_tip="Permitir acceso temporario a esta parcela"/>
+			<combo_box name="pass_combo">
+				<combo_item name="Anyone">
+					Cualquiera
+				</combo_item>
+				<combo_item name="Group">
+					Grupo
+				</combo_item>
+			</combo_box>
+			<spinner label="Precio en [CURRENCY]:" name="PriceSpin"/>
+			<spinner label="Horas de acceso:" name="HoursSpin"/>
+			<text label="Permitir siempre" name="AllowedText">
+				Residentes permitidos
+			</text>
+			<name_list name="AccessList" tool_tip="([LISTED] listados, [MAX] max)"/>
+			<button label="Agregar..." label_selected="Agregar..." name="add_allowed"/>
+			<button label="Quitar" label_selected="Quitar" name="remove_allowed"/>
+			<text label="Ban" name="BanCheck">
+				Residentes prohibidos
+			</text>
+			<name_list name="BannedList" tool_tip="([LISTED] listados, [MAX] max)"/>
+			<button label="Agregar..." label_selected="Agregar..." name="add_banned"/>
+			<button label="Quitar" label_selected="Quitar" name="remove_banned"/>
+		</panel>
+	</tab_container>
+</floater>

indra/newview/skins/default/xui/es/floater_active_speakers.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="active_speakers" title="Participantes Activos">
+	<panel name="active_speakers_panel">
+		<scroll_list name="speakers_list">
+			<column label="Nombre" name="speaker_name"/>
+		</scroll_list>
+		<panel name="volume_container">
+			<button name="mute_btn" tool_tip="Ignorar la voz de este residente"/>
+		</panel>
+	</panel>
+</floater>