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

Merge git://github.com/AlericInglewood/SingularityViewer

Browse Source 
Conflicts:
	indra/newview/CMakeLists.txt
	indra/newview/app_settings/settings.xml
This commit is contained in:
Siana Gearz
2011-05-01 22:55:18 +02:00
parent a8f4b3ed4a 26c40255aa
commit 38849c1328
83 changed files with 39297 additions and 39235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

592
indra/cmake/00-Common.cmake
View File

@@ -1,296 +1,296 @@
# -*- cmake -*-
#
# Compilation options shared by all Second Life components.
include(Variables)
# Portable compilation flags.
set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1")
set(CMAKE_CXX_FLAGS_RELEASE
"-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG")
set(CMAKE_C_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE}")
set(CMAKE_CXX_FLAGS_RELEASESSE2
"-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG")
#llimage now requires this (?)
set(CMAKE_C_FLAGS_RELEASESSE2
"${CMAKE_CXX_FLAGS_RELEASESSE2}")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-DLL_RELEASE=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
# Don't bother with a MinSizeRel build.
set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;ReleaseSSE2;Debug" CACHE STRING
"Supported build types." FORCE)
# Platform-specific compilation flags.
if (WINDOWS)
# Don't build DLLs.
set(BUILD_SHARED_LIBS OFF)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd"
CACHE STRING "C++ compiler debug options" FORCE)
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
"${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP"
CACHE STRING "C++ compiler release-with-debug options" FORCE)
set(CMAKE_CXX_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /arch:SSE /fp:fast"
CACHE STRING "C++ compiler release options" FORCE)
set(CMAKE_C_FLAGS_RELEASE
"${CMAKE_C_FLAGS_RELEASE} ${LL_C_FLAGS} /O2 /Zi /MD /MP /arch:SSE /fp:fast"
CACHE STRING "C compiler release options" FORCE)
set(CMAKE_CXX_FLAGS_RELEASESSE2
"${CMAKE_CXX_FLAGS_RELEASESSE2} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /arch:SSE2 /fp:fast"
CACHE STRING "C++ compiler release-SSE2 options" FORCE)
set(CMAKE_C_FLAGS_RELEASESSE2
"${CMAKE_C_FLAGS_RELEASESSE2} ${LL_C_FLAGS} /O2 /Zi /MD /MP /arch:SSE2 /fp:fast"
CACHE STRING "C compiler release-SSE2 options" FORCE)
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LARGEADDRESSAWARE")
set(CMAKE_CXX_STANDARD_LIBRARIES "")
set(CMAKE_C_STANDARD_LIBRARIES "")
add_definitions(
/DLL_WINDOWS=1
/DUNICODE
/D_UNICODE
/GS
/TP
/W3
/c
/Zc:forScope
/nologo
/Oy-
)
if(MSVC80 OR MSVC90 OR MSVC10)
set(CMAKE_CXX_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
CACHE STRING "C++ compiler release options" FORCE)
set(CMAKE_CXX_FLAGS_RELEASESSE2
"${CMAKE_CXX_FLAGS_RELEASESSE2} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
CACHE STRING "C++ compiler release-SSE2 options" FORCE)
set(CMAKE_C_FLAGS_RELEASESSE2
"${CMAKE_CXX_FLAGS_RELEASESSE2} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
CACHE STRING "C compiler release-SSE2 options" FORCE)
add_definitions(
/Zc:wchar_t-
)
endif (MSVC80 OR MSVC90 OR MSVC10)
# Are we using the crummy Visual Studio KDU build workaround?
if (NOT VS_DISABLE_FATAL_WARNINGS)
add_definitions(/WX)
endif (NOT VS_DISABLE_FATAL_WARNINGS)
# Various libs are compiler specific, generate some variables here we can just use
# when we require them instead of reimplementing the test each time.
if (MSVC71)
set(MSVC_DIR 7.1)
set(MSVC_SUFFIX 71)
elseif (MSVC80)
set(MSVC_DIR 8.0)
set(MSVC_SUFFIX 80)
elseif (MSVC90)
set(MSVC_DIR 9.0)
set(MSVC_SUFFIX 90)
elseif (MSVC10)
set(MSVC_DIR 10.0)
set(MSVC_SUFFIX 100)
endif (MSVC71)
endif (WINDOWS)
set (GCC_EXTRA_OPTIMIZATION "-ffast-math -frounding-math")
if (LINUX)
set(CMAKE_SKIP_RPATH TRUE)
# Here's a giant hack for Fedora 8, where we can't use
# _FORTIFY_SOURCE if we're using a compiler older than gcc 4.1.
find_program(GXX g++)
mark_as_advanced(GXX)
if (GXX)
execute_process(
COMMAND ${GXX} --version
COMMAND sed "s/^[gc+ ]*//"
COMMAND head -1
OUTPUT_VARIABLE GXX_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
else (GXX)
set(GXX_VERSION x)
endif (GXX)
# The quoting hack here is necessary in case we're using distcc or
# ccache as our compiler. CMake doesn't pass the command line
# through the shell by default, so we end up trying to run "distcc"
# " g++" - notice the leading space. Ugh.
execute_process(
COMMAND sh -c "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} --version"
COMMAND sed "s/^[gc+ ]*//"
COMMAND head -1
OUTPUT_VARIABLE CXX_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)
if (${GXX_VERSION} STREQUAL ${CXX_VERSION})
add_definitions(-D_FORTIFY_SOURCE=2)
else (${GXX_VERSION} STREQUAL ${CXX_VERSION})
if (NOT ${GXX_VERSION} MATCHES " 4.1.*Red Hat")
add_definitions(-D_FORTIFY_SOURCE=2)
endif (NOT ${GXX_VERSION} MATCHES " 4.1.*Red Hat")
endif (${GXX_VERSION} STREQUAL ${CXX_VERSION})
#Lets actualy get a numerical version of gxx's version
STRING(REGEX REPLACE ".* ([0-9])\\.([0-9])\\.([0-9]).*" "\\1\\2\\3" CXX_VERSION ${CXX_VERSION})
#gcc 4.3 and above don't like the LL boost
if(${CXX_VERSION} GREATER 429)
add_definitions(-Wno-parentheses)
endif (${CXX_VERSION} GREATER 429)
# End of hacks.
add_definitions(
-DLL_LINUX=1
-D_REENTRANT
-fexceptions
-fno-math-errno
-fno-strict-aliasing
-fsigned-char
-g
-pthread
)
if (SERVER)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth-60")
if (EXISTS /etc/debian_version)
FILE(READ /etc/debian_version DEBIAN_VERSION)
else (EXISTS /etc/debian_version)
set(DEBIAN_VERSION "")
endif (EXISTS /etc/debian_version)
if (NOT DEBIAN_VERSION STREQUAL "3.1")
add_definitions(-DCTYPE_WORKAROUND)
endif (NOT DEBIAN_VERSION STREQUAL "3.1")
if (EXISTS /usr/lib/mysql4/mysql)
link_directories(/usr/lib/mysql4/mysql)
endif (EXISTS /usr/lib/mysql4/mysql)
add_definitions(
-msse2
-mfpmath=sse
)
endif (SERVER)
if (VIEWER)
add_definitions(-DAPPID=secondlife)
add_definitions(-fvisibility=hidden)
# don't catch SIGCHLD in our base application class for the viewer - some of our 3rd party libs may need their *own* SIGCHLD handler to work. Sigh! The viewer doesn't need to catch SIGCHLD anyway.
add_definitions(-DLL_IGNORE_SIGCHLD)
if (NOT STANDALONE)
# this stops us requiring a really recent glibc at runtime
add_definitions(-fno-stack-protector)
endif (NOT STANDALONE)
set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2} -march=pentium4 -mfpmath=sse -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
set(CMAKE_C_FLAGS_RELEASESSE2 "${CMAKE_C_FLAGS_RELEASESSE2} -march=pentium4 -mfpmath=sse -msse2 "${GCC_EXTRA_OPTIMIZATIONS})
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -march=pentium4 -mfpmath=sse -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} -march=pentium4 -mfpmath=sse -msse2 "${GCC_EXTRA_OPTIMIZATIONS})
endif (VIEWER)
set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
set(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS_RELEASE}")
set(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS_RELEASE}")
set(CMAKE_CXX_FLAGS_RELEASESSE2 "-O3 ${CMAKE_CXX_FLAGS_RELEASESSE2}")
set(CMAKE_C_FLAGS_RELEASESSE2 "-O3 ${CMAKE_C_FLAGS_RELEASESSE2}")
endif (LINUX)
if (DARWIN)
add_definitions(-DLL_DARWIN=1)
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")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch")
# 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_RELWITHDEBINFO "-O0 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -03 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2} -O3 -msse2 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
set(CMAKE_C_FLAGS_RELEASESSE2 "${CMAKE_C_FLAGS_RELEASESSE2} -03 -msse2 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
endif (DARWIN)
if (LINUX OR DARWIN)
set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-non-virtual-dtor -Woverloaded-virtual")
if (NOT GCC_DISABLE_FATAL_WARNINGS)
set(GCC_WARNINGS "${GCC_WARNINGS} -Werror")
endif (NOT GCC_DISABLE_FATAL_WARNINGS)
set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder")
set(CMAKE_C_FLAGS "${GCC_WARNINGS} ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${GCC_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}")
if (WORD_SIZE EQUAL 32)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
elseif (WORD_SIZE EQUAL 64)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
endif (WORD_SIZE EQUAL 32)
endif (LINUX OR DARWIN)
if (STANDALONE)
add_definitions(-DLL_STANDALONE=1)
if (LINUX AND ${ARCH} STREQUAL "i686")
add_definitions(-march=pentiumpro)
endif (LINUX AND ${ARCH} STREQUAL "i686")
else (STANDALONE)
set(${ARCH}_linux_INCLUDES
ELFIO
atk-1.0
glib-2.0
gstreamer-0.10
gtk-2.0
llfreetype2
pango-1.0
)
endif (STANDALONE)
if(1 EQUAL 1)
add_definitions(-DOPENSIM_RULES=1)
endif(1 EQUAL 1)
if(SERVER)
include_directories(${LIBS_PREBUILT_DIR}/include/havok)
endif(SERVER)
SET( CMAKE_EXE_LINKER_FLAGS_RELEASESSE2
"${CMAKE_EXE_LINKER_FLAGS_RELEASE}" CACHE STRING
"Flags used for linking binaries under SSE2 build."
FORCE )
SET( CMAKE_SHARED_LINKER_FLAGS_RELEASESSE2
"${CMAKE_SHARED_LINKER_FLAGS_RELEASE}" CACHE STRING
"Flags used by the shared libraries linker under SSE2 build."
FORCE )
MARK_AS_ADVANCED(
CMAKE_CXX_FLAGS_RELEASESSE2
CMAKE_C_FLAGS_RELEASESSE2
CMAKE_EXE_LINKER_FLAGS_RELEASESSE2
CMAKE_SHARED_LINKER_FLAGS_RELEASESSE2 )
# -*- cmake -*-
#
# Compilation options shared by all Second Life components.
include(Variables)
# Portable compilation flags.
set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1")
set(CMAKE_CXX_FLAGS_RELEASE
"-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG")
set(CMAKE_C_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE}")
set(CMAKE_CXX_FLAGS_RELEASESSE2
"-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG")
#llimage now requires this (?)
set(CMAKE_C_FLAGS_RELEASESSE2
"${CMAKE_CXX_FLAGS_RELEASESSE2}")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-DLL_RELEASE=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
# Don't bother with a MinSizeRel build.
set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;ReleaseSSE2;Debug" CACHE STRING
"Supported build types." FORCE)
# Platform-specific compilation flags.
if (WINDOWS)
# Don't build DLLs.
set(BUILD_SHARED_LIBS OFF)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd"
CACHE STRING "C++ compiler debug options" FORCE)
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
"${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP"
CACHE STRING "C++ compiler release-with-debug options" FORCE)
set(CMAKE_CXX_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /arch:SSE /fp:fast"
CACHE STRING "C++ compiler release options" FORCE)
set(CMAKE_C_FLAGS_RELEASE
"${CMAKE_C_FLAGS_RELEASE} ${LL_C_FLAGS} /O2 /Zi /MD /MP /arch:SSE /fp:fast"
CACHE STRING "C compiler release options" FORCE)
set(CMAKE_CXX_FLAGS_RELEASESSE2
"${CMAKE_CXX_FLAGS_RELEASESSE2} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /arch:SSE2 /fp:fast"
CACHE STRING "C++ compiler release-SSE2 options" FORCE)
set(CMAKE_C_FLAGS_RELEASESSE2
"${CMAKE_C_FLAGS_RELEASESSE2} ${LL_C_FLAGS} /O2 /Zi /MD /MP /arch:SSE2 /fp:fast"
CACHE STRING "C compiler release-SSE2 options" FORCE)
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LARGEADDRESSAWARE")
set(CMAKE_CXX_STANDARD_LIBRARIES "")
set(CMAKE_C_STANDARD_LIBRARIES "")
add_definitions(
/DLL_WINDOWS=1
/DUNICODE
/D_UNICODE
/GS
/TP
/W3
/c
/Zc:forScope
/nologo
/Oy-
)
if(MSVC80 OR MSVC90 OR MSVC10)
set(CMAKE_CXX_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
CACHE STRING "C++ compiler release options" FORCE)
set(CMAKE_CXX_FLAGS_RELEASESSE2
"${CMAKE_CXX_FLAGS_RELEASESSE2} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
CACHE STRING "C++ compiler release-SSE2 options" FORCE)
set(CMAKE_C_FLAGS_RELEASESSE2
"${CMAKE_CXX_FLAGS_RELEASESSE2} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
CACHE STRING "C compiler release-SSE2 options" FORCE)
add_definitions(
/Zc:wchar_t-
)
endif (MSVC80 OR MSVC90 OR MSVC10)
# Are we using the crummy Visual Studio KDU build workaround?
if (NOT VS_DISABLE_FATAL_WARNINGS)
add_definitions(/WX)
endif (NOT VS_DISABLE_FATAL_WARNINGS)
# Various libs are compiler specific, generate some variables here we can just use
# when we require them instead of reimplementing the test each time.
if (MSVC71)
set(MSVC_DIR 7.1)
set(MSVC_SUFFIX 71)
elseif (MSVC80)
set(MSVC_DIR 8.0)
set(MSVC_SUFFIX 80)
elseif (MSVC90)
set(MSVC_DIR 9.0)
set(MSVC_SUFFIX 90)
elseif (MSVC10)
set(MSVC_DIR 10.0)
set(MSVC_SUFFIX 100)
endif (MSVC71)
endif (WINDOWS)
set (GCC_EXTRA_OPTIMIZATION "-ffast-math -frounding-math")
if (LINUX)
set(CMAKE_SKIP_RPATH TRUE)
# Here's a giant hack for Fedora 8, where we can't use
# _FORTIFY_SOURCE if we're using a compiler older than gcc 4.1.
find_program(GXX g++)
mark_as_advanced(GXX)
if (GXX)
execute_process(
COMMAND ${GXX} --version
COMMAND sed "s/^[gc+ ]*//"
COMMAND head -1
OUTPUT_VARIABLE GXX_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
else (GXX)
set(GXX_VERSION x)
endif (GXX)
# The quoting hack here is necessary in case we're using distcc or
# ccache as our compiler. CMake doesn't pass the command line
# through the shell by default, so we end up trying to run "distcc"
# " g++" - notice the leading space. Ugh.
execute_process(
COMMAND sh -c "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} --version"
COMMAND sed "s/^[gc+ ]*//"
COMMAND head -1
OUTPUT_VARIABLE CXX_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)
if (${GXX_VERSION} STREQUAL ${CXX_VERSION})
add_definitions(-D_FORTIFY_SOURCE=2)
else (${GXX_VERSION} STREQUAL ${CXX_VERSION})
if (NOT ${GXX_VERSION} MATCHES " 4.1.*Red Hat")
add_definitions(-D_FORTIFY_SOURCE=2)
endif (NOT ${GXX_VERSION} MATCHES " 4.1.*Red Hat")
endif (${GXX_VERSION} STREQUAL ${CXX_VERSION})
#Lets actualy get a numerical version of gxx's version
STRING(REGEX REPLACE ".* ([0-9])\\.([0-9])\\.([0-9]).*" "\\1\\2\\3" CXX_VERSION ${CXX_VERSION})
#gcc 4.3 and above don't like the LL boost
if(${CXX_VERSION} GREATER 429)
add_definitions(-Wno-parentheses)
endif (${CXX_VERSION} GREATER 429)
# End of hacks.
add_definitions(
-DLL_LINUX=1
-D_REENTRANT
-fexceptions
-fno-math-errno
-fno-strict-aliasing
-fsigned-char
-g
-pthread
)
if (SERVER)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth-60")
if (EXISTS /etc/debian_version)
FILE(READ /etc/debian_version DEBIAN_VERSION)
else (EXISTS /etc/debian_version)
set(DEBIAN_VERSION "")
endif (EXISTS /etc/debian_version)
if (NOT DEBIAN_VERSION STREQUAL "3.1")
add_definitions(-DCTYPE_WORKAROUND)
endif (NOT DEBIAN_VERSION STREQUAL "3.1")
if (EXISTS /usr/lib/mysql4/mysql)
link_directories(/usr/lib/mysql4/mysql)
endif (EXISTS /usr/lib/mysql4/mysql)
add_definitions(
-msse2
-mfpmath=sse
)
endif (SERVER)
if (VIEWER)
add_definitions(-DAPPID=secondlife)
add_definitions(-fvisibility=hidden)
# don't catch SIGCHLD in our base application class for the viewer - some of our 3rd party libs may need their *own* SIGCHLD handler to work. Sigh! The viewer doesn't need to catch SIGCHLD anyway.
add_definitions(-DLL_IGNORE_SIGCHLD)
if (NOT STANDALONE)
# this stops us requiring a really recent glibc at runtime
add_definitions(-fno-stack-protector)
endif (NOT STANDALONE)
set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2} -march=pentium4 -mfpmath=sse -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
set(CMAKE_C_FLAGS_RELEASESSE2 "${CMAKE_C_FLAGS_RELEASESSE2} -march=pentium4 -mfpmath=sse -msse2 "${GCC_EXTRA_OPTIMIZATIONS})
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -march=pentium4 -mfpmath=sse -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} -march=pentium4 -mfpmath=sse -msse2 "${GCC_EXTRA_OPTIMIZATIONS})
endif (VIEWER)
set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
set(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS_RELEASE}")
set(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS_RELEASE}")
set(CMAKE_CXX_FLAGS_RELEASESSE2 "-O3 ${CMAKE_CXX_FLAGS_RELEASESSE2}")
set(CMAKE_C_FLAGS_RELEASESSE2 "-O3 ${CMAKE_C_FLAGS_RELEASESSE2}")
endif (LINUX)
if (DARWIN)
add_definitions(-DLL_DARWIN=1)
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")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch")
# 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_RELWITHDEBINFO "-O0 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -03 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2} -O3 -msse2 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
set(CMAKE_C_FLAGS_RELEASESSE2 "${CMAKE_C_FLAGS_RELEASESSE2} -03 -msse2 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
endif (DARWIN)
if (LINUX OR DARWIN)
set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-non-virtual-dtor -Woverloaded-virtual")
if (NOT GCC_DISABLE_FATAL_WARNINGS)
set(GCC_WARNINGS "${GCC_WARNINGS} -Werror")
endif (NOT GCC_DISABLE_FATAL_WARNINGS)
set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder")
set(CMAKE_C_FLAGS "${GCC_WARNINGS} ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${GCC_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}")
if (WORD_SIZE EQUAL 32)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
elseif (WORD_SIZE EQUAL 64)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
endif (WORD_SIZE EQUAL 32)
endif (LINUX OR DARWIN)
if (STANDALONE)
add_definitions(-DLL_STANDALONE=1)
if (LINUX AND ${ARCH} STREQUAL "i686")
add_definitions(-march=pentiumpro)
endif (LINUX AND ${ARCH} STREQUAL "i686")
else (STANDALONE)
set(${ARCH}_linux_INCLUDES
ELFIO
atk-1.0
glib-2.0
gstreamer-0.10
gtk-2.0
llfreetype2
pango-1.0
)
endif (STANDALONE)
if(1 EQUAL 1)
add_definitions(-DOPENSIM_RULES=1)
endif(1 EQUAL 1)
if(SERVER)
include_directories(${LIBS_PREBUILT_DIR}/include/havok)
endif(SERVER)
SET( CMAKE_EXE_LINKER_FLAGS_RELEASESSE2
"${CMAKE_EXE_LINKER_FLAGS_RELEASE}" CACHE STRING
"Flags used for linking binaries under SSE2 build."
FORCE )
SET( CMAKE_SHARED_LINKER_FLAGS_RELEASESSE2
"${CMAKE_SHARED_LINKER_FLAGS_RELEASE}" CACHE STRING
"Flags used by the shared libraries linker under SSE2 build."
FORCE )
MARK_AS_ADVANCED(
CMAKE_CXX_FLAGS_RELEASESSE2
CMAKE_C_FLAGS_RELEASESSE2
CMAKE_EXE_LINKER_FLAGS_RELEASESSE2
CMAKE_SHARED_LINKER_FLAGS_RELEASESSE2 )

118
indra/cmake/Boost.cmake
View File

@@ -1,59 +1,59 @@
# -*- cmake -*-
include(Prebuilt)
set(Boost_FIND_QUIETLY ON)
set(Boost_FIND_REQUIRED ON)
if (STANDALONE)
include(FindBoost)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
set(BOOST_REGEX_LIBRARY boost_regex-mt)
set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
set(BOOST_SYSTEM_LIBRARY boost_system-mt)
else (STANDALONE)
use_prebuilt_binary(boost)
set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
if (WINDOWS)
set(BOOST_VERSION 1_45)
# SNOW-788
# 00-Common.cmake alreay sets MSVC_SUFFIX to be correct for the VS we are using eg VC71, VC80, VC90 etc
# The precompiled boost libs for VC71 use a different suffix to VS80 and VS90
# This code should ensure the cmake rules are valid for any VS being used in future as long as the approprate
# boost libs are avaiable - RC.
if (MSVC71)
set(BOOST_OPTIM_SUFFIX mt-s)
set(BOOST_DEBUG_SUFFIX mt-sgd)
else (MSVC71)
set(BOOST_OPTIM_SUFFIX mt)
set(BOOST_DEBUG_SUFFIX mt-gd)
endif (MSVC71)
set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION}
debug libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION})
set(BOOST_REGEX_LIBRARY
optimized libboost_regex-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION}
debug libboost_regex-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION})
set(BOOST_SIGNALS_LIBRARY
optimized libboost_signals-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION}
debug libboost_signals-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION})
elseif (DARWIN)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
set(BOOST_REGEX_LIBRARY boost_regex-mt)
set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
set(BOOST_SYSTEM_LIBRARY boost_system-mt)
elseif (LINUX)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
set(BOOST_REGEX_LIBRARY boost_regex-mt)
set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
set(BOOST_SYSTEM_LIBRARY boost_system-mt)
endif (WINDOWS)
endif (STANDALONE)
# -*- cmake -*-
include(Prebuilt)
set(Boost_FIND_QUIETLY ON)
set(Boost_FIND_REQUIRED ON)
if (STANDALONE)
include(FindBoost)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
set(BOOST_REGEX_LIBRARY boost_regex-mt)
set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
set(BOOST_SYSTEM_LIBRARY boost_system-mt)
else (STANDALONE)
use_prebuilt_binary(boost)
set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
if (WINDOWS)
set(BOOST_VERSION 1_45)
# SNOW-788
# 00-Common.cmake alreay sets MSVC_SUFFIX to be correct for the VS we are using eg VC71, VC80, VC90 etc
# The precompiled boost libs for VC71 use a different suffix to VS80 and VS90
# This code should ensure the cmake rules are valid for any VS being used in future as long as the approprate
# boost libs are avaiable - RC.
if (MSVC71)
set(BOOST_OPTIM_SUFFIX mt-s)
set(BOOST_DEBUG_SUFFIX mt-sgd)
else (MSVC71)
set(BOOST_OPTIM_SUFFIX mt)
set(BOOST_DEBUG_SUFFIX mt-gd)
endif (MSVC71)
set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION}
debug libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION})
set(BOOST_REGEX_LIBRARY
optimized libboost_regex-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION}
debug libboost_regex-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION})
set(BOOST_SIGNALS_LIBRARY
optimized libboost_signals-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION}
debug libboost_signals-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION})
elseif (DARWIN)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
set(BOOST_REGEX_LIBRARY boost_regex-mt)
set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
set(BOOST_SYSTEM_LIBRARY boost_system-mt)
elseif (LINUX)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
set(BOOST_REGEX_LIBRARY boost_regex-mt)
set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
set(BOOST_SYSTEM_LIBRARY boost_system-mt)
endif (WINDOWS)
endif (STANDALONE)

978
indra/cmake/CopyWinLibs.cmake
View File

@@ -1,489 +1,489 @@
# -*- cmake -*-
# The copy_win_libs folder contains file lists and a script used to
# copy dlls, exes and such needed to run the SecondLife from within
# VisualStudio.
include(CMakeCopyIfDifferent)
set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
set(vivox_files
SLVoice.exe
alut.dll
vivoxsdk.dll
ortp.dll
wrap_oal.dll
)
copy_if_different(
${vivox_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/Debug"
out_targets
${vivox_files}
)
set(all_targets ${all_targets} ${out_targets})
set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
set(debug_files
libhunspell.dll
libapr-1.dll
libaprutil-1.dll
libapriconv-1.dll
)
copy_if_different(
${debug_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/Debug"
out_targets
${debug_files}
)
set(all_targets ${all_targets} ${out_targets})
# Debug config runtime files required for the plugin test mule
set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
set(plugintest_debug_files
libeay32.dll
libglib-2.0-0.dll
libgmodule-2.0-0.dll
libgobject-2.0-0.dll
libgthread-2.0-0.dll
qtcored4.dll
qtguid4.dll
qtnetworkd4.dll
qtopengld4.dll
qtwebkitd4.dll
ssleay32.dll
)
copy_if_different(
${plugintest_debug_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Debug"
out_targets
${plugintest_debug_files}
)
set(all_targets ${all_targets} ${out_targets})
# Debug config runtime files required for the plugin test mule (Qt image format plugins)
set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/imageformats")
set(plugintest_debug_files
qgifd4.dll
qicod4.dll
qjpegd4.dll
qmngd4.dll
qsvgd4.dll
qtiffd4.dll
)
copy_if_different(
${plugintest_debug_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Debug/imageformats"
out_targets
${plugintest_debug_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugintest_debug_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/llplugin/imageformats"
out_targets
${plugintest_debug_files}
)
set(all_targets ${all_targets} ${out_targets})
# Release & ReleaseDebInfo config runtime files required for the plugin test mule
set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
set(plugintest_release_files
libeay32.dll
libglib-2.0-0.dll
libgmodule-2.0-0.dll
libgobject-2.0-0.dll
libgthread-2.0-0.dll
# llkdu.dll (not required for plugin test)
qtcore4.dll
qtgui4.dll
qtnetwork4.dll
qtopengl4.dll
qtwebkit4.dll
ssleay32.dll
)
copy_if_different(
${plugintest_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Release"
out_targets
${plugintest_release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugintest_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/ReleaseSSE2"
out_targets
${plugintest_release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugintest_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo"
out_targets
${plugintest_release_files}
)
set(all_targets ${all_targets} ${out_targets})
# Release & ReleaseDebInfo config runtime files required for the plugin test mule (Qt image format plugins)
set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/imageformats")
set(plugintest_release_files
qgif4.dll
qico4.dll
qjpeg4.dll
qmng4.dll
qsvg4.dll
qtiff4.dll
)
copy_if_different(
${plugintest_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Release/imageformats"
out_targets
${plugintest_release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugintest_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/ReleaseSSE2/imageformats"
out_targets
${plugintest_release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugintest_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo/imageformats"
out_targets
${plugintest_release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugintest_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/Release/llplugin/imageformats"
out_targets
${plugintest_release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugintest_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/llplugin/imageformats"
out_targets
${plugintest_release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugintest_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin/imageformats"
out_targets
${plugintest_release_files}
)
set(all_targets ${all_targets} ${out_targets})
# Debug config runtime files required for the plugins
set(plugins_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
set(plugins_debug_files
libeay32.dll
qtcored4.dll
qtguid4.dll
qtnetworkd4.dll
qtopengld4.dll
qtwebkitd4.dll
ssleay32.dll
)
copy_if_different(
${plugins_debug_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/Debug/llplugin"
out_targets
${plugins_debug_files}
)
set(all_targets ${all_targets} ${out_targets})
# Release & ReleaseDebInfo config runtime files required for the plugins
set(plugins_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
set(plugins_release_files
libeay32.dll
qtcore4.dll
qtgui4.dll
qtnetwork4.dll
qtopengl4.dll
qtwebkit4.dll
ssleay32.dll
)
copy_if_different(
${plugins_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/Release/llplugin"
out_targets
${plugins_release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugins_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/llplugin"
out_targets
${plugins_release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugins_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin"
out_targets
${plugins_release_files}
)
set(all_targets ${all_targets} ${out_targets})
set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
set(release_files
libtcmalloc_minimal.dll
fmod.dll
libhunspell.dll
libapr-1.dll
libaprutil-1.dll
libapriconv-1.dll
)
copy_if_different(
${release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/Release"
out_targets
${release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${vivox_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/Release"
out_targets
${vivox_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2"
out_targets
${release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${vivox_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2"
out_targets
${vivox_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
out_targets
${release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${vivox_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
out_targets
${vivox_files}
)
set(all_targets ${all_targets} ${out_targets})
set(internal_llkdu_path "${CMAKE_SOURCE_DIR}/llkdu")
if(EXISTS ${internal_llkdu_path})
set(internal_llkdu_src "${CMAKE_BINARY_DIR}/llkdu/${CMAKE_CFG_INTDIR}/llkdu.dll")
set(llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llkdu.dll")
ADD_CUSTOM_COMMAND(
OUTPUT ${llkdu_dst}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${internal_llkdu_src} ${llkdu_dst}
DEPENDS ${internal_llkdu_src}
COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
)
set(all_targets ${all_targets} ${llkdu_dst})
else(EXISTS ${internal_llkdu_path})
if (EXISTS "${debug_src_dir}/llkdu.dll")
set(debug_llkdu_src "${debug_src_dir}/llkdu.dll")
set(debug_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Debug/llkdu.dll")
ADD_CUSTOM_COMMAND(
OUTPUT ${debug_llkdu_dst}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${debug_llkdu_src} ${debug_llkdu_dst}
DEPENDS ${debug_llkdu_src}
COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Debug"
)
set(all_targets ${all_targets} ${debug_llkdu_dst})
endif (EXISTS "${debug_src_dir}/llkdu.dll")
if (EXISTS "${release_src_dir}/llkdu.dll")
set(release_llkdu_src "${release_src_dir}/llkdu.dll")
set(release_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Release/llkdu.dll")
ADD_CUSTOM_COMMAND(
OUTPUT ${release_llkdu_dst}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${release_llkdu_dst}
DEPENDS ${release_llkdu_src}
COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Release"
)
set(all_targets ${all_targets} ${release_llkdu_dst})
set(releasesse2_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/llkdu.dll")
ADD_CUSTOM_COMMAND(
OUTPUT ${releasesse2_llkdu_dst}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${releasesse2_llkdu_dst}
DEPENDS ${release_llkdu_src}
COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2"
)
set(all_targets ${all_targets} ${releasesse2_llkdu_dst})
set(relwithdebinfo_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llkdu.dll")
ADD_CUSTOM_COMMAND(
OUTPUT ${relwithdebinfo_llkdu_dst}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${relwithdebinfo_llkdu_dst}
DEPENDS ${release_llkdu_src}
COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
)
set(all_targets ${all_targets} ${relwithdebinfo_llkdu_dst})
endif (EXISTS "${release_src_dir}/llkdu.dll")
endif (EXISTS ${internal_llkdu_path})
# Copy MS C runtime dlls, required for packaging.
# *TODO - Adapt this to support VC9
if (MSVC80)
FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
NO_DEFAULT_PATH
NO_DEFAULT_PATH
)
if(EXISTS ${debug_msvc8_redist_path})
set(debug_msvc8_files
msvcr80d.dll
msvcp80d.dll
Microsoft.VC80.DebugCRT.manifest
)
copy_if_different(
${debug_msvc8_redist_path}
"${CMAKE_CURRENT_BINARY_DIR}/Debug"
out_targets
${debug_msvc8_files}
)
set(all_targets ${all_targets} ${out_targets})
set(debug_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Debug/${VIEWER_BINARY_NAME}.exe.config)
add_custom_command(
OUTPUT ${debug_appconfig_file}
COMMAND ${PYTHON_EXECUTABLE}
ARGS
${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
${CMAKE_CURRENT_SOURCE_DIR}/SecondLifeDebug.exe.config
${debug_appconfig_file}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
COMMENT "Creating debug app config file"
)
endif (EXISTS ${debug_msvc8_redist_path})
FIND_PATH(release_msvc8_redist_path msvcr80.dll
PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
NO_DEFAULT_PATH
NO_DEFAULT_PATH
)
if(EXISTS ${release_msvc8_redist_path})
set(release_msvc8_files
msvcr80.dll
msvcp80.dll
Microsoft.VC80.CRT.manifest
)
copy_if_different(
${release_msvc8_redist_path}
"${CMAKE_CURRENT_BINARY_DIR}/Release"
out_targets
${release_msvc8_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${release_msvc8_redist_path}
"${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2"
out_targets
${release_msvc8_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${release_msvc8_redist_path}
"${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
out_targets
${release_msvc8_files}
)
set(all_targets ${all_targets} ${out_targets})
set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config)
add_custom_command(
OUTPUT ${release_appconfig_file}
COMMAND ${PYTHON_EXECUTABLE}
ARGS
${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config
${release_appconfig_file}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
COMMENT "Creating release app config file"
)
set(releasesse2_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/${VIEWER_BINARY_NAME}.exe.config)
add_custom_command(
OUTPUT ${releasesse2_appconfig_file}
COMMAND ${PYTHON_EXECUTABLE}
ARGS
${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest
${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config
${releasesse2_appconfig_file}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest
COMMENT "Creating release-sse2 app config file"
)
set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config)
add_custom_command(
OUTPUT ${relwithdebinfo_appconfig_file}
COMMAND ${PYTHON_EXECUTABLE}
ARGS
${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config
${relwithdebinfo_appconfig_file}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
COMMENT "Creating relwithdebinfo app config file"
)
endif (EXISTS ${release_msvc8_redist_path})
endif (MSVC80)
add_custom_target(copy_win_libs ALL
DEPENDS
${all_targets}
${release_appconfig_file}
${releasesse2_appconfig_file}
${relwithdebinfo_appconfig_file}
${debug_appconfig_file}
)
add_dependencies(copy_win_libs prepare)
if(EXISTS ${internal_llkdu_path})
add_dependencies(copy_win_libs llkdu)
endif(EXISTS ${internal_llkdu_path})
# -*- cmake -*-
# The copy_win_libs folder contains file lists and a script used to
# copy dlls, exes and such needed to run the SecondLife from within
# VisualStudio.
include(CMakeCopyIfDifferent)
set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
set(vivox_files
SLVoice.exe
alut.dll
vivoxsdk.dll
ortp.dll
wrap_oal.dll
)
copy_if_different(
${vivox_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/Debug"
out_targets
${vivox_files}
)
set(all_targets ${all_targets} ${out_targets})
set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
set(debug_files
libhunspell.dll
libapr-1.dll
libaprutil-1.dll
libapriconv-1.dll
)
copy_if_different(
${debug_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/Debug"
out_targets
${debug_files}
)
set(all_targets ${all_targets} ${out_targets})
# Debug config runtime files required for the plugin test mule
set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
set(plugintest_debug_files
libeay32.dll
libglib-2.0-0.dll
libgmodule-2.0-0.dll
libgobject-2.0-0.dll
libgthread-2.0-0.dll
qtcored4.dll
qtguid4.dll
qtnetworkd4.dll
qtopengld4.dll
qtwebkitd4.dll
ssleay32.dll
)
copy_if_different(
${plugintest_debug_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Debug"
out_targets
${plugintest_debug_files}
)
set(all_targets ${all_targets} ${out_targets})
# Debug config runtime files required for the plugin test mule (Qt image format plugins)
set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/imageformats")
set(plugintest_debug_files
qgifd4.dll
qicod4.dll
qjpegd4.dll
qmngd4.dll
qsvgd4.dll
qtiffd4.dll
)
copy_if_different(
${plugintest_debug_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Debug/imageformats"
out_targets
${plugintest_debug_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugintest_debug_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/llplugin/imageformats"
out_targets
${plugintest_debug_files}
)
set(all_targets ${all_targets} ${out_targets})
# Release & ReleaseDebInfo config runtime files required for the plugin test mule
set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
set(plugintest_release_files
libeay32.dll
libglib-2.0-0.dll
libgmodule-2.0-0.dll
libgobject-2.0-0.dll
libgthread-2.0-0.dll
# llkdu.dll (not required for plugin test)
qtcore4.dll
qtgui4.dll
qtnetwork4.dll
qtopengl4.dll
qtwebkit4.dll
ssleay32.dll
)
copy_if_different(
${plugintest_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Release"
out_targets
${plugintest_release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugintest_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/ReleaseSSE2"
out_targets
${plugintest_release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugintest_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo"
out_targets
${plugintest_release_files}
)
set(all_targets ${all_targets} ${out_targets})
# Release & ReleaseDebInfo config runtime files required for the plugin test mule (Qt image format plugins)
set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/imageformats")
set(plugintest_release_files
qgif4.dll
qico4.dll
qjpeg4.dll
qmng4.dll
qsvg4.dll
qtiff4.dll
)
copy_if_different(
${plugintest_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Release/imageformats"
out_targets
${plugintest_release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugintest_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/ReleaseSSE2/imageformats"
out_targets
${plugintest_release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugintest_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo/imageformats"
out_targets
${plugintest_release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugintest_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/Release/llplugin/imageformats"
out_targets
${plugintest_release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugintest_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/llplugin/imageformats"
out_targets
${plugintest_release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugintest_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin/imageformats"
out_targets
${plugintest_release_files}
)
set(all_targets ${all_targets} ${out_targets})
# Debug config runtime files required for the plugins
set(plugins_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
set(plugins_debug_files
libeay32.dll
qtcored4.dll
qtguid4.dll
qtnetworkd4.dll
qtopengld4.dll
qtwebkitd4.dll
ssleay32.dll
)
copy_if_different(
${plugins_debug_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/Debug/llplugin"
out_targets
${plugins_debug_files}
)
set(all_targets ${all_targets} ${out_targets})
# Release & ReleaseDebInfo config runtime files required for the plugins
set(plugins_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
set(plugins_release_files
libeay32.dll
qtcore4.dll
qtgui4.dll
qtnetwork4.dll
qtopengl4.dll
qtwebkit4.dll
ssleay32.dll
)
copy_if_different(
${plugins_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/Release/llplugin"
out_targets
${plugins_release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugins_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/llplugin"
out_targets
${plugins_release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${plugins_release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin"
out_targets
${plugins_release_files}
)
set(all_targets ${all_targets} ${out_targets})
set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
set(release_files
libtcmalloc_minimal.dll
fmod.dll
libhunspell.dll
libapr-1.dll
libaprutil-1.dll
libapriconv-1.dll
)
copy_if_different(
${release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/Release"
out_targets
${release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${vivox_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/Release"
out_targets
${vivox_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2"
out_targets
${release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${vivox_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2"
out_targets
${vivox_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${release_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
out_targets
${release_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${vivox_src_dir}
"${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
out_targets
${vivox_files}
)
set(all_targets ${all_targets} ${out_targets})
set(internal_llkdu_path "${CMAKE_SOURCE_DIR}/llkdu")
if(EXISTS ${internal_llkdu_path})
set(internal_llkdu_src "${CMAKE_BINARY_DIR}/llkdu/${CMAKE_CFG_INTDIR}/llkdu.dll")
set(llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llkdu.dll")
ADD_CUSTOM_COMMAND(
OUTPUT ${llkdu_dst}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${internal_llkdu_src} ${llkdu_dst}
DEPENDS ${internal_llkdu_src}
COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
)
set(all_targets ${all_targets} ${llkdu_dst})
else(EXISTS ${internal_llkdu_path})
if (EXISTS "${debug_src_dir}/llkdu.dll")
set(debug_llkdu_src "${debug_src_dir}/llkdu.dll")
set(debug_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Debug/llkdu.dll")
ADD_CUSTOM_COMMAND(
OUTPUT ${debug_llkdu_dst}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${debug_llkdu_src} ${debug_llkdu_dst}
DEPENDS ${debug_llkdu_src}
COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Debug"
)
set(all_targets ${all_targets} ${debug_llkdu_dst})
endif (EXISTS "${debug_src_dir}/llkdu.dll")
if (EXISTS "${release_src_dir}/llkdu.dll")
set(release_llkdu_src "${release_src_dir}/llkdu.dll")
set(release_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Release/llkdu.dll")
ADD_CUSTOM_COMMAND(
OUTPUT ${release_llkdu_dst}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${release_llkdu_dst}
DEPENDS ${release_llkdu_src}
COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Release"
)
set(all_targets ${all_targets} ${release_llkdu_dst})
set(releasesse2_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/llkdu.dll")
ADD_CUSTOM_COMMAND(
OUTPUT ${releasesse2_llkdu_dst}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${releasesse2_llkdu_dst}
DEPENDS ${release_llkdu_src}
COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2"
)
set(all_targets ${all_targets} ${releasesse2_llkdu_dst})
set(relwithdebinfo_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llkdu.dll")
ADD_CUSTOM_COMMAND(
OUTPUT ${relwithdebinfo_llkdu_dst}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${relwithdebinfo_llkdu_dst}
DEPENDS ${release_llkdu_src}
COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
)
set(all_targets ${all_targets} ${relwithdebinfo_llkdu_dst})
endif (EXISTS "${release_src_dir}/llkdu.dll")
endif (EXISTS ${internal_llkdu_path})
# Copy MS C runtime dlls, required for packaging.
# *TODO - Adapt this to support VC9
if (MSVC80)
FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
NO_DEFAULT_PATH
NO_DEFAULT_PATH
)
if(EXISTS ${debug_msvc8_redist_path})
set(debug_msvc8_files
msvcr80d.dll
msvcp80d.dll
Microsoft.VC80.DebugCRT.manifest
)
copy_if_different(
${debug_msvc8_redist_path}
"${CMAKE_CURRENT_BINARY_DIR}/Debug"
out_targets
${debug_msvc8_files}
)
set(all_targets ${all_targets} ${out_targets})
set(debug_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Debug/${VIEWER_BINARY_NAME}.exe.config)
add_custom_command(
OUTPUT ${debug_appconfig_file}
COMMAND ${PYTHON_EXECUTABLE}
ARGS
${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
${CMAKE_CURRENT_SOURCE_DIR}/SecondLifeDebug.exe.config
${debug_appconfig_file}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
COMMENT "Creating debug app config file"
)
endif (EXISTS ${debug_msvc8_redist_path})
FIND_PATH(release_msvc8_redist_path msvcr80.dll
PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
NO_DEFAULT_PATH
NO_DEFAULT_PATH
)
if(EXISTS ${release_msvc8_redist_path})
set(release_msvc8_files
msvcr80.dll
msvcp80.dll
Microsoft.VC80.CRT.manifest
)
copy_if_different(
${release_msvc8_redist_path}
"${CMAKE_CURRENT_BINARY_DIR}/Release"
out_targets
${release_msvc8_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${release_msvc8_redist_path}
"${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2"
out_targets
${release_msvc8_files}
)
set(all_targets ${all_targets} ${out_targets})
copy_if_different(
${release_msvc8_redist_path}
"${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
out_targets
${release_msvc8_files}
)
set(all_targets ${all_targets} ${out_targets})
set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config)
add_custom_command(
OUTPUT ${release_appconfig_file}
COMMAND ${PYTHON_EXECUTABLE}
ARGS
${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config
${release_appconfig_file}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
COMMENT "Creating release app config file"
)
set(releasesse2_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/${VIEWER_BINARY_NAME}.exe.config)
add_custom_command(
OUTPUT ${releasesse2_appconfig_file}
COMMAND ${PYTHON_EXECUTABLE}
ARGS
${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest
${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config
${releasesse2_appconfig_file}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest
COMMENT "Creating release-sse2 app config file"
)
set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config)
add_custom_command(
OUTPUT ${relwithdebinfo_appconfig_file}
COMMAND ${PYTHON_EXECUTABLE}
ARGS
${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config
${relwithdebinfo_appconfig_file}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
COMMENT "Creating relwithdebinfo app config file"
)
endif (EXISTS ${release_msvc8_redist_path})
endif (MSVC80)
add_custom_target(copy_win_libs ALL
DEPENDS
${all_targets}
${release_appconfig_file}
${releasesse2_appconfig_file}
${relwithdebinfo_appconfig_file}
${debug_appconfig_file}
)
add_dependencies(copy_win_libs prepare)
if(EXISTS ${internal_llkdu_path})
add_dependencies(copy_win_libs llkdu)
endif(EXISTS ${internal_llkdu_path})

62
indra/cmake/FindLLQtWebkit.cmake Normal file
View File

@@ -0,0 +1,62 @@
# -*- cmake -*-
# - Find llqtwebkit
# Find the llqtwebkit includes and library
# This module defines
# LLQTWEBKIT_INCLUDE_DIR, where to find llqtwebkit.h, etc.
# LLQTWEBKIT_LIBRARY, the llqtwebkit library with full path.
# LLQTWEBKIT_FOUND, If false, do not try to use llqtwebkit.
# also defined, but not for general use are
# LLQTWEBKIT_LIBRARIES, the libraries needed to use llqtwebkit.
# LLQTWEBKIT_LIBRARY_DIRS, where to find the llqtwebkit library.
# LLQTWEBKIT_DEFINITIONS - You should add_definitions(${LLQTWEBKIT_DEFINITIONS})
# before compiling code that includes llqtwebkit library files.
# Try to use pkg-config first.
# This allows to have two different libllqtwebkit packages installed:
# one for viewer 2.x and one for viewer 1.x.
include(FindPkgConfig)
if (PKG_CONFIG_FOUND)
if (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION)
set(_PACKAGE_ARGS libllqtwebkit>=${LLQtWebkit_FIND_VERSION} REQUIRED)
else (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION)
set(_PACKAGE_ARGS libllqtwebkit)
endif (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION)
if (NOT "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_LESS "2.8")
# As virtually nobody will have a pkg-config file for this, do this check always quiet.
# Unfortunately cmake 2.8 or higher is required for pkg_check_modules to have a 'QUIET'.
set(_PACKAGE_ARGS ${_PACKAGE_ARGS} QUIET)
endif ()
pkg_check_modules(LLQTWEBKIT ${_PACKAGE_ARGS})
endif (PKG_CONFIG_FOUND)
set(LLQTWEBKIT_DEFINITIONS ${LLQTWEBKIT_CFLAGS_OTHER})
find_path(LLQTWEBKIT_INCLUDE_DIR llqtwebkit.h NO_SYSTEM_ENVIRONMENT_PATH HINTS ${LLQTWEBKIT_INCLUDE_DIRS})
find_library(LLQTWEBKIT_LIBRARY NAMES llqtwebkit NO_SYSTEM_ENVIRONMENT_PATH HINTS ${LLQTWEBKIT_LIBRARY_DIRS})
if (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND) # If pkg-config couldn't find it, pretend we don't have pkg-config.
set(LLQTWEBKIT_LIBRARIES llqtwebkit)
get_filename_component(LLQTWEBKIT_LIBRARY_DIRS ${LLQTWEBKIT_LIBRARY} PATH)
endif (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND)
# Handle the QUIETLY and REQUIRED arguments and set LLQTWEBKIT_FOUND
# to TRUE if all listed variables are TRUE.
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(
LLQTWEBKIT
DEFAULT_MSG
LLQTWEBKIT_LIBRARY
LLQTWEBKIT_INCLUDE_DIR
LLQTWEBKIT_LIBRARIES
LLQTWEBKIT_LIBRARY_DIRS
)
mark_as_advanced(
LLQTWEBKIT_LIBRARY
LLQTWEBKIT_INCLUDE_DIR
LLQTWEBKIT_LIBRARIES
LLQTWEBKIT_LIBRARY_DIRS
LLQTWEBKIT_DEFINITIONS
)

0
indra/cmake/FindZLIB.cmake → indra/cmake/FindMyZLIB.cmake
View File

100
indra/cmake/GooglePerfTools.cmake
View File

@@ -1,50 +1,50 @@
# -*- cmake -*-
include(Prebuilt)
if (STANDALONE)
include(FindGooglePerfTools)
else (STANDALONE)
if (LINUX OR WINDOWS)
use_prebuilt_binary(google)
endif (LINUX OR WINDOWS)
if (WINDOWS)
set(TCMALLOC_LIBRARIES libtcmalloc_minimal.lib)
set(TCMALLOC_LINKER_FLAGS "/INCLUDE:\"__tcmalloc\"")
endif (WINDOWS)
if (LINUX)
if(USE_GOOGLE_PERFTOOLS)
set(TCMALLOC_LIBRARIES tcmalloc)
set(STACKTRACE_LIBRARIES stacktrace)
set(PROFILER_LIBRARIES profiler)
else()
set(TCMALLOC_LIBRARIES tcmalloc_minimal)
endif()
set(GOOGLE_PERFTOOLS_INCLUDE_DIR
${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
set(GOOGLE_PERFTOOLS_FOUND "YES")
endif (LINUX)
endif (STANDALONE)
#if (GOOGLE_PERFTOOLS_FOUND)
# set(USE_GOOGLE_PERFTOOLS ON CACHE BOOL "Build with Google PerfTools support.")
#endif (GOOGLE_PERFTOOLS_FOUND)
# XXX Disable temporarily, until we have compilation issues on 64-bit
# Etch sorted.
#set(USE_GOOGLE_PERFTOOLS OFF)
if (USE_GOOGLE_PERFTOOLS)
set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1)
include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR})
set(GOOGLE_PERFTOOLS_LIBRARIES ${TCMALLOC_LIBRARIES} ${STACKTRACE_LIBRARIES} ${PROFILER_LIBRARIES})
else (USE_GOOGLE_PERFTOOLS)
set(TCMALLOC_FLAG -ULL_USE_TCMALLOC)
endif (USE_GOOGLE_PERFTOOLS)
if (NOT(DISABLE_TCMALLOC OR USE_GOOGLE_PERFTOOLS))
message(STATUS "Building with Google TCMalloc")
set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1_)
include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR})
set(GOOGLE_PERFTOOLS_LIBRARIES ${TCMALLOC_LIBRARIES})
set(GOOGLE_PERFTOOLS_LINKER_FLAGS ${TCMALLOC_LINKER_FLAGS})
endif()
# -*- cmake -*-
include(Prebuilt)
if (STANDALONE)
include(FindGooglePerfTools)
else (STANDALONE)
if (LINUX OR WINDOWS)
use_prebuilt_binary(google)
endif (LINUX OR WINDOWS)
if (WINDOWS)
set(TCMALLOC_LIBRARIES libtcmalloc_minimal.lib)
set(TCMALLOC_LINKER_FLAGS "/INCLUDE:\"__tcmalloc\"")
endif (WINDOWS)
if (LINUX)
if(USE_GOOGLE_PERFTOOLS)
set(TCMALLOC_LIBRARIES tcmalloc)
set(STACKTRACE_LIBRARIES stacktrace)
set(PROFILER_LIBRARIES profiler)
else()
set(TCMALLOC_LIBRARIES tcmalloc_minimal)
endif()
set(GOOGLE_PERFTOOLS_INCLUDE_DIR
${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
set(GOOGLE_PERFTOOLS_FOUND "YES")
endif (LINUX)
endif (STANDALONE)
#if (GOOGLE_PERFTOOLS_FOUND)
# set(USE_GOOGLE_PERFTOOLS ON CACHE BOOL "Build with Google PerfTools support.")
#endif (GOOGLE_PERFTOOLS_FOUND)
# XXX Disable temporarily, until we have compilation issues on 64-bit
# Etch sorted.
#set(USE_GOOGLE_PERFTOOLS OFF)
if (USE_GOOGLE_PERFTOOLS)
set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1)
include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR})
set(GOOGLE_PERFTOOLS_LIBRARIES ${TCMALLOC_LIBRARIES} ${STACKTRACE_LIBRARIES} ${PROFILER_LIBRARIES})
else (USE_GOOGLE_PERFTOOLS)
set(TCMALLOC_FLAG -ULL_USE_TCMALLOC)
endif (USE_GOOGLE_PERFTOOLS)
if (NOT(DISABLE_TCMALLOC OR USE_GOOGLE_PERFTOOLS))
message(STATUS "Building with Google TCMalloc")
set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1_)
include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR})
set(GOOGLE_PERFTOOLS_LIBRARIES ${TCMALLOC_LIBRARIES})
set(GOOGLE_PERFTOOLS_LINKER_FLAGS ${TCMALLOC_LINKER_FLAGS})
endif()

114
indra/cmake/Python.cmake
View File

@@ -1,57 +1,57 @@
# -*- cmake -*-
set(PYTHONINTERP_FOUND)
if (WINDOWS)
# On Windows, explicitly avoid Cygwin Python.
find_program(PYTHON_EXECUTABLE
NAMES python25.exe python23.exe python.exe
NO_DEFAULT_PATH # added so that cmake does not find cygwin python
PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
)
elseif (EXISTS /etc/debian_version)
# On Debian and Ubuntu, avoid Python 2.4 if possible.
find_program(PYTHON_EXECUTABLE python2.5 python2.3 python PATHS /usr/bin)
if (PYTHON_EXECUTABLE)
set(PYTHONINTERP_FOUND ON)
endif (PYTHON_EXECUTABLE)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# On MAC OS X be sure to search standard locations first
string(REPLACE ":" ";" PATH_LIST "$ENV{PATH}")
find_program(PYTHON_EXECUTABLE
NAMES python python25 python24 python23
NO_DEFAULT_PATH # Avoid searching non-standard locations first
PATHS
/bin
/usr/bin
/usr/local/bin
${PATH_LIST}
)
if (PYTHON_EXECUTABLE)
set(PYTHONINTERP_FOUND ON)
endif (PYTHON_EXECUTABLE)
else (WINDOWS)
include(FindPythonInterp)
endif (WINDOWS)
if (NOT PYTHON_EXECUTABLE)
message(FATAL_ERROR "No Python interpreter found")
endif (NOT PYTHON_EXECUTABLE)
mark_as_advanced(PYTHON_EXECUTABLE)
# -*- cmake -*-
set(PYTHONINTERP_FOUND)
if (WINDOWS)
# On Windows, explicitly avoid Cygwin Python.
find_program(PYTHON_EXECUTABLE
NAMES python25.exe python23.exe python.exe
NO_DEFAULT_PATH # added so that cmake does not find cygwin python
PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
)
elseif (EXISTS /etc/debian_version)
# On Debian and Ubuntu, avoid Python 2.4 if possible.
find_program(PYTHON_EXECUTABLE python2.5 python2.3 python PATHS /usr/bin)
if (PYTHON_EXECUTABLE)
set(PYTHONINTERP_FOUND ON)
endif (PYTHON_EXECUTABLE)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# On MAC OS X be sure to search standard locations first
string(REPLACE ":" ";" PATH_LIST "$ENV{PATH}")
find_program(PYTHON_EXECUTABLE
NAMES python python25 python24 python23
NO_DEFAULT_PATH # Avoid searching non-standard locations first
PATHS
/bin
/usr/bin
/usr/local/bin
${PATH_LIST}
)
if (PYTHON_EXECUTABLE)
set(PYTHONINTERP_FOUND ON)
endif (PYTHON_EXECUTABLE)
else (WINDOWS)
include(FindPythonInterp)
endif (WINDOWS)
if (NOT PYTHON_EXECUTABLE)
message(FATAL_ERROR "No Python interpreter found")
endif (NOT PYTHON_EXECUTABLE)
mark_as_advanced(PYTHON_EXECUTABLE)

2
indra/cmake/ZLIB.cmake
View File

@@ -6,7 +6,7 @@ set(ZLIB_FIND_REQUIRED ON)
include(Prebuilt)
if (STANDALONE)
include(FindZLIB)
include(FindMyZLIB)
else (STANDALONE)
use_prebuilt_binary(zlib)
if (WINDOWS)

428
indra/llcommon/CMakeLists.txt
View File

@@ -1,214 +1,214 @@
# -*- cmake -*-
project(llcommon)
include(00-Common)
include(LLCommon)
include(Linking)
include_directories(
${EXPAT_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
)
set(llcommon_SOURCE_FILES
imageids.cpp
indra_constants.cpp
llapp.cpp
llapr.cpp
llassettype.cpp
llavatarname.cpp
llbase32.cpp
llbase64.cpp
llcommon.cpp
llcommonutils.cpp
llcrc.cpp
llcriticaldamp.cpp
llcursortypes.cpp
lldate.cpp
lldictionary.cpp
llerror.cpp
llerrorthread.cpp
llevent.cpp
llfasttimer.cpp
llfile.cpp
llfindlocale.cpp
llfixedbuffer.cpp
llformat.cpp
llframetimer.cpp
llheartbeat.cpp
llindraconfigfile.cpp
llliveappconfig.cpp
lllivefile.cpp
lllog.cpp
llmd5.cpp
llmemory.cpp
llmemorystream.cpp
llmetrics.cpp
llmortician.cpp
lloptioninterface.cpp
llprocesslauncher.cpp
llprocessor.cpp
llqueuedthread.cpp
llrand.cpp
llrun.cpp
llsd.cpp
llsdserialize.cpp
llsdserialize_xml.cpp
llsdutil.cpp
llsecondlifeurls.cpp
llstat.cpp
llstreamtools.cpp
llstring.cpp
llstringtable.cpp
llsys.cpp
llthread.cpp
lltimer.cpp
lluri.cpp
lluuid.cpp
llworkerthread.cpp
metaclass.cpp
metaproperty.cpp
reflective.cpp
timing.cpp
u64.cpp
)
set(llcommon_HEADER_FILES
CMakeLists.txt
bitpack.h
ctype_workaround.h
doublelinkedlist.h
imageids.h
indra_constants.h
linden_common.h
linked_lists.h
llagentconstants.h
llapp.h
llapr.h
llassettype.h
llassoclist.h
llavatarconstants.h
llavatarname.h
llbase32.h
llbase64.h
llboost.h
llchat.h
llclickaction.h
llcommon.h
llcommonutils.h
llcrc.h
llcriticaldamp.h
llcursortypes.h
lldarray.h
lldarrayptr.h
lldate.h
lldefs.h
lldepthstack.h
lldictionary.h
lldlinked.h
lldqueueptr.h
llendianswizzle.h
llenum.h
llerror.h
llerrorcontrol.h
llerrorlegacy.h
llerrorthread.h
llevent.h
lleventemitter.h
llextendedstatus.h
llfasttimer.h
llfile.h
llfindlocale.h
llfixedbuffer.h
llformat.h
llframetimer.h
llhash.h
llheartbeat.h
llhttpstatuscodes.h
llindexedqueue.h
llindraconfigfile.h
llkeythrottle.h
lllinkedqueue.h
llliveappconfig.h
lllivefile.h
lllocalidhashmap.h
lllog.h
lllslconstants.h
llmap.h
llmd5.h
llmemory.h
llmemorystream.h
llmemtype.h
llmetrics.h
llmortician.h
llnametable.h
lloptioninterface.h
llpreprocessor.h
llpriqueuemap.h
llprocesslauncher.h
llprocessor.h
llptrskiplist.h
llptrskipmap.h
llqueuedthread.h
llrand.h
llrun.h
llsd.h
llsdserialize.h
llsdserialize_xml.h
llsdutil.h
llsecondlifeurls.h
llsimplehash.h
llskiplist.h
llskipmap.h
llstack.h
llstat.h
llstatenums.h
llstl.h
llstreamtools.h
llstrider.h
llstring.h
llstringtable.h
llsys.h
llthread.h
lltimer.h
lluri.h
lluuid.h
lluuidhashmap.h
llversionserver.h
llversionviewer.h
llworkerthread.h
metaclass.h
metaclasst.h
metaproperty.h
metapropertyt.h
processor.h
reflective.h
reflectivet.h
roles_constants.h
stdenums.h
stdtypes.h
string_table.h
timer.h
timing.h
u64.h
)
set_source_files_properties(${llcommon_HEADER_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE)
list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES})
add_library (llcommon ${llcommon_SOURCE_FILES})
add_dependencies(llcommon prepare)
target_link_libraries(
llcommon
${APRUTIL_LIBRARIES}
${APR_LIBRARIES}
${EXPAT_LIBRARIES}
${ZLIB_LIBRARIES}
${WINDOWS_LIBRARIES}
)
# -*- cmake -*-
project(llcommon)
include(00-Common)
include(LLCommon)
include(Linking)
include_directories(
${EXPAT_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
)
set(llcommon_SOURCE_FILES
imageids.cpp
indra_constants.cpp
llapp.cpp
llapr.cpp
llassettype.cpp
llavatarname.cpp
llbase32.cpp
llbase64.cpp
llcommon.cpp
llcommonutils.cpp
llcrc.cpp
llcriticaldamp.cpp
llcursortypes.cpp
lldate.cpp
lldictionary.cpp
llerror.cpp
llerrorthread.cpp
llevent.cpp
llfasttimer.cpp
llfile.cpp
llfindlocale.cpp
llfixedbuffer.cpp
llformat.cpp
llframetimer.cpp
llheartbeat.cpp
llindraconfigfile.cpp
llliveappconfig.cpp
lllivefile.cpp
lllog.cpp
llmd5.cpp
llmemory.cpp
llmemorystream.cpp
llmetrics.cpp
llmortician.cpp
lloptioninterface.cpp
llprocesslauncher.cpp
llprocessor.cpp
llqueuedthread.cpp
llrand.cpp
llrun.cpp
llsd.cpp
llsdserialize.cpp
llsdserialize_xml.cpp
llsdutil.cpp
llsecondlifeurls.cpp
llstat.cpp
llstreamtools.cpp
llstring.cpp
llstringtable.cpp
llsys.cpp
llthread.cpp
lltimer.cpp
lluri.cpp
lluuid.cpp
llworkerthread.cpp
metaclass.cpp
metaproperty.cpp
reflective.cpp
timing.cpp
u64.cpp
)
set(llcommon_HEADER_FILES
CMakeLists.txt
bitpack.h
ctype_workaround.h
doublelinkedlist.h
imageids.h
indra_constants.h
linden_common.h
linked_lists.h
llagentconstants.h
llapp.h
llapr.h
llassettype.h
llassoclist.h
llavatarconstants.h
llavatarname.h
llbase32.h
llbase64.h
llboost.h
llchat.h
llclickaction.h
llcommon.h
llcommonutils.h
llcrc.h
llcriticaldamp.h
llcursortypes.h
lldarray.h
lldarrayptr.h
lldate.h
lldefs.h
lldepthstack.h
lldictionary.h
lldlinked.h
lldqueueptr.h
llendianswizzle.h
llenum.h
llerror.h
llerrorcontrol.h
llerrorlegacy.h
llerrorthread.h
llevent.h
lleventemitter.h
llextendedstatus.h
llfasttimer.h
llfile.h
llfindlocale.h
llfixedbuffer.h
llformat.h
llframetimer.h
llhash.h
llheartbeat.h
llhttpstatuscodes.h
llindexedqueue.h
llindraconfigfile.h
llkeythrottle.h
lllinkedqueue.h
llliveappconfig.h
lllivefile.h
lllocalidhashmap.h
lllog.h
lllslconstants.h
llmap.h
llmd5.h
llmemory.h
llmemorystream.h
llmemtype.h
llmetrics.h
llmortician.h
llnametable.h
lloptioninterface.h
llpreprocessor.h
llpriqueuemap.h
llprocesslauncher.h
llprocessor.h
llptrskiplist.h
llptrskipmap.h
llqueuedthread.h
llrand.h
llrun.h
llsd.h
llsdserialize.h
llsdserialize_xml.h
llsdutil.h
llsecondlifeurls.h
llsimplehash.h
llskiplist.h
llskipmap.h
llstack.h
llstat.h
llstatenums.h
llstl.h
llstreamtools.h
llstrider.h
llstring.h
llstringtable.h
llsys.h
llthread.h
lltimer.h
lluri.h
lluuid.h
lluuidhashmap.h
llversionserver.h
llversionviewer.h
llworkerthread.h
metaclass.h
metaclasst.h
metaproperty.h
metapropertyt.h
processor.h
reflective.h
reflectivet.h
roles_constants.h
stdenums.h
stdtypes.h
string_table.h
timer.h
timing.h
u64.h
)
set_source_files_properties(${llcommon_HEADER_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE)
list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES})
add_library (llcommon ${llcommon_SOURCE_FILES})
add_dependencies(llcommon prepare)
target_link_libraries(
llcommon
${APRUTIL_LIBRARIES}
${APR_LIBRARIES}
${EXPAT_LIBRARIES}
${ZLIB_LIBRARIES}
${WINDOWS_LIBRARIES}
)

370
indra/llcommon/llpreprocessor.h
View File

@@ -1,185 +1,185 @@
/**
* @file llpreprocessor.h
* @brief This file should be included in all Linden Lab files and
* should only contain special preprocessor directives
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
*
* Copyright (c) 2001-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
#ifndef LLPREPROCESSOR_H
#define LLPREPROCESSOR_H
// Figure out endianness of platform
#ifdef LL_LINUX
#define __ENABLE_WSTRING
#include <endian.h>
#endif // LL_LINUX
#if LL_SOLARIS
# ifdef __sparc // Since we're talking Solaris 10 and up, only 64 bit is supported.
# define LL_BIG_ENDIAN 1
# define LL_SOLARIS_ALIGNED_CPU 1 // used to designate issues where SPARC alignment is addressed
# define LL_SOLARIS_NON_MESA_GL 1 // The SPARC GL does not provide a MESA-based GL API
# endif
# include <sys/isa_defs.h> // ensure we know which end is up
#endif // LL_SOLARIS
#if (defined(LL_WINDOWS) || (defined(LL_LINUX) && (__BYTE_ORDER == __LITTLE_ENDIAN)) || (defined(LL_DARWIN) && defined(__LITTLE_ENDIAN__)) || (defined(LL_SOLARIS) && defined(__i386)))
#define LL_LITTLE_ENDIAN 1
#else
#define LL_BIG_ENDIAN 1
#endif
// Per-compiler switches
#ifdef __GNUC__
#define LL_FORCE_INLINE inline __attribute__((always_inline))
#else
#define LL_FORCE_INLINE __forceinline
#endif
// Mark-up expressions with branch prediction hints. Do NOT use
// this with reckless abandon - it's an obfuscating micro-optimization
// outside of inner loops or other places where you are OVERWHELMINGLY
// sure which way an expression almost-always evaluates.
#if __GNUC__ >= 3
# define LL_LIKELY(EXPR) __builtin_expect (!!(EXPR), true)
# define LL_UNLIKELY(EXPR) __builtin_expect (!!(EXPR), false)
#else
# define LL_LIKELY(EXPR) (EXPR)
# define LL_UNLIKELY(EXPR) (EXPR)
#endif
// Figure out differences between compilers
#if defined(__GNUC__)
#define GCC_VERSION (__GNUC__ * 10000 \
+ __GNUC_MINOR__ * 100 \
+ __GNUC_PATCHLEVEL__)
#ifndef LL_GNUC
#define LL_GNUC 1
#endif
#elif defined(__MSVC_VER__) || defined(_MSC_VER)
#ifndef LL_MSVC
#define LL_MSVC 1
#endif
#if _MSC_VER < 1400
#define LL_MSVC7 //Visual C++ 2003 or earlier
#endif
#endif
// Deal with minor differences on Unixy OSes.
#if LL_DARWIN || LL_LINUX
// Different name, same functionality.
#define stricmp strcasecmp
#define strnicmp strncasecmp
// Not sure why this is different, but...
#ifndef MAX_PATH
#define MAX_PATH PATH_MAX
#endif // not MAX_PATH
#endif
// Static linking with apr on windows needs to be declared.
#ifdef LL_WINDOWS
#ifndef APR_DECLARE_STATIC
#define APR_DECLARE_STATIC // For APR on Windows
#endif
#ifndef APU_DECLARE_STATIC
#define APU_DECLARE_STATIC // For APR util on Windows
#endif
#endif
// Deal with the differeneces on Windows
#if defined(LL_WINDOWS)
#define BOOST_REGEX_NO_LIB 1
#define CURL_STATICLIB 1
#ifndef XML_STATIC
#define XML_STATIC
#endif
#endif // LL_WINDOWS
// Deal with VC6 problems
#if LL_MSVC
#pragma warning( 3 : 4701 ) // "local variable used without being initialized" Treat this as level 3, not level 4.
#pragma warning( 3 : 4702 ) // "unreachable code" Treat this as level 3, not level 4.
#pragma warning( 3 : 4189 ) // "local variable initialized but not referenced" Treat this as level 3, not level 4.
//#pragma warning( 3 : 4018 ) // "signed/unsigned mismatch" Treat this as level 3, not level 4.
#pragma warning( 3 : 4263 ) // 'function' : member function does not override any base class virtual member function
#pragma warning( 3 : 4264 ) // "'virtual_function' : no override available for virtual member function from base 'class'; function is hidden"
#pragma warning( 3 : 4265 ) // "class has virtual functions, but destructor is not virtual"
#pragma warning( 3 : 4266 ) // 'function' : no override available for virtual member function from base 'type'; function is hidden
#pragma warning (disable : 4180) // qualifier applied to function type has no meaning; ignored
#pragma warning( disable : 4284 ) // silly MS warning deep inside their <map> include file
#pragma warning( disable : 4503 ) // 'decorated name length exceeded, name was truncated'. Does not seem to affect compilation.
#pragma warning( disable : 4800 ) // 'BOOL' : forcing value to bool 'true' or 'false' (performance warning)
#pragma warning( disable : 4996 ) // warning: deprecated
// Linker optimization with "extern template" generates these warnings
#pragma warning( disable : 4231 ) // nonstandard extension used : 'extern' before template explicit instantiation
#pragma warning( disable : 4506 ) // no definition for inline function
// level 4 warnings that we need to disable:
#pragma warning (disable : 4100) // unreferenced formal parameter
#pragma warning (disable : 4127) // conditional expression is constant (e.g. while(1) )
#pragma warning (disable : 4244) // possible loss of data on conversions
#pragma warning (disable : 4396) // the inline specifier cannot be used when a friend declaration refers to a specialization of a function template
#pragma warning (disable : 4512) // assignment operator could not be generated
#pragma warning (disable : 4706) // assignment within conditional (even if((x = y)) )
#pragma warning (disable : 4251) // member needs to have dll-interface to be used by clients of class
#pragma warning (disable : 4275) // non dll-interface class used as base for dll-interface class
#endif // LL_MSVC
#if LL_WINDOWS
#define LL_DLLEXPORT __declspec(dllexport)
#define LL_DLLIMPORT __declspec(dllimport)
#elif LL_LINUX
#define LL_DLLEXPORT __attribute__ ((visibility("default")))
#define LL_DLLIMPORT
#else
#define LL_DLLEXPORT
#define LL_DLLIMPORT
#endif // LL_WINDOWS
/*
#ifdef llcommon_EXPORTS
// Compiling llcommon (shared)
#define LL_COMMON_API LL_DLLEXPORT
#else // llcommon_EXPORTS
// Using llcommon (shared)
#define LL_COMMON_API LL_DLLIMPORT
#endif // llcommon_EXPORTS
*/
//I hate DLLs -SG
#define LL_COMMON_API
#endif // not LL_LINDEN_PREPROCESSOR_H
/**
* @file llpreprocessor.h
* @brief This file should be included in all Linden Lab files and
* should only contain special preprocessor directives
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
*
* Copyright (c) 2001-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
#ifndef LLPREPROCESSOR_H
#define LLPREPROCESSOR_H
// Figure out endianness of platform
#ifdef LL_LINUX
#define __ENABLE_WSTRING
#include <endian.h>
#endif // LL_LINUX
#if LL_SOLARIS
# ifdef __sparc // Since we're talking Solaris 10 and up, only 64 bit is supported.
# define LL_BIG_ENDIAN 1
# define LL_SOLARIS_ALIGNED_CPU 1 // used to designate issues where SPARC alignment is addressed
# define LL_SOLARIS_NON_MESA_GL 1 // The SPARC GL does not provide a MESA-based GL API
# endif
# include <sys/isa_defs.h> // ensure we know which end is up
#endif // LL_SOLARIS
#if (defined(LL_WINDOWS) || (defined(LL_LINUX) && (__BYTE_ORDER == __LITTLE_ENDIAN)) || (defined(LL_DARWIN) && defined(__LITTLE_ENDIAN__)) || (defined(LL_SOLARIS) && defined(__i386)))
#define LL_LITTLE_ENDIAN 1
#else
#define LL_BIG_ENDIAN 1
#endif
// Per-compiler switches
#ifdef __GNUC__
#define LL_FORCE_INLINE inline __attribute__((always_inline))
#else
#define LL_FORCE_INLINE __forceinline
#endif
// Mark-up expressions with branch prediction hints. Do NOT use
// this with reckless abandon - it's an obfuscating micro-optimization
// outside of inner loops or other places where you are OVERWHELMINGLY
// sure which way an expression almost-always evaluates.
#if __GNUC__ >= 3
# define LL_LIKELY(EXPR) __builtin_expect (!!(EXPR), true)
# define LL_UNLIKELY(EXPR) __builtin_expect (!!(EXPR), false)
#else
# define LL_LIKELY(EXPR) (EXPR)
# define LL_UNLIKELY(EXPR) (EXPR)
#endif
// Figure out differences between compilers
#if defined(__GNUC__)
#define GCC_VERSION (__GNUC__ * 10000 \
+ __GNUC_MINOR__ * 100 \
+ __GNUC_PATCHLEVEL__)
#ifndef LL_GNUC
#define LL_GNUC 1
#endif
#elif defined(__MSVC_VER__) || defined(_MSC_VER)
#ifndef LL_MSVC
#define LL_MSVC 1
#endif
#if _MSC_VER < 1400
#define LL_MSVC7 //Visual C++ 2003 or earlier
#endif
#endif
// Deal with minor differences on Unixy OSes.
#if LL_DARWIN || LL_LINUX
// Different name, same functionality.
#define stricmp strcasecmp
#define strnicmp strncasecmp
// Not sure why this is different, but...
#ifndef MAX_PATH
#define MAX_PATH PATH_MAX
#endif // not MAX_PATH
#endif
// Static linking with apr on windows needs to be declared.
#ifdef LL_WINDOWS
#ifndef APR_DECLARE_STATIC
#define APR_DECLARE_STATIC // For APR on Windows
#endif
#ifndef APU_DECLARE_STATIC
#define APU_DECLARE_STATIC // For APR util on Windows
#endif
#endif
// Deal with the differeneces on Windows
#if defined(LL_WINDOWS)
#define BOOST_REGEX_NO_LIB 1
#define CURL_STATICLIB 1
#ifndef XML_STATIC
#define XML_STATIC
#endif
#endif // LL_WINDOWS
// Deal with VC6 problems
#if LL_MSVC
#pragma warning( 3 : 4701 ) // "local variable used without being initialized" Treat this as level 3, not level 4.
#pragma warning( 3 : 4702 ) // "unreachable code" Treat this as level 3, not level 4.
#pragma warning( 3 : 4189 ) // "local variable initialized but not referenced" Treat this as level 3, not level 4.
//#pragma warning( 3 : 4018 ) // "signed/unsigned mismatch" Treat this as level 3, not level 4.
#pragma warning( 3 : 4263 ) // 'function' : member function does not override any base class virtual member function
#pragma warning( 3 : 4264 ) // "'virtual_function' : no override available for virtual member function from base 'class'; function is hidden"
#pragma warning( 3 : 4265 ) // "class has virtual functions, but destructor is not virtual"
#pragma warning( 3 : 4266 ) // 'function' : no override available for virtual member function from base 'type'; function is hidden
#pragma warning (disable : 4180) // qualifier applied to function type has no meaning; ignored
#pragma warning( disable : 4284 ) // silly MS warning deep inside their <map> include file
#pragma warning( disable : 4503 ) // 'decorated name length exceeded, name was truncated'. Does not seem to affect compilation.
#pragma warning( disable : 4800 ) // 'BOOL' : forcing value to bool 'true' or 'false' (performance warning)
#pragma warning( disable : 4996 ) // warning: deprecated
// Linker optimization with "extern template" generates these warnings
#pragma warning( disable : 4231 ) // nonstandard extension used : 'extern' before template explicit instantiation
#pragma warning( disable : 4506 ) // no definition for inline function
// level 4 warnings that we need to disable:
#pragma warning (disable : 4100) // unreferenced formal parameter
#pragma warning (disable : 4127) // conditional expression is constant (e.g. while(1) )
#pragma warning (disable : 4244) // possible loss of data on conversions
#pragma warning (disable : 4396) // the inline specifier cannot be used when a friend declaration refers to a specialization of a function template
#pragma warning (disable : 4512) // assignment operator could not be generated
#pragma warning (disable : 4706) // assignment within conditional (even if((x = y)) )
#pragma warning (disable : 4251) // member needs to have dll-interface to be used by clients of class
#pragma warning (disable : 4275) // non dll-interface class used as base for dll-interface class
#endif // LL_MSVC
#if LL_WINDOWS
#define LL_DLLEXPORT __declspec(dllexport)
#define LL_DLLIMPORT __declspec(dllimport)
#elif LL_LINUX
#define LL_DLLEXPORT __attribute__ ((visibility("default")))
#define LL_DLLIMPORT
#else
#define LL_DLLEXPORT
#define LL_DLLIMPORT
#endif // LL_WINDOWS
/*
#ifdef llcommon_EXPORTS
// Compiling llcommon (shared)
#define LL_COMMON_API LL_DLLEXPORT
#else // llcommon_EXPORTS
// Using llcommon (shared)
#define LL_COMMON_API LL_DLLIMPORT
#endif // llcommon_EXPORTS
*/
//I hate DLLs -SG
#define LL_COMMON_API
#endif // not LL_LINDEN_PREPROCESSOR_H

94
indra/llcommon/llversionviewer.h
View File

@@ -1,47 +1,47 @@
/**
* @file llversionviewer.h
* @brief
*
* $LicenseInfo:firstyear=2002&license=viewergpl$
*
* Copyright (c) 2002-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
#ifndef LL_LLVERSIONVIEWER_H
#define LL_LLVERSIONVIEWER_H
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 5;
const S32 LL_VERSION_PATCH = 6;
const S32 LL_VERSION_BUILD = 1;
const char * const LL_CHANNEL = "Singularity";
#if LL_DARWIN
const char * const LL_VERSION_BUNDLE_ID = "com.secondlife.snowglobe.viewer";
#endif
#endif
/**
* @file llversionviewer.h
* @brief
*
* $LicenseInfo:firstyear=2002&license=viewergpl$
*
* Copyright (c) 2002-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
#ifndef LL_LLVERSIONVIEWER_H
#define LL_LLVERSIONVIEWER_H
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 5;
const S32 LL_VERSION_PATCH = 6;
const S32 LL_VERSION_BUILD = 1;
const char * const LL_CHANNEL = "Singularity";
#if LL_DARWIN
const char * const LL_VERSION_BUNDLE_ID = "com.secondlife.snowglobe.viewer";
#endif
#endif

16
indra/llmessage/llavatarnamecache.cpp
View File

@@ -334,14 +334,14 @@ void LLAvatarNameCache::processName(const LLUUID& agent_id,
{
if (add_to_cache)
{
// sCache[agent_id] = av_name;
// [SL:KB] - Patch: Agent-DisplayNames | Checked: 2010-12-28 (Catznip-2.4.0h) | Added: Catznip-2.4.0h
// Don't replace existing entries with dummies
cache_t::iterator itName = (av_name.mIsDummy) ? sCache.find(agent_id) : sCache.end();
if (sCache.end() != itName)
itName->second.mExpires = av_name.mExpires;
else
sCache[agent_id] = av_name;
// sCache[agent_id] = av_name;
// [SL:KB] - Patch: Agent-DisplayNames | Checked: 2010-12-28 (Catznip-2.4.0h) | Added: Catznip-2.4.0h
// Don't replace existing entries with dummies
cache_t::iterator itName = (av_name.mIsDummy) ? sCache.find(agent_id) : sCache.end();
if (sCache.end() != itName)
itName->second.mExpires = av_name.mExpires;
else
sCache[agent_id] = av_name;
// [/SL:KB]
}

296
indra/llmessage/llnetcanary.cpp
View File

@@ -1,149 +1,149 @@
// <edit>
#include "llnetcanary.h"
// <edit>
#include "llnetcanary.h"
#include "linden_common.h"
#include "llerror.h"
#ifdef _MSC_VER
#include <winsock2.h>
static WSADATA trapWSAData;
#define socklen_t int
#else
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <errno.h>
#include <fcntl.h>
#if LL_DARWIN
#ifndef _SOCKLEN_T
#define _SOCKLEN_T
typedef int socklen_t;
#endif
#endif
extern int errno; //error number
#define SOCKADDR_IN struct sockaddr_in
#define SOCKADDR struct sockaddr
#define SOCKET int
#define INVALID_SOCKET -1
#define SOCKET_ERROR -1
#define SD_BOTH 2
#define closesocket close
#endif
SOCKADDR_IN trapLclAddr;
LLNetCanary::LLNetCanary(int requested_port)
{
mGood = TRUE;
int nRet;
int hSocket;
int snd_size = 400000;
int rec_size = 400000;
int buff_size = 4;
#ifdef _MSC_VER
if(WSAStartup(0x0202, &trapWSAData))
{
S32 err = WSAGetLastError();
WSACleanup();
llwarns << "WSAStartup() failure: " << err << llendl;
mGood = FALSE;
return;
}
#endif
// Get a datagram socket
hSocket = (int)socket(AF_INET, SOCK_DGRAM, 0);
if (hSocket == INVALID_SOCKET)
{
#ifdef _MSC_VER
S32 err = WSAGetLastError();
WSACleanup();
#else
S32 err = errno;
#endif
mGood = FALSE;
llwarns << "socket() failure: " << err << llendl;
return;
}
// Name the socket (assign the local port number to receive on)
trapLclAddr.sin_family = AF_INET;
trapLclAddr.sin_addr.s_addr = htonl(INADDR_ANY);
trapLclAddr.sin_port = htons(requested_port);
//llinfos << "bind() port: " << requested_port << llendl;
nRet = bind(hSocket, (struct sockaddr*) &trapLclAddr, sizeof(trapLclAddr));
if (nRet == SOCKET_ERROR)
{
#ifdef _MSC_VER
S32 err = WSAGetLastError();
WSACleanup();
#else
S32 err = errno;
#endif
mGood = FALSE;
llwarns << "bind() failed: " << err << llendl;
return;
}
// Find out what address we got
SOCKADDR_IN socket_address;
socklen_t socket_address_size = sizeof(socket_address);
getsockname(hSocket, (SOCKADDR*) &socket_address, &socket_address_size);
mPort = ntohs(socket_address.sin_port);
//llinfos << "got port " << mPort << llendl;
// Set socket to be non-blocking
#ifdef _MSC_VER
unsigned long argp = 1;
nRet = ioctlsocket (hSocket, FIONBIO, &argp);
#else
nRet = fcntl(hSocket, F_SETFL, O_NONBLOCK);
#endif
if (nRet == SOCKET_ERROR)
{
#ifdef _MSC_VER
S32 err = WSAGetLastError();
WSACleanup();
#else
S32 err = errno;
#endif
mGood = FALSE;
llwarns << "Failed to set socket non-blocking, Err: " << err << llendl;
return;
}
// set a large receive buffer
nRet = setsockopt(hSocket, SOL_SOCKET, SO_RCVBUF, (char *)&rec_size, buff_size);
if (nRet)
{
llinfos << "Can't set receive buffer size!" << llendl;
}
// set a large send buffer
nRet = setsockopt(hSocket, SOL_SOCKET, SO_SNDBUF, (char *)&snd_size, buff_size);
if (nRet)
{
llinfos << "Can't set send buffer size!" << llendl;
}
//getsockopt(hSocket, SOL_SOCKET, SO_RCVBUF, (char *)&rec_size, &buff_size);
//getsockopt(hSocket, SOL_SOCKET, SO_SNDBUF, (char *)&snd_size, &buff_size);
//LL_DEBUGS("AppInit") << "startNet - receive buffer size : " << rec_size << LL_ENDL;
//LL_DEBUGS("AppInit") << "startNet - send buffer size : " << snd_size << LL_ENDL;
mSocket = hSocket;
}
LLNetCanary::~LLNetCanary()
{
if(mGood)
{
if(mSocket)
{
shutdown(mSocket, SD_BOTH);
closesocket(mSocket);
}
#ifdef _MSC_VER
WSACleanup();
#endif
}
}
// </edit>
#include "llerror.h"
#ifdef _MSC_VER
#include <winsock2.h>
static WSADATA trapWSAData;
#define socklen_t int
#else
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <errno.h>
#include <fcntl.h>
#if LL_DARWIN
#ifndef _SOCKLEN_T
#define _SOCKLEN_T
typedef int socklen_t;
#endif
#endif
extern int errno; //error number
#define SOCKADDR_IN struct sockaddr_in
#define SOCKADDR struct sockaddr
#define SOCKET int
#define INVALID_SOCKET -1
#define SOCKET_ERROR -1
#define SD_BOTH 2
#define closesocket close
#endif
SOCKADDR_IN trapLclAddr;
LLNetCanary::LLNetCanary(int requested_port)
{
mGood = TRUE;
int nRet;
int hSocket;
int snd_size = 400000;
int rec_size = 400000;
int buff_size = 4;
#ifdef _MSC_VER
if(WSAStartup(0x0202, &trapWSAData))
{
S32 err = WSAGetLastError();
WSACleanup();
llwarns << "WSAStartup() failure: " << err << llendl;
mGood = FALSE;
return;
}
#endif
// Get a datagram socket
hSocket = (int)socket(AF_INET, SOCK_DGRAM, 0);
if (hSocket == INVALID_SOCKET)
{
#ifdef _MSC_VER
S32 err = WSAGetLastError();
WSACleanup();
#else
S32 err = errno;
#endif
mGood = FALSE;
llwarns << "socket() failure: " << err << llendl;
return;
}
// Name the socket (assign the local port number to receive on)
trapLclAddr.sin_family = AF_INET;
trapLclAddr.sin_addr.s_addr = htonl(INADDR_ANY);
trapLclAddr.sin_port = htons(requested_port);
//llinfos << "bind() port: " << requested_port << llendl;
nRet = bind(hSocket, (struct sockaddr*) &trapLclAddr, sizeof(trapLclAddr));
if (nRet == SOCKET_ERROR)
{
#ifdef _MSC_VER
S32 err = WSAGetLastError();
WSACleanup();
#else
S32 err = errno;
#endif
mGood = FALSE;
llwarns << "bind() failed: " << err << llendl;
return;
}
// Find out what address we got
SOCKADDR_IN socket_address;
socklen_t socket_address_size = sizeof(socket_address);
getsockname(hSocket, (SOCKADDR*) &socket_address, &socket_address_size);
mPort = ntohs(socket_address.sin_port);
//llinfos << "got port " << mPort << llendl;
// Set socket to be non-blocking
#ifdef _MSC_VER
unsigned long argp = 1;
nRet = ioctlsocket (hSocket, FIONBIO, &argp);
#else
nRet = fcntl(hSocket, F_SETFL, O_NONBLOCK);
#endif
if (nRet == SOCKET_ERROR)
{
#ifdef _MSC_VER
S32 err = WSAGetLastError();
WSACleanup();
#else
S32 err = errno;
#endif
mGood = FALSE;
llwarns << "Failed to set socket non-blocking, Err: " << err << llendl;
return;
}
// set a large receive buffer
nRet = setsockopt(hSocket, SOL_SOCKET, SO_RCVBUF, (char *)&rec_size, buff_size);
if (nRet)
{
llinfos << "Can't set receive buffer size!" << llendl;
}
// set a large send buffer
nRet = setsockopt(hSocket, SOL_SOCKET, SO_SNDBUF, (char *)&snd_size, buff_size);
if (nRet)
{
llinfos << "Can't set send buffer size!" << llendl;
}
//getsockopt(hSocket, SOL_SOCKET, SO_RCVBUF, (char *)&rec_size, &buff_size);
//getsockopt(hSocket, SOL_SOCKET, SO_SNDBUF, (char *)&snd_size, &buff_size);
//LL_DEBUGS("AppInit") << "startNet - receive buffer size : " << rec_size << LL_ENDL;
//LL_DEBUGS("AppInit") << "startNet - send buffer size : " << snd_size << LL_ENDL;
mSocket = hSocket;
}
LLNetCanary::~LLNetCanary()
{
if(mGood)
{
if(mSocket)
{
shutdown(mSocket, SD_BOTH);
closesocket(mSocket);
}
#ifdef _MSC_VER
WSACleanup();
#endif
}
}
// </edit>

50
indra/llmessage/llnetcanary.h
View File

@@ -1,25 +1,25 @@
// <edit>
#ifndef LL_LLNETCANARY_H
#define LL_LLNETCANARY_H
#include "stdtypes.h"
#include <string>
class LLNetCanary
{
public:
LLNetCanary(int requested_port);
~LLNetCanary();
BOOL mGood;
S32 mSocket;
U16 mPort;
U8 mBuffer[8192];
typedef struct
{
F64 time; // LLTimer::getElapsedSeconds();
//U8 message[4];
U32 message;
U32 points;
std::string name;
} entry;
};
#endif
// </edit>
// <edit>
#ifndef LL_LLNETCANARY_H
#define LL_LLNETCANARY_H
#include "stdtypes.h"
#include <string>
class LLNetCanary
{
public:
LLNetCanary(int requested_port);
~LLNetCanary();
BOOL mGood;
S32 mSocket;
U16 mPort;
U8 mBuffer[8192];
typedef struct
{
F64 time; // LLTimer::getElapsedSeconds();
//U8 message[4];
U32 message;
U32 points;
std::string name;
} entry;
};
#endif
// </edit>

190
indra/llplugin/slplugin/CMakeLists.txt Executable file → Normal file
View File

@@ -1,95 +1,95 @@
project(SLPlugin)
include(00-Common)
include(LLCommon)
include(LLPlugin)
include(Linking)
include(PluginAPI)
include(LLMessage)
include(GooglePerfTools)
include_directories(
${LLPLUGIN_INCLUDE_DIRS}
${LLMESSAGE_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
)
if (DARWIN)
include(CMakeFindFrameworks)
find_library(CARBON_LIBRARY Carbon)
find_library(COCOA_LIBRARY Cocoa)
endif (DARWIN)
### SLPlugin
set(SLPlugin_SOURCE_FILES
slplugin.cpp
)
if (DARWIN)
list(APPEND SLPlugin_SOURCE_FILES
slplugin-objc.mm
)
list(APPEND SLPlugin_HEADER_FILES
slplugin-objc.h
)
endif (DARWIN)
set_source_files_properties(${SLPlugin_HEADER_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE)
if (SLPlugin_HEADER_FILES)
list(APPEND SLPlugin_SOURCE_FILES ${SLPlugin_HEADER_FILES})
endif (SLPlugin_HEADER_FILES)
add_executable(SLPlugin
WIN32
MACOSX_BUNDLE
${SLPlugin_SOURCE_FILES}
)
set_target_properties(SLPlugin
PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/slplugin_info.plist
)
target_link_libraries(SLPlugin
${GOOGLE_PERFTOOLS_LIBRARIES}
${LLPLUGIN_LIBRARIES}
${LLMESSAGE_LIBRARIES}
${LLCOMMON_LIBRARIES}
${PLUGIN_API_WINDOWS_LIBRARIES}
)
add_dependencies(SLPlugin
${LLPLUGIN_LIBRARIES}
${LLMESSAGE_LIBRARIES}
${LLCOMMON_LIBRARIES}
)
if (DARWIN)
# Mac version needs to link against Carbon
target_link_libraries(SLPlugin ${CARBON_LIBRARY} ${COCOA_LIBRARY})
# Make sure the app bundle has a Resources directory (it will get populated by viewer-manifest.py later)
add_custom_command(
TARGET SLPlugin POST_BUILD
COMMAND mkdir
ARGS
-p
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/SLPlugin.app/Contents/Resources
)
endif (DARWIN)
if (LINUX)
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lrt")
endif (LINUX)
if (WINDOWS)
set_target_properties(SLPlugin
PROPERTIES
LINK_FLAGS "${GOOGLE_PERFTOOLS_LINKER_FLAGS}"
)
endif (WINDOWS)
#ll_deploy_sharedlibs_command(SLPlugin)
project(SLPlugin)
include(00-Common)
include(LLCommon)
include(LLPlugin)
include(Linking)
include(PluginAPI)
include(LLMessage)
include(GooglePerfTools)
include_directories(
${LLPLUGIN_INCLUDE_DIRS}
${LLMESSAGE_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
)
if (DARWIN)
include(CMakeFindFrameworks)
find_library(CARBON_LIBRARY Carbon)
find_library(COCOA_LIBRARY Cocoa)
endif (DARWIN)
### SLPlugin
set(SLPlugin_SOURCE_FILES
slplugin.cpp
)
if (DARWIN)
list(APPEND SLPlugin_SOURCE_FILES
slplugin-objc.mm
)
list(APPEND SLPlugin_HEADER_FILES
slplugin-objc.h
)
endif (DARWIN)
set_source_files_properties(${SLPlugin_HEADER_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE)
if (SLPlugin_HEADER_FILES)
list(APPEND SLPlugin_SOURCE_FILES ${SLPlugin_HEADER_FILES})
endif (SLPlugin_HEADER_FILES)
add_executable(SLPlugin
WIN32
MACOSX_BUNDLE
${SLPlugin_SOURCE_FILES}
)
set_target_properties(SLPlugin
PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/slplugin_info.plist
)
target_link_libraries(SLPlugin
${GOOGLE_PERFTOOLS_LIBRARIES}
${LLPLUGIN_LIBRARIES}
${LLMESSAGE_LIBRARIES}
${LLCOMMON_LIBRARIES}
${PLUGIN_API_WINDOWS_LIBRARIES}
)
add_dependencies(SLPlugin
${LLPLUGIN_LIBRARIES}
${LLMESSAGE_LIBRARIES}
${LLCOMMON_LIBRARIES}
)
if (DARWIN)
# Mac version needs to link against Carbon
target_link_libraries(SLPlugin ${CARBON_LIBRARY} ${COCOA_LIBRARY})
# Make sure the app bundle has a Resources directory (it will get populated by viewer-manifest.py later)
add_custom_command(
TARGET SLPlugin POST_BUILD
COMMAND mkdir
ARGS
-p
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/SLPlugin.app/Contents/Resources
)
endif (DARWIN)
if (LINUX)
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lrt")
endif (LINUX)
if (WINDOWS)
set_target_properties(SLPlugin
PROPERTIES
LINK_FLAGS "${GOOGLE_PERFTOOLS_LINKER_FLAGS}"
)
endif (WINDOWS)
#ll_deploy_sharedlibs_command(SLPlugin)

1488
indra/llprimitive/llmaterialtable.cpp
View File

File diff suppressed because it is too large Load Diff

3328
indra/newview/CMakeLists.txt
View File

File diff suppressed because it is too large Load Diff

890
indra/newview/app_settings/mime_types.xml
View File

@@ -1,445 +1,445 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<mimetypes name="default">
<defaultlabel>
(Unknown)
</defaultlabel>
<defaultwidget>
none
</defaultwidget>
<defaultimpl>
media_plugin_webkit
</defaultimpl>
<widgetset name="web">
<label name="web_label">
Web Content
</label>
<icon>
icn_media_web.tga
</icon>
<default_type>
text/html
</default_type>
<tooltip name="web_tooltip">
This location has Web content
</tooltip>
<playtip name="web_playtip">
Show Web content
</playtip>
<allow_resize>
true
</allow_resize>
<allow_looping>
false
</allow_looping>
</widgetset>
<widgetset name="movie">
<label name="movie_label">
Movie
</label>
<default_type>
video/*
</default_type>
<icon>
icn_media_movie.tga
</icon>
<tooltip name="movie_tooltip">
There is a movie to play here
</tooltip>
<playtip name="movie_playtip">
Play movie
</playtip>
<allow_resize>
false
</allow_resize>
<allow_looping>
true
</allow_looping>
</widgetset>
<widgetset name="image">
<label name="image_label">
Image
</label>
<icon>
icn_media_web.tga
</icon>
<default_type>
image/*
</default_type>
<tooltip name="image_tooltip">
There is an image at this location
</tooltip>
<playtip name="image_playtip">
View this location&apos;s image
</playtip>
<allow_resize>
false
</allow_resize>
<allow_looping>
false
</allow_looping>
</widgetset>
<widgetset name="audio">
<label name="audio_label">
Audio
</label>
<icon>
icn_media_web.tga
</icon>
<default_type>
audio/*
</default_type>
<tooltip name="audio_tooltip">
There is audio at this location
</tooltip>
<playtip name="audio_playtip">
Play this location&apos;s audio
</playtip>
<allow_resize>
false
</allow_resize>
<allow_looping>
true
</allow_looping>
</widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Real Time Streaming
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</scheme>
<mimetype name="blank">
<label name="blank_label">
- None -
</label>
<widgettype>
none
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="none/none">
<label name="none/none_label">
- None -
</label>
<widgettype>
none
</widgettype>
</mimetype>
<mimetype name="audio/*">
<label name="audio2_label">
Audio
</label>
<widgettype>
audio
</widgettype>
</mimetype>
<mimetype name="video/*">
<label name="video2_label">
Video
</label>
<widgettype>
movie
</widgettype>
</mimetype>
<mimetype name="image/*">
<label name="image2_label">
Image
</label>
<widgettype>
image
</widgettype>
</mimetype>
<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
<label name="vnd.secondlife.qt.legacy_label">
Movie (QuickTime)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="application/javascript">
<label name="application/javascript_label">
Javascript
</label>
<widgettype>
web
</widgettype>
</mimetype>
<mimetype name="application/ogg">
<label name="application/ogg_label">
Ogg Audio/Video
</label>
<widgettype>
audio
</widgettype>
</mimetype>
<mimetype name="application/pdf">
<label name="application/pdf_label">
PDF Document
</label>
<widgettype>
image
</widgettype>
</mimetype>
<mimetype name="application/postscript">
<label name="application/postscript_label">
Postscript Document
</label>
<widgettype>
image
</widgettype>
</mimetype>
<mimetype name="application/rtf">
<label name="application/rtf_label">
Rich Text (RTF)
</label>
<widgettype>
image
</widgettype>
</mimetype>
<mimetype name="application/smil">
<label name="application/smil_label">
Synchronized Multimedia Integration Language (SMIL)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="application/xhtml+xml">
<label name="application/xhtml+xml_label">
Web Page (XHTML)
</label>
<widgettype>
web
</widgettype>
</mimetype>
<mimetype name="application/x-director">
<label name="application/x-director_label">
Macromedia Director
</label>
<widgettype>
image
</widgettype>
</mimetype>
<mimetype name="audio/mid">
<label name="audio/mid_label">
Audio (MIDI)
</label>
<widgettype>
audio
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="audio/mpeg">
<label name="audio/mpeg_label">
Audio (MP3)
</label>
<widgettype>
audio
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="audio/x-aiff">
<label name="audio/x-aiff_label">
Audio (AIFF)
</label>
<widgettype>
audio
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="audio/x-wav">
<label name="audio/x-wav_label">
Audio (WAV)
</label>
<widgettype>
audio
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype menu="1" name="image/bmp">
<label name="image/bmp_label">
Image (BMP)
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="image/gif">
<label name="image/gif_label">
Image (GIF)
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="image/jpeg">
<label name="image/jpeg_label">
Image (JPEG)
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="image/png">
<label name="image/png_label">
Image (PNG)
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="image/svg+xml">
<label name="image/svg+xml_label">
Image (SVG)
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="image/tiff">
<label name="image/tiff_label">
Image (TIFF)
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="text/html">
<label name="text/html_label">
Web Page
</label>
<widgettype>
web
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="text/plain">
<label name="text/plain_label">
Text
</label>
<widgettype>
text
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="text/xml">
<label name="text/xml_label">
XML
</label>
<widgettype>
text
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="video/mpeg">
<label name="video/mpeg_label">
Movie (MPEG)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="video/mp4">
<label name="video/mp4_label">
Movie (MP4)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype menu="1" name="video/quicktime">
<label name="video/quicktime_label">
Movie (QuickTime)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="video/x-ms-asf">
<label name="video/x-ms-asf_label">
Movie (Windows Media ASF)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="video/x-ms-wmv">
<label name="video/x-ms-wmv_label">
Movie (Windows Media WMV)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype menu="1" name="video/x-msvideo">
<label name="video/x-msvideo_label">
Movie (AVI)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
</mimetypes>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<mimetypes name="default">
<defaultlabel>
(Unknown)
</defaultlabel>
<defaultwidget>
none
</defaultwidget>
<defaultimpl>
media_plugin_webkit
</defaultimpl>
<widgetset name="web">
<label name="web_label">
Web Content
</label>
<icon>
icn_media_web.tga
</icon>
<default_type>
text/html
</default_type>
<tooltip name="web_tooltip">
This location has Web content
</tooltip>
<playtip name="web_playtip">
Show Web content
</playtip>
<allow_resize>
true
</allow_resize>
<allow_looping>
false
</allow_looping>
</widgetset>
<widgetset name="movie">
<label name="movie_label">
Movie
</label>
<default_type>
video/*
</default_type>
<icon>
icn_media_movie.tga
</icon>
<tooltip name="movie_tooltip">
There is a movie to play here
</tooltip>
<playtip name="movie_playtip">
Play movie
</playtip>
<allow_resize>
false
</allow_resize>
<allow_looping>
true
</allow_looping>
</widgetset>
<widgetset name="image">
<label name="image_label">
Image
</label>
<icon>
icn_media_web.tga
</icon>
<default_type>
image/*
</default_type>
<tooltip name="image_tooltip">
There is an image at this location
</tooltip>
<playtip name="image_playtip">
View this location&apos;s image
</playtip>
<allow_resize>
false
</allow_resize>
<allow_looping>
false
</allow_looping>
</widgetset>
<widgetset name="audio">
<label name="audio_label">
Audio
</label>
<icon>
icn_media_web.tga
</icon>
<default_type>
audio/*
</default_type>
<tooltip name="audio_tooltip">
There is audio at this location
</tooltip>
<playtip name="audio_playtip">
Play this location&apos;s audio
</playtip>
<allow_resize>
false
</allow_resize>
<allow_looping>
true
</allow_looping>
</widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Real Time Streaming
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</scheme>
<mimetype name="blank">
<label name="blank_label">
- None -
</label>
<widgettype>
none
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="none/none">
<label name="none/none_label">
- None -
</label>
<widgettype>
none
</widgettype>
</mimetype>
<mimetype name="audio/*">
<label name="audio2_label">
Audio
</label>
<widgettype>
audio
</widgettype>
</mimetype>
<mimetype name="video/*">
<label name="video2_label">
Video
</label>
<widgettype>
movie
</widgettype>
</mimetype>
<mimetype name="image/*">
<label name="image2_label">
Image
</label>
<widgettype>
image
</widgettype>
</mimetype>
<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
<label name="vnd.secondlife.qt.legacy_label">
Movie (QuickTime)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="application/javascript">
<label name="application/javascript_label">
Javascript
</label>
<widgettype>
web
</widgettype>
</mimetype>
<mimetype name="application/ogg">
<label name="application/ogg_label">
Ogg Audio/Video
</label>
<widgettype>
audio
</widgettype>
</mimetype>
<mimetype name="application/pdf">
<label name="application/pdf_label">
PDF Document
</label>
<widgettype>
image
</widgettype>
</mimetype>
<mimetype name="application/postscript">
<label name="application/postscript_label">
Postscript Document
</label>
<widgettype>
image
</widgettype>
</mimetype>
<mimetype name="application/rtf">
<label name="application/rtf_label">
Rich Text (RTF)
</label>
<widgettype>
image
</widgettype>
</mimetype>
<mimetype name="application/smil">
<label name="application/smil_label">
Synchronized Multimedia Integration Language (SMIL)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="application/xhtml+xml">
<label name="application/xhtml+xml_label">
Web Page (XHTML)
</label>
<widgettype>
web
</widgettype>
</mimetype>
<mimetype name="application/x-director">
<label name="application/x-director_label">
Macromedia Director
</label>
<widgettype>
image
</widgettype>
</mimetype>
<mimetype name="audio/mid">
<label name="audio/mid_label">
Audio (MIDI)
</label>
<widgettype>
audio
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="audio/mpeg">
<label name="audio/mpeg_label">
Audio (MP3)
</label>
<widgettype>
audio
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="audio/x-aiff">
<label name="audio/x-aiff_label">
Audio (AIFF)
</label>
<widgettype>
audio
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="audio/x-wav">
<label name="audio/x-wav_label">
Audio (WAV)
</label>
<widgettype>
audio
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype menu="1" name="image/bmp">
<label name="image/bmp_label">
Image (BMP)
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="image/gif">
<label name="image/gif_label">
Image (GIF)
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="image/jpeg">
<label name="image/jpeg_label">
Image (JPEG)
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="image/png">
<label name="image/png_label">
Image (PNG)
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="image/svg+xml">
<label name="image/svg+xml_label">
Image (SVG)
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="image/tiff">
<label name="image/tiff_label">
Image (TIFF)
</label>
<widgettype>
image
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="text/html">
<label name="text/html_label">
Web Page
</label>
<widgettype>
web
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="text/plain">
<label name="text/plain_label">
Text
</label>
<widgettype>
text
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype name="text/xml">
<label name="text/xml_label">
XML
</label>
<widgettype>
text
</widgettype>
<impl>
media_plugin_webkit
</impl>
</mimetype>
<mimetype menu="1" name="video/mpeg">
<label name="video/mpeg_label">
Movie (MPEG)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="video/mp4">
<label name="video/mp4_label">
Movie (MP4)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype menu="1" name="video/quicktime">
<label name="video/quicktime_label">
Movie (QuickTime)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="video/x-ms-asf">
<label name="video/x-ms-asf_label">
Movie (Windows Media ASF)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype name="video/x-ms-wmv">
<label name="video/x-ms-wmv_label">
Movie (Windows Media WMV)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
<mimetype menu="1" name="video/x-msvideo">
<label name="video/x-msvideo_label">
Movie (AVI)
</label>
<widgettype>
movie
</widgettype>
<impl>
media_plugin_quicktime
</impl>
</mimetype>
</mimetypes>

28296
indra/newview/app_settings/settings.xml
View File

File diff suppressed because it is too large Load Diff

1538
indra/newview/app_settings/settings_ascent.xml
View File

File diff suppressed because it is too large Load Diff

360
indra/newview/app_settings/settings_ascent_coa.xml
View File

@@ -1,180 +1,180 @@
<?xml version="1.0" ?>
<llsd>
<map>
<!-- Ascent's Optionally Account-Specific Settings -->
<key>MoyMiniMapCustomColor</key>
<map>
<key>Comment</key>
<string>Custom minimap color you wish to have.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>0.375</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentInstantMessageAnnounceIncoming</key>
<map>
<key>Comment</key>
<string>Start IM window as soon as the person starts typing</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentCustomTagLabel</key>
<map>
<key>Comment</key>
<string>Label for the custom local tag</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>Custom</string>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentCustomTagColor</key>
<map>
<key>Comment</key>
<string>Color of custom tag.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>0.5</real>
<real>1.0</real>
<real>0.25</real>
<real>1.0</real>
</array>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentUseCustomTag</key>
<map>
<key>Comment</key>
<string>Show a custom tag.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentReportClientIndex</key>
<map>
<key>Comment</key>
<string>Show your own tag</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>1</integer>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentFriendColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>1.0</real>
<real>1.0</real>
<real>0.0</real>
<real>1.0</real>
</array>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentLindenColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>0.0</real>
<real>0.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentMutedColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>0.7</real>
<real>0.7</real>
<real>0.7</real>
<real>1.0</real>
</array>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentEstateOwnerColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>1.0</real>
<real>0.6</real>
<real>1.0</real>
<real>1.0</real>
</array>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentReportClientUUID</key>
<map>
<key>Comment</key>
<string>Broadcasted Client Key</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>f25263b7-6167-4f34-a4ef-af65213b2e39</string>
<key>IsCOA</key>
<integer>1</integer>
</map>
</map>
</llsd>
<?xml version="1.0" ?>
<llsd>
<map>
<!-- Ascent's Optionally Account-Specific Settings -->
<key>MoyMiniMapCustomColor</key>
<map>
<key>Comment</key>
<string>Custom minimap color you wish to have.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>0.375</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentInstantMessageAnnounceIncoming</key>
<map>
<key>Comment</key>
<string>Start IM window as soon as the person starts typing</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentCustomTagLabel</key>
<map>
<key>Comment</key>
<string>Label for the custom local tag</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>Custom</string>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentCustomTagColor</key>
<map>
<key>Comment</key>
<string>Color of custom tag.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>0.5</real>
<real>1.0</real>
<real>0.25</real>
<real>1.0</real>
</array>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentUseCustomTag</key>
<map>
<key>Comment</key>
<string>Show a custom tag.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentReportClientIndex</key>
<map>
<key>Comment</key>
<string>Show your own tag</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>1</integer>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentFriendColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>1.0</real>
<real>1.0</real>
<real>0.0</real>
<real>1.0</real>
</array>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentLindenColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>0.0</real>
<real>0.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentMutedColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>0.7</real>
<real>0.7</real>
<real>0.7</real>
<real>1.0</real>
</array>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentEstateOwnerColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>1.0</real>
<real>0.6</real>
<real>1.0</real>
<real>1.0</real>
</array>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentReportClientUUID</key>
<map>
<key>Comment</key>
<string>Broadcasted Client Key</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>f25263b7-6167-4f34-a4ef-af65213b2e39</string>
<key>IsCOA</key>
<integer>1</integer>
</map>
</map>
</llsd>

30
indra/newview/app_settings/settings_crash_behavior.xml
View File

@@ -1,15 +1,15 @@
<llsd>
<map>
<key>CrashSubmitBehavior</key>
<map>
<key>Comment</key>
<string>Controls behavior when viewer crashes (0 = ask before sending crash report, 1 = always send crash report, 2 = never send crash report)</string>
<key>Persist</key>
<integer>2</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>2</integer>
</map>
</map>
</llsd>
<llsd>
<map>
<key>CrashSubmitBehavior</key>
<map>
<key>Comment</key>
<string>Controls behavior when viewer crashes (0 = ask before sending crash report, 1 = always send crash report, 2 = never send crash report)</string>
<key>Persist</key>
<integer>2</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>2</integer>
</map>
</map>
</llsd>

366
indra/newview/app_settings/settings_rlv.xml
View File

@@ -1,183 +1,183 @@
<?xml version="1.0"?>
<llsd>
<map>
<key>RestrainedLove</key>
<map>
<key>Comment</key>
<string>Toggles the RestrainedLove features (BDSM lockable toys support). Needs a restart of the viewer.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>RestrainedLoveDebug</key>
<map>
<key>Comment</key>
<string>Toggles the RestrainedLove debug mode (displays the commands when in debug mode).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RestrainedLoveNoSetEnv</key>
<map>
<key>Comment</key>
<string>When TRUE, forbids to set the environment (time of day and Windlight settings) via RestrainedLove. Needs a restart of the viewer.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RestrainedLoveOffsetAvatarZ</key>
<map>
<key>Comment</key>
<string>Offset the avatar.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.0</real>
</map>
<key>RestrainedLoveReplaceWhenFolderBeginsWith</key>
<map>
<key>Comment</key>
<string>If a folder name begins with this string, its attach behavior will always be "replace", never "stack". Default is blank (disabled).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string></string>
</map>
<key>RestrainedLoveStackWhenFolderBeginsWith</key>
<map>
<key>Comment</key>
<string>If a folder name begins with this string, its attach behavior will always be "stack", never "replace". Default is "+".</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>+</string>
</map>
<key>RLVaDebugHideUnsetDuplicate</key>
<map>
<key>Comment</key>
<string>Suppresses reporting "unset" or "duplicate" command restrictions when RestrainedLoveDebug is TRUE</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RestrainedLoveForbidGiveToRLV</key>
<map>
<key>Comment</key>
<string>When FALSE, allows to give sub-folders to the #RLV RestrainedLove folder.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>RLVaEnableCompositeFolders</key>
<map>
<key>Comment</key>
<string>Enables composite folders for shared inventory</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RLVaEnableLegacyNaming</key>
<map>
<key>Comment</key>
<string>Enables legacy naming convention for folders</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>RLVaEnableSharedWear</key>
<map>
<key>Comment</key>
<string>Attachments in the shared #RLV folder can be force-attached without needing to specify an attachment point</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RLVaHideLockedLayers</key>
<map>
<key>Comment</key>
<string>Hides "remove outfit" restricted worn clothing layers from @getoufit</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RLVaHideLockedAttachments</key>
<map>
<key>Comment</key>
<string>Hides non-detachable worn attachments from @getattach</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RLVaSharedInvAutoRename</key>
<map>
<key>Comment</key>
<string>Automatically renames shared inventory items when worn</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>RLVaShowNameTags</key>
<map>
<key>Comment</key>
<string>Display of names above avatars is subject to the general "Show Names" setting when @shownames=n restricted</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>WarnFirstRLVGiveToRLV</key>
<map>
<key>Comment</key>
<string>Enables FirstRLVGiveToRLV warning dialog</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
</map>
</llsd>
<?xml version="1.0"?>
<llsd>
<map>
<key>RestrainedLove</key>
<map>
<key>Comment</key>
<string>Toggles the RestrainedLove features (BDSM lockable toys support). Needs a restart of the viewer.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>RestrainedLoveDebug</key>
<map>
<key>Comment</key>
<string>Toggles the RestrainedLove debug mode (displays the commands when in debug mode).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RestrainedLoveNoSetEnv</key>
<map>
<key>Comment</key>
<string>When TRUE, forbids to set the environment (time of day and Windlight settings) via RestrainedLove. Needs a restart of the viewer.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RestrainedLoveOffsetAvatarZ</key>
<map>
<key>Comment</key>
<string>Offset the avatar.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.0</real>
</map>
<key>RestrainedLoveReplaceWhenFolderBeginsWith</key>
<map>
<key>Comment</key>
<string>If a folder name begins with this string, its attach behavior will always be "replace", never "stack". Default is blank (disabled).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string></string>
</map>
<key>RestrainedLoveStackWhenFolderBeginsWith</key>
<map>
<key>Comment</key>
<string>If a folder name begins with this string, its attach behavior will always be "stack", never "replace". Default is "+".</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>+</string>
</map>
<key>RLVaDebugHideUnsetDuplicate</key>
<map>
<key>Comment</key>
<string>Suppresses reporting "unset" or "duplicate" command restrictions when RestrainedLoveDebug is TRUE</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RestrainedLoveForbidGiveToRLV</key>
<map>
<key>Comment</key>
<string>When FALSE, allows to give sub-folders to the #RLV RestrainedLove folder.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>RLVaEnableCompositeFolders</key>
<map>
<key>Comment</key>
<string>Enables composite folders for shared inventory</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RLVaEnableLegacyNaming</key>
<map>
<key>Comment</key>
<string>Enables legacy naming convention for folders</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>RLVaEnableSharedWear</key>
<map>
<key>Comment</key>
<string>Attachments in the shared #RLV folder can be force-attached without needing to specify an attachment point</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RLVaHideLockedLayers</key>
<map>
<key>Comment</key>
<string>Hides "remove outfit" restricted worn clothing layers from @getoufit</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RLVaHideLockedAttachments</key>
<map>
<key>Comment</key>
<string>Hides non-detachable worn attachments from @getattach</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RLVaSharedInvAutoRename</key>
<map>
<key>Comment</key>
<string>Automatically renames shared inventory items when worn</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>RLVaShowNameTags</key>
<map>
<key>Comment</key>
<string>Display of names above avatars is subject to the general "Show Names" setting when @shownames=n restricted</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>WarnFirstRLVGiveToRLV</key>
<map>
<key>Comment</key>
<string>Enables FirstRLVGiveToRLV warning dialog</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
</map>
</llsd>

344
indra/newview/app_settings/settings_sh.xml
View File

@@ -1,172 +1,172 @@
<?xml version="1.0" ?>
<llsd>
<map>
<key>SHAllowScriptCommands</key>
<map>
<key>Comment</key>
<string>Allow script to client intercommunication</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SHScriptCommandPrefix</key>
<map>
<key>Comment</key>
<string>Prefix that script commands must be prepended with.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>#@#@!</string>
</map>
<key>SHChatCommandPrefix</key>
<map>
<key>Comment</key>
<string>Prefix that chat commands must be prepended with</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>>></string>
</map>
<key>SHScriptCommandSeparator</key>
<map>
<key>Comment</key>
<string>Separator to use when tokenizing script command arguments</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>|</string>
</map>
<key>SHChatCommandSeparator</key>
<map>
<key>Comment</key>
<string>Separator to use when tokenizing chat command arguments</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string> </string>
</map>
<key>SHHighResSnapshotScale</key>
<map>
<key>Comment</key>
<string>High-resolution snapshot scale.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>2.0</real>
</map>
<key>SHHighResSnapshotSuperSample</key>
<map>
<key>Comment</key>
<string>Set the supersampling scale in tiled screenshots.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>1.0</real>
</map>
<key>SGBlockGeneralSpam</key>
<map>
<key>Comment</key>
<string>Enable automatic general spam blocking</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>SGBlockCardSpam</key>
<map>
<key>Comment</key>
<string>Enable automatic calling card spam blocking</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>SGBlockChatSpam</key>
<map>
<key>Comment</key>
<string>Enable automatic chat spam blocking</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>SGBlockDialogSpam</key>
<map>
<key>Comment</key>
<string>Enable automatic dialog spam blocking</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>SGSpamTime</key>
<map>
<key>Comment</key>
<string>Time of Evalulating spam. (Default: 1.000)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>1.0</real>
</map>
<key>SGSpamCount</key>
<map>
<key>Comment</key>
<string>Number of items spammed per time period in SGSpamTime. (Default: 4)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<real>4</real>
</map>
<key>SGChatSpamTime</key>
<map>
<key>Comment</key>
<string>Time of Evalulating spam. (Default: 1.000)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>1.0</real>
</map>
<key>SGChatSpamCount</key>
<map>
<key>Comment</key>
<string>Number of items spammed per time set in SGSpamTime. (Default: 10)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<real>10.0</real>
</map>
</map>
</llsd>
<?xml version="1.0" ?>
<llsd>
<map>
<key>SHAllowScriptCommands</key>
<map>
<key>Comment</key>
<string>Allow script to client intercommunication</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SHScriptCommandPrefix</key>
<map>
<key>Comment</key>
<string>Prefix that script commands must be prepended with.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>#@#@!</string>
</map>
<key>SHChatCommandPrefix</key>
<map>
<key>Comment</key>
<string>Prefix that chat commands must be prepended with</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>>></string>
</map>
<key>SHScriptCommandSeparator</key>
<map>
<key>Comment</key>
<string>Separator to use when tokenizing script command arguments</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>|</string>
</map>
<key>SHChatCommandSeparator</key>
<map>
<key>Comment</key>
<string>Separator to use when tokenizing chat command arguments</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string> </string>
</map>
<key>SHHighResSnapshotScale</key>
<map>
<key>Comment</key>
<string>High-resolution snapshot scale.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>2.0</real>
</map>
<key>SHHighResSnapshotSuperSample</key>
<map>
<key>Comment</key>
<string>Set the supersampling scale in tiled screenshots.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>1.0</real>
</map>
<key>SGBlockGeneralSpam</key>
<map>
<key>Comment</key>
<string>Enable automatic general spam blocking</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>SGBlockCardSpam</key>
<map>
<key>Comment</key>
<string>Enable automatic calling card spam blocking</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>SGBlockChatSpam</key>
<map>
<key>Comment</key>
<string>Enable automatic chat spam blocking</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>SGBlockDialogSpam</key>
<map>
<key>Comment</key>
<string>Enable automatic dialog spam blocking</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>SGSpamTime</key>
<map>
<key>Comment</key>
<string>Time of Evalulating spam. (Default: 1.000)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>1.0</real>
</map>
<key>SGSpamCount</key>
<map>
<key>Comment</key>
<string>Number of items spammed per time period in SGSpamTime. (Default: 4)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<real>4</real>
</map>
<key>SGChatSpamTime</key>
<map>
<key>Comment</key>
<string>Time of Evalulating spam. (Default: 1.000)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>1.0</real>
</map>
<key>SGChatSpamCount</key>
<map>
<key>Comment</key>
<string>Number of items spammed per time set in SGSpamTime. (Default: 10)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<real>10.0</real>
</map>
</map>
</llsd>

380
indra/newview/app_settings/windlight/postprocesseffects.xml
View File

@@ -1,191 +1,191 @@
<llsd>
<map>
<key>Asi Weird</key>
<map>
<key>bloom_strength</key>
<real>4.5799999237060547</real>
<key>bloom_width</key>
<real>12.539999961853027</real>
<key>brightness</key>
<real>0.89999997615814209</real>
<key>brightness_multiplier</key>
<real>3</real>
<key>contrast</key>
<real>0.22999998927116394</real>
<key>contrast_base</key>
<array>
<real>1</real>
<real>1</real>
<real>1</real>
<real>0.5</real>
</array>
<key>enable_bloom</key>
<integer>1</integer>
<key>enable_color_filter</key>
<integer>1</integer>
<key>enable_night_vision</key>
<boolean>0</boolean>
<key>extract_high</key>
<real>1</real>
<key>extract_low</key>
<real>0.47999998927116394</real>
<key>noise_size</key>
<real>25</real>
<key>noise_strength</key>
<real>0.40000000000000002</real>
<key>saturation</key>
<real>-1</real>
</map>
<key>NegativeSaturation</key>
<map>
<key>bloom_strength</key>
<real>1.5</real>
<key>bloom_width</key>
<real>2.25</real>
<key>brightness</key>
<real>1</real>
<key>brightness_multiplier</key>
<real>3</real>
<key>contrast</key>
<real>1</real>
<key>contrast_base</key>
<array>
<real>1</real>
<real>1</real>
<real>1</real>
<real>0.5</real>
</array>
<key>enable_bloom</key>
<boolean>0</boolean>
<key>enable_color_filter</key>
<integer>1</integer>
<key>enable_night_vision</key>
<boolean>0</boolean>
<key>extract_high</key>
<real>1</real>
<key>extract_low</key>
<real>0.94999999999999996</real>
<key>noise_size</key>
<real>25</real>
<key>noise_strength</key>
<real>0.40000000000000002</real>
<key>saturation</key>
<real>-1</real>
</map>
<key>NightVision</key>
<map>
<key>bloom_strength</key>
<real>1.5</real>
<key>bloom_width</key>
<real>2.25</real>
<key>brightness</key>
<real>1</real>
<key>brightness_multiplier</key>
<real>3</real>
<key>contrast</key>
<real>1</real>
<key>contrast_base</key>
<array>
<real>1</real>
<real>1</real>
<real>1</real>
<real>0.5</real>
</array>
<key>enable_bloom</key>
<boolean>0</boolean>
<key>enable_color_filter</key>
<boolean>0</boolean>
<key>enable_night_vision</key>
<integer>1</integer>
<key>extract_high</key>
<real>1</real>
<key>extract_low</key>
<real>0.94999999999999996</real>
<key>noise_size</key>
<real>25</real>
<key>noise_strength</key>
<real>0.40000000000000002</real>
<key>saturation</key>
<real>1</real>
</map>
<key>WGhost</key>
<map>
<key>bloom_strength</key>
<real>2.0399999618530273</real>
<key>bloom_width</key>
<real>2.25</real>
<key>brightness</key>
<real>1</real>
<key>brightness_multiplier</key>
<real>3</real>
<key>contrast</key>
<real>1</real>
<key>contrast_base</key>
<array>
<real>1</real>
<real>1</real>
<real>1</real>
<real>0.5</real>
</array>
<key>enable_bloom</key>
<integer>1</integer>
<key>enable_color_filter</key>
<boolean>0</boolean>
<key>enable_night_vision</key>
<boolean>0</boolean>
<key>extract_high</key>
<real>1</real>
<key>extract_low</key>
<real>0.22999998927116394</real>
<key>noise_size</key>
<real>25</real>
<key>noise_strength</key>
<real>0.40000000000000002</real>
<key>saturation</key>
<real>1</real>
</map>
<key>default</key>
<map>
<key>bloom_strength</key>
<real>1.5</real>
<key>bloom_width</key>
<real>2.25</real>
<key>gamma</key>
<real>1.0</real>
<key>brightness</key>
<real>1</real>
<key>brightness_multiplier</key>
<real>3</real>
<key>contrast</key>
<real>1</real>
<key>contrast_base</key>
<array>
<real>1</real>
<real>1</real>
<real>1</real>
<real>0.5</real>
</array>
<key>enable_bloom</key>
<boolean>0</boolean>
<key>enable_color_filter</key>
<boolean>0</boolean>
<key>enable_night_vision</key>
<boolean>0</boolean>
<key>enable_gauss_blur</key>
<boolean>0</boolean>
<key>gauss_blur_passes</key>
<integer>2</integer>
<key>extract_high</key>
<real>1</real>
<key>extract_low</key>
<real>0.94999999999999996</real>
<key>noise_size</key>
<real>25</real>
<key>noise_strength</key>
<real>0.40000000000000002</real>
<key>saturation</key>
<real>1</real>
</map>
</map>
<llsd>
<map>
<key>Asi Weird</key>
<map>
<key>bloom_strength</key>
<real>4.5799999237060547</real>
<key>bloom_width</key>
<real>12.539999961853027</real>
<key>brightness</key>
<real>0.89999997615814209</real>
<key>brightness_multiplier</key>
<real>3</real>
<key>contrast</key>
<real>0.22999998927116394</real>
<key>contrast_base</key>
<array>
<real>1</real>
<real>1</real>
<real>1</real>
<real>0.5</real>
</array>
<key>enable_bloom</key>
<integer>1</integer>
<key>enable_color_filter</key>
<integer>1</integer>
<key>enable_night_vision</key>
<boolean>0</boolean>
<key>extract_high</key>
<real>1</real>
<key>extract_low</key>
<real>0.47999998927116394</real>
<key>noise_size</key>
<real>25</real>
<key>noise_strength</key>
<real>0.40000000000000002</real>
<key>saturation</key>
<real>-1</real>
</map>
<key>NegativeSaturation</key>
<map>
<key>bloom_strength</key>
<real>1.5</real>
<key>bloom_width</key>
<real>2.25</real>
<key>brightness</key>
<real>1</real>
<key>brightness_multiplier</key>
<real>3</real>
<key>contrast</key>
<real>1</real>
<key>contrast_base</key>
<array>
<real>1</real>
<real>1</real>
<real>1</real>
<real>0.5</real>
</array>
<key>enable_bloom</key>
<boolean>0</boolean>
<key>enable_color_filter</key>
<integer>1</integer>
<key>enable_night_vision</key>
<boolean>0</boolean>
<key>extract_high</key>
<real>1</real>
<key>extract_low</key>
<real>0.94999999999999996</real>
<key>noise_size</key>
<real>25</real>
<key>noise_strength</key>
<real>0.40000000000000002</real>
<key>saturation</key>
<real>-1</real>
</map>
<key>NightVision</key>
<map>
<key>bloom_strength</key>
<real>1.5</real>
<key>bloom_width</key>
<real>2.25</real>
<key>brightness</key>
<real>1</real>
<key>brightness_multiplier</key>
<real>3</real>
<key>contrast</key>
<real>1</real>
<key>contrast_base</key>
<array>
<real>1</real>
<real>1</real>
<real>1</real>
<real>0.5</real>
</array>
<key>enable_bloom</key>
<boolean>0</boolean>
<key>enable_color_filter</key>
<boolean>0</boolean>
<key>enable_night_vision</key>
<integer>1</integer>
<key>extract_high</key>
<real>1</real>
<key>extract_low</key>
<real>0.94999999999999996</real>
<key>noise_size</key>
<real>25</real>
<key>noise_strength</key>
<real>0.40000000000000002</real>
<key>saturation</key>
<real>1</real>
</map>
<key>WGhost</key>
<map>
<key>bloom_strength</key>
<real>2.0399999618530273</real>
<key>bloom_width</key>
<real>2.25</real>
<key>brightness</key>
<real>1</real>
<key>brightness_multiplier</key>
<real>3</real>
<key>contrast</key>
<real>1</real>
<key>contrast_base</key>
<array>
<real>1</real>
<real>1</real>
<real>1</real>
<real>0.5</real>
</array>
<key>enable_bloom</key>
<integer>1</integer>
<key>enable_color_filter</key>
<boolean>0</boolean>
<key>enable_night_vision</key>
<boolean>0</boolean>
<key>extract_high</key>
<real>1</real>
<key>extract_low</key>
<real>0.22999998927116394</real>
<key>noise_size</key>
<real>25</real>
<key>noise_strength</key>
<real>0.40000000000000002</real>
<key>saturation</key>
<real>1</real>
</map>
<key>default</key>
<map>
<key>bloom_strength</key>
<real>1.5</real>
<key>bloom_width</key>
<real>2.25</real>
<key>gamma</key>
<real>1.0</real>
<key>brightness</key>
<real>1</real>
<key>brightness_multiplier</key>
<real>3</real>
<key>contrast</key>
<real>1</real>
<key>contrast_base</key>
<array>
<real>1</real>
<real>1</real>
<real>1</real>
<real>0.5</real>
</array>
<key>enable_bloom</key>
<boolean>0</boolean>
<key>enable_color_filter</key>
<boolean>0</boolean>
<key>enable_night_vision</key>
<boolean>0</boolean>
<key>enable_gauss_blur</key>
<boolean>0</boolean>
<key>gauss_blur_passes</key>
<integer>2</integer>
<key>extract_high</key>
<real>1</real>
<key>extract_low</key>
<real>0.94999999999999996</real>
<key>noise_size</key>
<real>25</real>
<key>noise_strength</key>
<real>0.40000000000000002</real>
<key>saturation</key>
<real>1</real>
</map>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/A%2D12AM.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.20405027270317078</real>
<real>0.24246673285961151</real>
<real>0.32999998331069946</real>
<real>0.10999999940395355</real>
</array>
<key>blue_density</key>
<array>
<real>0.44999998807907104</real>
<real>0.44999998807907104</real>
<real>0.44999998807907104</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.23999999463558197</real>
<real>0.23999999463558197</real>
<real>0.23999999463558197</real>
<real>1</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.00030000001424923539</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</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>5</real>
<real>0.0010000000474974513</real>
<real>-0.47999998927116394</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>1</real>
<real>-4.8876205482883961e-007</real>
<real>1</real>
</array>
<key>max_y</key>
<array>
<real>906.20001220703125</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>4.7123894691467285</real>
<key>sunlight_color</key>
<array>
<real>0.34876692295074463</real>
<real>0.35574248433113098</real>
<real>0.65999996662139893</real>
<real>0.2199999988079071</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.20405027270317078</real>
<real>0.24246673285961151</real>
<real>0.32999998331069946</real>
<real>0.10999999940395355</real>
</array>
<key>blue_density</key>
<array>
<real>0.44999998807907104</real>
<real>0.44999998807907104</real>
<real>0.44999998807907104</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.23999999463558197</real>
<real>0.23999999463558197</real>
<real>0.23999999463558197</real>
<real>1</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.00030000001424923539</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</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>5</real>
<real>0.0010000000474974513</real>
<real>-0.47999998927116394</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>1</real>
<real>-4.8876205482883961e-007</real>
<real>1</real>
</array>
<key>max_y</key>
<array>
<real>906.20001220703125</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>4.7123894691467285</real>
<key>sunlight_color</key>
<array>
<real>0.34876692295074463</real>
<real>0.35574248433113098</real>
<real>0.65999996662139893</real>
<real>0.2199999988079071</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/A%2D12PM.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>1.0499999523162842</real>
<real>1.0499999523162842</real>
<real>1.0499999523162842</real>
<real>0.34999999403953552</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.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.199999809265137</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.00017999998817685992</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>0.80000001192092896</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.47999998927116394</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.69999998807907104</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.18999999761581421</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>1</real>
<real>-4.3711388286737929e-008</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>1605</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.5707963705062866</real>
<key>sunlight_color</key>
<array>
<real>0.7342105507850647</real>
<real>0.78157895803451538</real>
<real>0.89999997615814209</real>
<real>0.29999998211860657</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>1.0499999523162842</real>
<real>1.0499999523162842</real>
<real>1.0499999523162842</real>
<real>0.34999999403953552</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.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.199999809265137</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.00017999998817685992</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>0.80000001192092896</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.47999998927116394</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.69999998807907104</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.18999999761581421</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>1</real>
<real>-4.3711388286737929e-008</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>1605</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.5707963705062866</real>
<key>sunlight_color</key>
<array>
<real>0.7342105507850647</real>
<real>0.78157895803451538</real>
<real>0.89999997615814209</real>
<real>0.29999998211860657</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/A%2D3AM.xml
View File

@@ -1,141 +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.44999116536295314</real>
<real>0.44999854555993368</real>
<real>0.45001013284446073</real>
<real>1</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.26999998092651367</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.8213197608078763e-005</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>3.9999044060931555</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>0.70710653066635132</real>
<real>-0.70710700750350952</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>5.4977874755859375</real>
<key>sunlight_color</key>
<array>
<real>0.60242295265197754</real>
<real>0.61447036266326904</real>
<real>1.1399999856948853</real>
<real>0.37999999523162842</real>
</array>
</map>
</llsd>
<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.44999116536295314</real>
<real>0.44999854555993368</real>
<real>0.45001013284446073</real>
<real>1</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.26999998092651367</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.8213197608078763e-005</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>3.9999044060931555</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>0.70710653066635132</real>
<real>-0.70710700750350952</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>5.4977874755859375</real>
<key>sunlight_color</key>
<array>
<real>0.60242295265197754</real>
<real>0.61447036266326904</real>
<real>1.1399999856948853</real>
<real>0.37999999523162842</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/A%2D3PM.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>1.0499999523162842</real>
<real>1.0499999523162842</real>
<real>1.0499999523162842</real>
<real>0.34999999403953552</real>
</array>
<key>blue_density</key>
<array>
<real>0.2447581488182351</real>
<real>0.44872328639030457</real>
<real>0.75999999046325684</real>
<real>0.38000004053115788</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.49548382097675159</real>
<real>0.49548381382419748</real>
<real>0.63999999284744291</real>
<real>0.31999999642372146</real>
</array>
<key>cloud_color</key>
<array>
<real>0.40999999165535073</real>
<real>0.40999999165535073</real>
<real>0.40999999165535073</real>
<real>0.40999999165535073</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>1.6884100437164307</real>
<real>0.52609699964523315</real>
<real>0.99999999999999289</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.4199999868869746</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>10.199999809265137</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.00017999998817685818</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>0.80000001192093606</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.47999998927116394</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.69999998807907104</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.18999999761581243</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.70710659027099609</real>
<real>-0.70710694789886475</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>1605</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.3561947345733643</real>
<key>sunlight_color</key>
<array>
<real>0.73421055078505759</real>
<real>0.78157895803450828</real>
<real>0.89999997615813498</real>
<real>0.29999998211860301</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>1.0499999523162842</real>
<real>1.0499999523162842</real>
<real>1.0499999523162842</real>
<real>0.34999999403953552</real>
</array>
<key>blue_density</key>
<array>
<real>0.2447581488182351</real>
<real>0.44872328639030457</real>
<real>0.75999999046325684</real>
<real>0.38000004053115788</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.49548382097675159</real>
<real>0.49548381382419748</real>
<real>0.63999999284744291</real>
<real>0.31999999642372146</real>
</array>
<key>cloud_color</key>
<array>
<real>0.40999999165535073</real>
<real>0.40999999165535073</real>
<real>0.40999999165535073</real>
<real>0.40999999165535073</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>1.6884100437164307</real>
<real>0.52609699964523315</real>
<real>0.99999999999999289</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.4199999868869746</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>10.199999809265137</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.00017999998817685818</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>0.80000001192093606</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.47999998927116394</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.69999998807907104</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.18999999761581243</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.70710659027099609</real>
<real>-0.70710694789886475</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>1605</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.3561947345733643</real>
<key>sunlight_color</key>
<array>
<real>0.73421055078505759</real>
<real>0.78157895803450828</real>
<real>0.89999997615813498</real>
<real>0.29999998211860301</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/A%2D6AM.xml
View File

@@ -1,141 +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.15793180465698242</real>
<real>0.43499568104743958</real>
<real>0.87000000476837158</real>
<real>0.87000000476837158</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.00062000000616535544</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>2.6999279499073054</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.0009990693069994</real>
<real>0.0010000000474963411</real>
<real>-0.48000101923815919</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.53999996185302734</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>563</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.369999885559082</real>
<real>2.369999885559082</real>
<real>2.369999885559082</real>
<real>0.78999996185302734</real>
</array>
</map>
</llsd>
<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.15793180465698242</real>
<real>0.43499568104743958</real>
<real>0.87000000476837158</real>
<real>0.87000000476837158</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.00062000000616535544</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>2.6999279499073054</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.0009990693069994</real>
<real>0.0010000000474963411</real>
<real>-0.48000101923815919</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.53999996185302734</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>563</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.369999885559082</real>
<real>2.369999885559082</real>
<real>2.369999885559082</real>
<real>0.78999996185302734</real>
</array>
</map>
</llsd>

284
indra/newview/app_settings/windlight/skies/A%2D6PM.xml
View File

@@ -1,142 +1,142 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>1.0199999809265137</real>
<real>0.80999994277954102</real>
<real>0.80999994277954102</real>
<real>1.0199999809265137</real>
</array>
<key>blue_density</key>
<array>
<real>0.14522500336170197</real>
<real>0.39999699592590332</real>
<real>0.80000197887420654</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.10767599940299988</real>
<real>0.21348699927330017</real>
<real>0.25</real>
<real>1</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.00046000001020729542</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>1</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>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.47999998927116394</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.69999998807907104</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.07532646507024765</real>
<real>-0.99715894460678101</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>562.5</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>3.0661947727203369</real>
<key>sunlight_color</key>
<array>
<real>2.8385701179504395</real>
<real>2.8385701179504395</real>
<real>2.8385701179504395</real>
<real>1</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>1.0199999809265137</real>
<real>0.80999994277954102</real>
<real>0.80999994277954102</real>
<real>1.0199999809265137</real>
</array>
<key>blue_density</key>
<array>
<real>0.14522500336170197</real>
<real>0.39999699592590332</real>
<real>0.80000197887420654</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.10767599940299988</real>
<real>0.21348699927330017</real>
<real>0.25</real>
<real>1</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.00046000001020729542</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>1</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>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.47999998927116394</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.69999998807907104</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.07532646507024765</real>
<real>-0.99715894460678101</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>562.5</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>3.0661947727203369</real>
<key>sunlight_color</key>
<array>
<real>2.8385701179504395</real>
<real>2.8385701179504395</real>
<real>2.8385701179504395</real>
<real>1</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/A%2D9AM.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>1.0499999949065426</real>
<real>1.0499999988079054</real>
<real>1.0499999988079054</real>
<real>0.3500000095367426</real>
</array>
<key>blue_density</key>
<array>
<real>0.15999999642372131</real>
<real>0.44872328639030457</real>
<real>0.75999999046325684</real>
<real>0.75999999046325684</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.53999996185302734</real>
<real>0.47999998927116394</real>
<real>0.69999998807907104</real>
<real>0.34999999403953552</real>
</array>
<key>cloud_color</key>
<array>
<real>0.37000000476837158</real>
<real>0.37000000476837158</real>
<real>0.37000000476837158</real>
<real>0.37000000476837158</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>1.6884100437164307</real>
<real>0.52609699964523315</real>
<real>0.99999998569455784</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.41999997615814166</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>10.199999844956437</real>
<real>10.01099967956543</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.27333331108093262</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00017999998102430359</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>0.80000008344649842</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.9999999284740397</real>
<real>0.0010000000474974513</real>
<real>-0.47999999046327346</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.70000003576435432</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.18999999284767277</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.70710676908493042</real>
<real>0.70710676908493042</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>1605</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.78539818525314331</real>
<key>sunlight_color</key>
<array>
<real>0.73421054104441197</real>
<real>0.7815789463510896</real>
<real>0.89999995470046912</real>
<real>0.29999997496605069</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>1.0499999949065426</real>
<real>1.0499999988079054</real>
<real>1.0499999988079054</real>
<real>0.3500000095367426</real>
</array>
<key>blue_density</key>
<array>
<real>0.15999999642372131</real>
<real>0.44872328639030457</real>
<real>0.75999999046325684</real>
<real>0.75999999046325684</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.53999996185302734</real>
<real>0.47999998927116394</real>
<real>0.69999998807907104</real>
<real>0.34999999403953552</real>
</array>
<key>cloud_color</key>
<array>
<real>0.37000000476837158</real>
<real>0.37000000476837158</real>
<real>0.37000000476837158</real>
<real>0.37000000476837158</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>1.6884100437164307</real>
<real>0.52609699964523315</real>
<real>0.99999998569455784</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.41999997615814166</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>10.199999844956437</real>
<real>10.01099967956543</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.27333331108093262</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00017999998102430359</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>0.80000008344649842</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.9999999284740397</real>
<real>0.0010000000474974513</real>
<real>-0.47999999046327346</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.70000003576435432</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.18999999284767277</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.70710676908493042</real>
<real>0.70710676908493042</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>1605</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.78539818525314331</real>
<key>sunlight_color</key>
<array>
<real>0.73421054104441197</real>
<real>0.7815789463510896</real>
<real>0.89999995470046912</real>
<real>0.29999997496605069</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/A%2D9PM.xml
View File

@@ -1,141 +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.44999116536295314</real>
<real>0.44999854555993368</real>
<real>0.45001013284446073</real>
<real>1</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.26999998092651367</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.8213197608078763e-005</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>3.9999044060931555</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>0.70710688829421997</real>
<real>0.70710664987564087</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>3.9269909858703613</real>
<key>sunlight_color</key>
<array>
<real>0.34878980098432066</real>
<real>0.35576509414380553</real>
<real>0.66003586768772493</real>
<real>0.22001197576412324</real>
</array>
</map>
</llsd>
<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.44999116536295314</real>
<real>0.44999854555993368</real>
<real>0.45001013284446073</real>
<real>1</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.26999998092651367</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.8213197608078763e-005</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>3.9999044060931555</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>0.70710688829421997</real>
<real>0.70710664987564087</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>3.9269909858703613</real>
<key>sunlight_color</key>
<array>
<real>0.34878980098432066</real>
<real>0.35576509414380553</real>
<real>0.66003586768772493</real>
<real>0.22001197576412324</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Barcelona.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.22260047495365143</real>
<real>0.26450866460800171</real>
<real>0.35999998450279236</real>
<real>0.11999999731779099</real>
</array>
<key>blue_density</key>
<array>
<real>0.14522500336170197</real>
<real>0.39999699592590332</real>
<real>0.80000197887420654</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.15130999684333801</real>
<real>0.30000001192092896</real>
<real>0.35131001472473145</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.50999999046325684</real>
<real>0.50999999046325684</real>
<real>0.50999999046325684</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.125</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.41999998688697815</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>10.49940013885498</real>
<real>10.01099967956543</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.30000001192092896</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.0003499999875202775</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>6</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.33000001311302185</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.69999998807907104</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.062790460884571075</real>
<real>-0.99802672863006592</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>600</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>21</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>3.0787608623504639</real>
<key>sunlight_color</key>
<array>
<real>1.1699999570846558</real>
<real>1.1699999570846558</real>
<real>1.1699999570846558</real>
<real>0.38999998569488525</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.22260047495365143</real>
<real>0.26450866460800171</real>
<real>0.35999998450279236</real>
<real>0.11999999731779099</real>
</array>
<key>blue_density</key>
<array>
<real>0.14522500336170197</real>
<real>0.39999699592590332</real>
<real>0.80000197887420654</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.15130999684333801</real>
<real>0.30000001192092896</real>
<real>0.35131001472473145</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.50999999046325684</real>
<real>0.50999999046325684</real>
<real>0.50999999046325684</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.125</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.41999998688697815</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>10.49940013885498</real>
<real>10.01099967956543</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.30000001192092896</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.0003499999875202775</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>6</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.33000001311302185</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.69999998807907104</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.062790460884571075</real>
<real>-0.99802672863006592</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>600</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>21</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>3.0787608623504639</real>
<key>sunlight_color</key>
<array>
<real>1.1699999570846558</real>
<real>1.1699999570846558</real>
<real>1.1699999570846558</real>
<real>0.38999998569488525</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Blizzard.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.4823022186756134</real>
<real>0.57310229539871216</real>
<real>0.77999997138977051</real>
<real>0.25999999046325684</real>
</array>
<key>blue_density</key>
<array>
<real>0.14522500336170197</real>
<real>0.39999699592590332</real>
<real>0.80000197887420654</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.15130999684333801</real>
<real>0.30000001192092896</real>
<real>0.35131001472473145</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.12862999737262726</real>
<real>0.12862999737262726</real>
<real>0.12862999737262726</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.88419097661972046</real>
<real>0.53047597408294678</real>
<real>0.4270470142364502</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.38419300317764282</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</real>
<real>10</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.61711597442626953</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.0001250890054507181</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>11.40000057220459</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>6.4079799652099609</real>
<real>0.0012815999798476696</real>
<real>-0.42292699217796326</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.21744099259376526</real>
<real>0.21744099259376526</real>
<real>0.21744099259376526</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.15643447637557983</real>
<real>0.98768836259841919</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>4000</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>2</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>0.15707963705062866</real>
<key>sunlight_color</key>
<array>
<real>3</real>
<real>3</real>
<real>3</real>
<real>1</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.4823022186756134</real>
<real>0.57310229539871216</real>
<real>0.77999997138977051</real>
<real>0.25999999046325684</real>
</array>
<key>blue_density</key>
<array>
<real>0.14522500336170197</real>
<real>0.39999699592590332</real>
<real>0.80000197887420654</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.15130999684333801</real>
<real>0.30000001192092896</real>
<real>0.35131001472473145</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.12862999737262726</real>
<real>0.12862999737262726</real>
<real>0.12862999737262726</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.88419097661972046</real>
<real>0.53047597408294678</real>
<real>0.4270470142364502</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.38419300317764282</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</real>
<real>10</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.61711597442626953</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.0001250890054507181</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>11.40000057220459</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>6.4079799652099609</real>
<real>0.0012815999798476696</real>
<real>-0.42292699217796326</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.21744099259376526</real>
<real>0.21744099259376526</real>
<real>0.21744099259376526</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.15643447637557983</real>
<real>0.98768836259841919</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>4000</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>2</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>0.15707963705062866</real>
<key>sunlight_color</key>
<array>
<real>3</real>
<real>3</real>
<real>3</real>
<real>1</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Blue%20Midday.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.14999999105930328</real>
<real>0.14999999105930328</real>
<real>0.14999999105930328</real>
<real>0.049999997019767761</real>
</array>
<key>blue_density</key>
<array>
<real>0.18153078854084015</real>
<real>0.49999505281448364</real>
<real>1</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.43070217967033386</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.0003499999875202775</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>2.9846153259277344</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.2061538696289062</real>
<real>0.0010000000474974513</real>
<real>-0.44246155023574829</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>2.8830769062042236</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.49740666151046753</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.86074197292327881</real>
<real>-0.50904154777526855</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>600</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>2.1048672199249268</real>
<key>sunlight_color</key>
<array>
<real>0.88526362180709839</real>
<real>1.2300000190734863</real>
<real>1.2300000190734863</real>
<real>0.40999999642372131</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.14999999105930328</real>
<real>0.14999999105930328</real>
<real>0.14999999105930328</real>
<real>0.049999997019767761</real>
</array>
<key>blue_density</key>
<array>
<real>0.18153078854084015</real>
<real>0.49999505281448364</real>
<real>1</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.43070217967033386</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.0003499999875202775</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>2.9846153259277344</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.2061538696289062</real>
<real>0.0010000000474974513</real>
<real>-0.44246155023574829</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>2.8830769062042236</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.49740666151046753</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.86074197292327881</real>
<real>-0.50904154777526855</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>600</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>2.1048672199249268</real>
<key>sunlight_color</key>
<array>
<real>0.88526362180709839</real>
<real>1.2300000190734863</real>
<real>1.2300000190734863</real>
<real>0.40999999642372131</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Coastal%20Afternoon.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.89040267467498779</real>
<real>1.0580335855484009</real>
<real>1.4399999380111694</real>
<real>0.47999998927116394</real>
</array>
<key>blue_density</key>
<array>
<real>0.14522500336170197</real>
<real>0.39999699592590332</real>
<real>0.80000197887420654</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.15130999684333801</real>
<real>0.30000001192092896</real>
<real>0.35131001472473145</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.21396400034427643</real>
<real>0.21396400034427643</real>
<real>0.21396400034427643</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.16495099663734436</real>
<real>0.09771379828453064</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.079754598438739777</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>9.644780158996582</real>
<real>10.423800468444824</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.30061298608779907</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00015800200344529003</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>1</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>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>0.69999998807907104</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.13210900127887726</real>
<real>0.13210900127887726</real>
<real>0.13210900127887726</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.031410444527864456</real>
<real>-0.99950659275054932</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>600</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>3</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>3.1101770401000977</real>
<key>sunlight_color</key>
<array>
<real>3</real>
<real>3</real>
<real>3</real>
<real>1</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.89040267467498779</real>
<real>1.0580335855484009</real>
<real>1.4399999380111694</real>
<real>0.47999998927116394</real>
</array>
<key>blue_density</key>
<array>
<real>0.14522500336170197</real>
<real>0.39999699592590332</real>
<real>0.80000197887420654</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.15130999684333801</real>
<real>0.30000001192092896</real>
<real>0.35131001472473145</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.21396400034427643</real>
<real>0.21396400034427643</real>
<real>0.21396400034427643</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.16495099663734436</real>
<real>0.09771379828453064</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.079754598438739777</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>9.644780158996582</real>
<real>10.423800468444824</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.30061298608779907</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00015800200344529003</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>1</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>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>0.69999998807907104</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.13210900127887726</real>
<real>0.13210900127887726</real>
<real>0.13210900127887726</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.031410444527864456</real>
<real>-0.99950659275054932</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>600</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>3</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>3.1101770401000977</real>
<key>sunlight_color</key>
<array>
<real>3</real>
<real>3</real>
<real>3</real>
<real>1</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Coastal%20Sunset.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.31535112857818604</real>
<real>0.37471914291381836</real>
<real>0.50999999046325684</real>
<real>0.17000000178813934</real>
</array>
<key>blue_density</key>
<array>
<real>0.11645399779081345</real>
<real>0.32075101137161255</real>
<real>0.64150899648666382</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.054176401346921921</real>
<real>0.10741499811410904</real>
<real>0.12578600645065308</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.21396400034427643</real>
<real>0.21396400034427643</real>
<real>0.21396400034427643</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.27044001221656799</real>
<real>1</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.10062900185585022</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>9.644780158996582</real>
<real>10.423800468444824</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.32704401016235352</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00015849100600462407</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>3.4000000953674316</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>1</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>6.867919921875</real>
<real>0.0013735899701714516</real>
<real>-0.45328301191329956</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.6792449951171875</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.13210900127887726</real>
<real>0.13210900127887726</real>
<real>0.13210900127887726</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.031410444527864456</real>
<real>-0.99950659275054932</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>1308.1800537109375</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>5</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>3.1101770401000977</real>
<key>sunlight_color</key>
<array>
<real>3</real>
<real>3</real>
<real>3</real>
<real>1</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.31535112857818604</real>
<real>0.37471914291381836</real>
<real>0.50999999046325684</real>
<real>0.17000000178813934</real>
</array>
<key>blue_density</key>
<array>
<real>0.11645399779081345</real>
<real>0.32075101137161255</real>
<real>0.64150899648666382</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.054176401346921921</real>
<real>0.10741499811410904</real>
<real>0.12578600645065308</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.21396400034427643</real>
<real>0.21396400034427643</real>
<real>0.21396400034427643</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.27044001221656799</real>
<real>1</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.10062900185585022</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>9.644780158996582</real>
<real>10.423800468444824</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.32704401016235352</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00015849100600462407</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>3.4000000953674316</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>1</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>6.867919921875</real>
<real>0.0013735899701714516</real>
<real>-0.45328301191329956</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.6792449951171875</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.13210900127887726</real>
<real>0.13210900127887726</real>
<real>0.13210900127887726</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.031410444527864456</real>
<real>-0.99950659275054932</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>1308.1800537109375</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>5</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>3.1101770401000977</real>
<key>sunlight_color</key>
<array>
<real>3</real>
<real>3</real>
<real>3</real>
<real>1</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Default.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>1.0499999523162842</real>
<real>1.0499999523162842</real>
<real>1.0499999523162842</real>
<real>0.34999999403953552</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.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.199999809265137</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.00017999998817685992</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>0.80000001192092896</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.47999998927116394</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.69999998807907104</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.18999999761581421</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>1605</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>0.7342105507850647</real>
<real>0.78157895803451538</real>
<real>0.89999997615814209</real>
<real>0.29999998211860657</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>1.0499999523162842</real>
<real>1.0499999523162842</real>
<real>1.0499999523162842</real>
<real>0.34999999403953552</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.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.199999809265137</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.00017999998817685992</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>0.80000001192092896</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.47999998927116394</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.69999998807907104</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.18999999761581421</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>1605</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>0.7342105507850647</real>
<real>0.78157895803451538</real>
<real>0.89999997615814209</real>
<real>0.29999998211860657</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Desert%20Sunset.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.07420019805431366</real>
<real>0.088169597089290619</real>
<real>0.11999999731779099</real>
<real>1</real>
</array>
<key>blue_density</key>
<array>
<real>0.14522500336170197</real>
<real>0.39999699592590332</real>
<real>0.80000197887420654</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.10767599940299988</real>
<real>0.21348699927330017</real>
<real>0.25</real>
<real>1</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>1</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.199999809265137</real>
<real>10.01099967956543</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.37999999523162842</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00046000001020729542</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>2</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>1.6100000143051147</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>5</real>
<real>0.0010000000474974513</real>
<real>-0.47999998927116394</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.69999998807907104</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.062790460884571075</real>
<real>-0.99802672863006592</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>562.5</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>3.0787608623504639</real>
<key>sunlight_color</key>
<array>
<real>2.8385701179504395</real>
<real>2.8385701179504395</real>
<real>2.8385701179504395</real>
<real>1</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.07420019805431366</real>
<real>0.088169597089290619</real>
<real>0.11999999731779099</real>
<real>1</real>
</array>
<key>blue_density</key>
<array>
<real>0.14522500336170197</real>
<real>0.39999699592590332</real>
<real>0.80000197887420654</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.10767599940299988</real>
<real>0.21348699927330017</real>
<real>0.25</real>
<real>1</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>1</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.199999809265137</real>
<real>10.01099967956543</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.37999999523162842</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00046000001020729542</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>2</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>1.6100000143051147</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>5</real>
<real>0.0010000000474974513</real>
<real>-0.47999998927116394</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.69999998807907104</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.062790460884571075</real>
<real>-0.99802672863006592</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>562.5</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>3.0787608623504639</real>
<key>sunlight_color</key>
<array>
<real>2.8385701179504395</real>
<real>2.8385701179504395</real>
<real>2.8385701179504395</real>
<real>1</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Fine%20Day.xml
View File

@@ -1,141 +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>
<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>

282
indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.029999999329447746</real>
<real>0</real>
<real>0</real>
<real>0.029999999329447746</real>
</array>
<key>blue_density</key>
<array>
<real>0.097999997437000275</real>
<real>0.2800000011920929</real>
<real>1</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.11999999731779099</real>
<real>0.35094299912452698</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.48999997973442078</real>
<real>0.79000002145767212</real>
<real>0.80000001192092896</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.53999996185302734</real>
<real>0.5</real>
<real>0.75999999046325684</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.38999998569488525</real>
<real>0.5</real>
<real>0.039999999105930328</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.43999999761581421</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>11.809999465942383</real>
<real>12.799999237060547</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.32999998331069946</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00021999998716637492</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>4</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>3.2044246196746826</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>1.5399999618530273</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>3.8000010331979865</real>
<real>0.001000000059761974</real>
<real>-0.49999996688498527</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.20999999344348907</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.049999997019767761</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0.056814663112163544</real>
<real>0.42577928304672241</real>
<real>-0.90304160118103027</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>676.10003662109375</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>18</integer>
<key>star_brightness</key>
<real>0.44999998807907104</real>
<key>sun_angle</key>
<real>0.4398229718208313</real>
<key>sunlight_color</key>
<array>
<real>1.7999999523162842</real>
<real>1.4099999666213989</real>
<real>1.0199999809265137</real>
<real>1.7999999523162842</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.029999999329447746</real>
<real>0</real>
<real>0</real>
<real>0.029999999329447746</real>
</array>
<key>blue_density</key>
<array>
<real>0.097999997437000275</real>
<real>0.2800000011920929</real>
<real>1</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.11999999731779099</real>
<real>0.35094299912452698</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.48999997973442078</real>
<real>0.79000002145767212</real>
<real>0.80000001192092896</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.53999996185302734</real>
<real>0.5</real>
<real>0.75999999046325684</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.38999998569488525</real>
<real>0.5</real>
<real>0.039999999105930328</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.43999999761581421</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>11.809999465942383</real>
<real>12.799999237060547</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.32999998331069946</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00021999998716637492</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>4</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>3.2044246196746826</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>1.5399999618530273</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>3.8000010331979865</real>
<real>0.001000000059761974</real>
<real>-0.49999996688498527</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.20999999344348907</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.049999997019767761</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0.056814663112163544</real>
<real>0.42577928304672241</real>
<real>-0.90304160118103027</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>676.10003662109375</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>18</integer>
<key>star_brightness</key>
<real>0.44999998807907104</real>
<key>sun_angle</key>
<real>0.4398229718208313</real>
<key>sunlight_color</key>
<array>
<real>1.7999999523162842</real>
<real>1.4099999666213989</real>
<real>1.0199999809265137</real>
<real>1.7999999523162842</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Foggy.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.32999998331069946</real>
<real>0.32999998331069946</real>
<real>0.32999998331069946</real>
<real>0.10999999940395355</real>
</array>
<key>blue_density</key>
<array>
<real>0.14522500336170197</real>
<real>0.39999699592590332</real>
<real>0.80000197887420654</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.43070214986801147</real>
<real>0.85394668579101563</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.69999998807907104</real>
<real>0.69999998807907104</real>
<real>0.69999998807907104</real>
<real>0.69999998807907104</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.53999996185302734</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.125</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.29999998211860657</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>10.49940013885498</real>
<real>10.01099967956543</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.39999997615814209</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.0003499999875202775</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>4</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>3.7999999523162842</real>
<real>0.0010000000474974513</real>
<real>-0.5</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.64999997615814209</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>1</real>
<real>-4.3711388286737929e-008</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>600</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>18</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>1.5707963705062866</real>
<key>sunlight_color</key>
<array>
<real>0.53999996185302734</real>
<real>0.53999996185302734</real>
<real>0.53999996185302734</real>
<real>0.17999999225139618</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.32999998331069946</real>
<real>0.32999998331069946</real>
<real>0.32999998331069946</real>
<real>0.10999999940395355</real>
</array>
<key>blue_density</key>
<array>
<real>0.14522500336170197</real>
<real>0.39999699592590332</real>
<real>0.80000197887420654</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.43070214986801147</real>
<real>0.85394668579101563</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.69999998807907104</real>
<real>0.69999998807907104</real>
<real>0.69999998807907104</real>
<real>0.69999998807907104</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.53999996185302734</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.125</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.29999998211860657</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>10.49940013885498</real>
<real>10.01099967956543</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.39999997615814209</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.0003499999875202775</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>4</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>3.7999999523162842</real>
<real>0.0010000000474974513</real>
<real>-0.5</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.64999997615814209</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>1</real>
<real>-4.3711388286737929e-008</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>600</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>18</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>1.5707963705062866</real>
<key>sunlight_color</key>
<array>
<real>0.53999996185302734</real>
<real>0.53999996185302734</real>
<real>0.53999996185302734</real>
<real>0.17999999225139618</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Funky%20Funky%20Funky.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.29999998211860657</real>
<real>0.23511900007724762</real>
<real>0.31999999284744263</real>
<real>1</real>
</array>
<key>blue_density</key>
<array>
<real>0.13977900147438049</real>
<real>0.38499599695205688</real>
<real>0.76999998092651367</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.18999999761581421</real>
<real>0.18999999761581421</real>
<real>0.18999999761581421</real>
<real>1</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>5.3780298233032227</real>
<real>1.9675600528717041</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>5.3780298233032227</real>
<real>1.9675600528717041</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.739999771118164</real>
<real>10.600000381469727</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.31000000238418579</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00052000000141561031</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>3.4000000953674316</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>0.77999997138977051</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>5</real>
<real>0.0010000000474974513</real>
<real>-0.47999998927116394</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>1.1000000238418579</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.12999999523162842</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.53582650423049927</real>
<real>-0.84432810544967651</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>656.20001220703125</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>28</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>2.5761063098907471</real>
<key>sunlight_color</key>
<array>
<real>2.1299998760223389</real>
<real>1.5299999713897705</real>
<real>2.8385701179504395</real>
<real>1</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.29999998211860657</real>
<real>0.23511900007724762</real>
<real>0.31999999284744263</real>
<real>1</real>
</array>
<key>blue_density</key>
<array>
<real>0.13977900147438049</real>
<real>0.38499599695205688</real>
<real>0.76999998092651367</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.18999999761581421</real>
<real>0.18999999761581421</real>
<real>0.18999999761581421</real>
<real>1</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>5.3780298233032227</real>
<real>1.9675600528717041</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>5.3780298233032227</real>
<real>1.9675600528717041</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.739999771118164</real>
<real>10.600000381469727</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.31000000238418579</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00052000000141561031</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>3.4000000953674316</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>0.77999997138977051</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>5</real>
<real>0.0010000000474974513</real>
<real>-0.47999998927116394</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>1.1000000238418579</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.12999999523162842</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.53582650423049927</real>
<real>-0.84432810544967651</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>656.20001220703125</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>28</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>2.5761063098907471</real>
<key>sunlight_color</key>
<array>
<real>2.1299998760223389</real>
<real>1.5299999713897705</real>
<real>2.8385701179504395</real>
<real>1</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Funky%20Funky.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.32999998331069946</real>
<real>0.32999998331069946</real>
<real>0.32999998331069946</real>
<real>0.10999999940395355</real>
</array>
<key>blue_density</key>
<array>
<real>0.14522500336170197</real>
<real>0.39999699592590332</real>
<real>0.80000197887420654</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.15130999684333801</real>
<real>0.30000001192092896</real>
<real>0.35131001472473145</real>
<real>1</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>0.65280699729919434</real>
<real>0.50335597991943359</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.65280699729919434</real>
<real>0.50335597991943359</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.33064401149749756</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.0003499999875202775</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>1</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>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>0.69999998807907104</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.062790460884571075</real>
<real>-0.99802672863006592</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>600</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>11</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>3.0787608623504639</real>
<key>sunlight_color</key>
<array>
<real>0.86811381578445435</real>
<real>2.2200000286102295</real>
<real>2.2200000286102295</real>
<real>0.74000000953674316</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.32999998331069946</real>
<real>0.32999998331069946</real>
<real>0.32999998331069946</real>
<real>0.10999999940395355</real>
</array>
<key>blue_density</key>
<array>
<real>0.14522500336170197</real>
<real>0.39999699592590332</real>
<real>0.80000197887420654</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.15130999684333801</real>
<real>0.30000001192092896</real>
<real>0.35131001472473145</real>
<real>1</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>0.65280699729919434</real>
<real>0.50335597991943359</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.65280699729919434</real>
<real>0.50335597991943359</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.33064401149749756</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.0003499999875202775</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>1</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>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>0.69999998807907104</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.062790460884571075</real>
<real>-0.99802672863006592</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>600</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>11</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>3.0787608623504639</real>
<key>sunlight_color</key>
<array>
<real>0.86811381578445435</real>
<real>2.2200000286102295</real>
<real>2.2200000286102295</real>
<real>0.74000000953674316</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Gelatto.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0</real>
<real>0.15999999642372131</real>
<real>0</real>
<real>0.15999999642372131</real>
</array>
<key>blue_density</key>
<array>
<real>0.019999999552965164</real>
<real>0.22999770939350128</real>
<real>0.45999997854232788</real>
<real>0.55000001192092896</real>
</array>
<key>blue_horizon</key>
<array>
<real>0</real>
<real>0.6319204568862915</real>
<real>0.74000000953674316</real>
<real>0.84999996423721313</real>
</array>
<key>cloud_color</key>
<array>
<real>1</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.53999996185302734</real>
<real>0.50999999046325684</real>
<real>0.23999999463558197</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.059999998658895493</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.2800000011920929</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>20</real>
<real>20</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.32999998331069946</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00016999999934341758</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>8.1000003814697266</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>3.7699110507965088</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>0</boolean>
<boolean>0</boolean>
</array>
<key>gamma</key>
<array>
<real>1.5399999618530273</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>0.39999961853027344</real>
<real>0.0010000000474974513</real>
<real>-0.49999997019767761</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>3.2599999904632568</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.4699999988079071</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0.58749508857727051</real>
<real>-0.031410761177539825</real>
<real>-0.80861783027648926</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>1267.5999755859375</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>18</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>-0.031415928155183792</real>
<key>sunlight_color</key>
<array>
<real>0.75</real>
<real>0.71999996900558472</real>
<real>0.37800011038780212</real>
<real>0.80999994277954102</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0</real>
<real>0.15999999642372131</real>
<real>0</real>
<real>0.15999999642372131</real>
</array>
<key>blue_density</key>
<array>
<real>0.019999999552965164</real>
<real>0.22999770939350128</real>
<real>0.45999997854232788</real>
<real>0.55000001192092896</real>
</array>
<key>blue_horizon</key>
<array>
<real>0</real>
<real>0.6319204568862915</real>
<real>0.74000000953674316</real>
<real>0.84999996423721313</real>
</array>
<key>cloud_color</key>
<array>
<real>1</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.53999996185302734</real>
<real>0.50999999046325684</real>
<real>0.23999999463558197</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.059999998658895493</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.2800000011920929</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>20</real>
<real>20</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.32999998331069946</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00016999999934341758</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>8.1000003814697266</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>3.7699110507965088</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>0</boolean>
<boolean>0</boolean>
</array>
<key>gamma</key>
<array>
<real>1.5399999618530273</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>0.39999961853027344</real>
<real>0.0010000000474974513</real>
<real>-0.49999997019767761</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>3.2599999904632568</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.4699999988079071</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0.58749508857727051</real>
<real>-0.031410761177539825</real>
<real>-0.80861783027648926</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>1267.5999755859375</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>18</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>-0.031415928155183792</real>
<key>sunlight_color</key>
<array>
<real>0.75</real>
<real>0.71999996900558472</real>
<real>0.37800011038780212</real>
<real>0.80999994277954102</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Ghost.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.23999999463558197</real>
<real>0.23999999463558197</real>
<real>0.23999999463558197</real>
<real>0.079999998211860657</real>
</array>
<key>blue_density</key>
<array>
<real>0.16700799763202667</real>
<real>0.45999500155448914</real>
<real>0.92000001668930054</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.18089599907398224</real>
<real>0.35865798592567444</real>
<real>0.41999998688697815</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.40999999642372131</real>
<real>0.40999999642372131</real>
<real>0.40999999642372131</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.125</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.41999998688697815</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>11.539999961853027</real>
<real>10.01099967956543</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.36000001430511475</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00042999998549930751</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>8.1000003814697266</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>1</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>5</real>
<real>0.0010000000474974513</real>
<real>-0.51999998092651367</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.75</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.18000000715255737</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.89100658893585205</real>
<real>0.45399042963981628</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>718.70001220703125</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>23</integer>
<key>star_brightness</key>
<real>2</real>
<key>sun_angle</key>
<real>1.0995575189590454</real>
<key>sunlight_color</key>
<array>
<real>0.33000001311302185</real>
<real>0.33000001311302185</real>
<real>0.33000001311302185</real>
<real>1</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.23999999463558197</real>
<real>0.23999999463558197</real>
<real>0.23999999463558197</real>
<real>0.079999998211860657</real>
</array>
<key>blue_density</key>
<array>
<real>0.16700799763202667</real>
<real>0.45999500155448914</real>
<real>0.92000001668930054</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.18089599907398224</real>
<real>0.35865798592567444</real>
<real>0.41999998688697815</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.40999999642372131</real>
<real>0.40999999642372131</real>
<real>0.40999999642372131</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.125</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.41999998688697815</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>11.539999961853027</real>
<real>10.01099967956543</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.36000001430511475</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00042999998549930751</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>8.1000003814697266</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>1</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>5</real>
<real>0.0010000000474974513</real>
<real>-0.51999998092651367</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.75</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.18000000715255737</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.89100658893585205</real>
<real>0.45399042963981628</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>718.70001220703125</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>23</integer>
<key>star_brightness</key>
<real>2</real>
<key>sun_angle</key>
<real>1.0995575189590454</real>
<key>sunlight_color</key>
<array>
<real>0.33000001311302185</real>
<real>0.33000001311302185</real>
<real>0.33000001311302185</real>
<real>1</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Incongruent%20Truths.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0</real>
<real>0</real>
<real>0.44999998807907104</real>
<real>0.44999998807907104</real>
</array>
<key>blue_density</key>
<array>
<real>0.13997539444089213</real>
<real>0.38665792478461469</real>
<real>0.77332294252195766</real>
<real>0.95108884837904384</real>
</array>
<key>blue_horizon</key>
<array>
<real>0</real>
<real>0.22876684367656708</real>
<real>0.290018230676651</real>
<real>0.31999999284744263</real>
</array>
<key>cloud_color</key>
<array>
<real>0.25999999046325684</real>
<real>0.28883209824562073</real>
<real>0.28994369506835938</real>
<real>0.28999999165534973</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.17999999225139618</real>
<real>0.50999999046325684</real>
<real>0.91999995708465576</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.079999998211860657</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.25</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>10.436104517528292</real>
<real>10</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.34000000357627869</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.0002899999963119626</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>1.3000000715255737</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>2.2619466781616211</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>1.5399999618530273</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>4.0000009536743164</real>
<real>0.0010000000474974513</real>
<real>-0.74999994039535522</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.12999999523162842</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.14999999105930328</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>-0.74630612134933472</real>
<real>0.24868990480899811</real>
<real>-0.61739814281463623</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>394.39999389648437</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>18</integer>
<key>star_brightness</key>
<real>0.44999998807907104</real>
<key>sun_angle</key>
<real>0.25132742524147034</real>
<key>sunlight_color</key>
<array>
<real>2.25</real>
<real>1.957500696182251</real>
<real>1.170000433921814</real>
<real>0.75</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0</real>
<real>0</real>
<real>0.44999998807907104</real>
<real>0.44999998807907104</real>
</array>
<key>blue_density</key>
<array>
<real>0.13997539444089213</real>
<real>0.38665792478461469</real>
<real>0.77332294252195766</real>
<real>0.95108884837904384</real>
</array>
<key>blue_horizon</key>
<array>
<real>0</real>
<real>0.22876684367656708</real>
<real>0.290018230676651</real>
<real>0.31999999284744263</real>
</array>
<key>cloud_color</key>
<array>
<real>0.25999999046325684</real>
<real>0.28883209824562073</real>
<real>0.28994369506835938</real>
<real>0.28999999165534973</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.17999999225139618</real>
<real>0.50999999046325684</real>
<real>0.91999995708465576</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.079999998211860657</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.25</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>10.436104517528292</real>
<real>10</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.34000000357627869</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.0002899999963119626</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>1.3000000715255737</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>2.2619466781616211</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>1.5399999618530273</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>4.0000009536743164</real>
<real>0.0010000000474974513</real>
<real>-0.74999994039535522</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.12999999523162842</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.14999999105930328</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>-0.74630612134933472</real>
<real>0.24868990480899811</real>
<real>-0.61739814281463623</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>394.39999389648437</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>18</integer>
<key>star_brightness</key>
<real>0.44999998807907104</real>
<key>sun_angle</key>
<real>0.25132742524147034</real>
<key>sunlight_color</key>
<array>
<real>2.25</real>
<real>1.957500696182251</real>
<real>1.170000433921814</real>
<real>0.75</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Midday%201.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>1.0499999523162842</real>
<real>1.0499999523162842</real>
<real>1.0499999523162842</real>
<real>0.34999999403953552</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.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.199999809265137</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.00017999998817685992</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>0.80000001192092896</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.47999998927116394</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.69999998807907104</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.18999999761581421</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>1605</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>0.7342105507850647</real>
<real>0.78157895803451538</real>
<real>0.89999997615814209</real>
<real>0.29999998211860657</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>1.0499999523162842</real>
<real>1.0499999523162842</real>
<real>1.0499999523162842</real>
<real>0.34999999403953552</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.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.199999809265137</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.00017999998817685992</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>0.80000001192092896</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.47999998927116394</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.69999998807907104</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.18999999761581421</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>1605</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>0.7342105507850647</real>
<real>0.78157895803451538</real>
<real>0.89999997615814209</real>
<real>0.29999998211860657</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Midday%202.xml
View File

@@ -1,141 +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.14522500336170197</real>
<real>0.39999699592590332</real>
<real>0.80000197887420654</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.43070214986801147</real>
<real>0.85394668579101563</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.69999998807907104</real>
<real>0.69999998807907104</real>
<real>0.69999998807907104</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.53999996185302734</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.125</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.29999998211860657</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>10.199999809265137</real>
<real>10.069999694824219</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.22999998927116394</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.0003499999875202775</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.6100000143051147</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>3.7999999523162842</real>
<real>0.0010000000474974513</real>
<real>-0.5</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.69999998807907104</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.41999998688697815</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>1</real>
<real>-4.3711388286737929e-008</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>600</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>-1163005939</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>1.5707963705062866</real>
<key>sunlight_color</key>
<array>
<real>0.80999994277954102</real>
<real>0.80999994277954102</real>
<real>0.80999994277954102</real>
<real>0.26999998092651367</real>
</array>
</map>
</llsd>
<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.14522500336170197</real>
<real>0.39999699592590332</real>
<real>0.80000197887420654</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.43070214986801147</real>
<real>0.85394668579101563</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.69999998807907104</real>
<real>0.69999998807907104</real>
<real>0.69999998807907104</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.53999996185302734</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.125</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.29999998211860657</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>10.199999809265137</real>
<real>10.069999694824219</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.22999998927116394</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.0003499999875202775</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.6100000143051147</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>3.7999999523162842</real>
<real>0.0010000000474974513</real>
<real>-0.5</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.69999998807907104</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.41999998688697815</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>1</real>
<real>-4.3711388286737929e-008</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>600</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>-1163005939</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>1.5707963705062866</real>
<key>sunlight_color</key>
<array>
<real>0.80999994277954102</real>
<real>0.80999994277954102</real>
<real>0.80999994277954102</real>
<real>0.26999998092651367</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Midday%203.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.33000001311302185</real>
<real>0.33000001311302185</real>
<real>0.33000001311302185</real>
<real>1</real>
</array>
<key>blue_density</key>
<array>
<real>0.16449999809265137</real>
<real>0.4699999988079071</real>
<real>0.93999999761581421</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.17547200620174408</real>
<real>0.35094299912452698</real>
<real>0.62000000476837158</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.5899999737739563</real>
<real>0.79000002145767212</real>
<real>0.80000001192092896</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>2.8148899078369141</real>
<real>5.6909198760986328</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>5.9584097862243652</real>
<real>6.9909601211547852</real>
<real>0.070000000298023224</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>9.9300003051757813</real>
<real>10.199999809265137</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.00039000000106170774</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.6100000143051147</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>5</real>
<real>0.0010000000474974513</real>
<real>-1.1599999666213989</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.20999999344348907</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</real>
<real>1</real>
<real>-4.3711388286737929e-008</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>2250</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>24</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>1.5707963705062866</real>
<key>sunlight_color</key>
<array>
<real>1.2599999904632568</real>
<real>1.2599999904632568</real>
<real>1.2599999904632568</real>
<real>1</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.33000001311302185</real>
<real>0.33000001311302185</real>
<real>0.33000001311302185</real>
<real>1</real>
</array>
<key>blue_density</key>
<array>
<real>0.16449999809265137</real>
<real>0.4699999988079071</real>
<real>0.93999999761581421</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.17547200620174408</real>
<real>0.35094299912452698</real>
<real>0.62000000476837158</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.5899999737739563</real>
<real>0.79000002145767212</real>
<real>0.80000001192092896</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>2.8148899078369141</real>
<real>5.6909198760986328</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>5.9584097862243652</real>
<real>6.9909601211547852</real>
<real>0.070000000298023224</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>9.9300003051757813</real>
<real>10.199999809265137</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.00039000000106170774</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.6100000143051147</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>5</real>
<real>0.0010000000474974513</real>
<real>-1.1599999666213989</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.20999999344348907</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</real>
<real>1</real>
<real>-4.3711388286737929e-008</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>2250</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>24</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>1.5707963705062866</real>
<key>sunlight_color</key>
<array>
<real>1.2599999904632568</real>
<real>1.2599999904632568</real>
<real>1.2599999904632568</real>
<real>1</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Midday%204.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.33000001311302185</real>
<real>0.33000001311302185</real>
<real>0.33000001311302185</real>
<real>1</real>
</array>
<key>blue_density</key>
<array>
<real>0.097999997437000275</real>
<real>0.2800000011920929</real>
<real>0.56000000238418579</real>
<real>0.56000000238418579</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.17547200620174408</real>
<real>0.35094299912452698</real>
<real>0.61000001430511475</real>
<real>0.61000001430511475</real>
</array>
<key>cloud_color</key>
<array>
<real>0.5899999737739563</real>
<real>0.79000002145767212</real>
<real>0.80000001192092896</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>2.8148899078369141</real>
<real>5.6909198760986328</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>5.9584097862243652</real>
<real>6.9909601211547852</real>
<real>0.070000000298023224</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.32999998331069946</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>9.9300003051757813</real>
<real>10.199999809265137</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.22999998927116394</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00039000000106170774</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.6100000143051147</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>3.8000011444091797</real>
<real>0.0010000000474974513</real>
<real>-0.49999997019767761</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.20999999344348907</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.19999998807907104</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>1</real>
<real>-4.3711388286737929e-008</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>1802.800048828125</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>24</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>1.5707963705062866</real>
<key>sunlight_color</key>
<array>
<real>1.2599999904632568</real>
<real>1.2599999904632568</real>
<real>1.2599999904632568</real>
<real>0.41999998688697815</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.33000001311302185</real>
<real>0.33000001311302185</real>
<real>0.33000001311302185</real>
<real>1</real>
</array>
<key>blue_density</key>
<array>
<real>0.097999997437000275</real>
<real>0.2800000011920929</real>
<real>0.56000000238418579</real>
<real>0.56000000238418579</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.17547200620174408</real>
<real>0.35094299912452698</real>
<real>0.61000001430511475</real>
<real>0.61000001430511475</real>
</array>
<key>cloud_color</key>
<array>
<real>0.5899999737739563</real>
<real>0.79000002145767212</real>
<real>0.80000001192092896</real>
<real>1</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>2.8148899078369141</real>
<real>5.6909198760986328</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>5.9584097862243652</real>
<real>6.9909601211547852</real>
<real>0.070000000298023224</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.32999998331069946</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>9.9300003051757813</real>
<real>10.199999809265137</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.22999998927116394</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00039000000106170774</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.6100000143051147</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>3.8000011444091797</real>
<real>0.0010000000474974513</real>
<real>-0.49999997019767761</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.20999999344348907</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.19999998807907104</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>1</real>
<real>-4.3711388286737929e-008</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>1802.800048828125</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>24</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>1.5707963705062866</real>
<key>sunlight_color</key>
<array>
<real>1.2599999904632568</real>
<real>1.2599999904632568</real>
<real>1.2599999904632568</real>
<real>0.41999998688697815</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Night.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.20405027105862608</real>
<real>0.24246673976617727</real>
<real>0.32999997392212316</real>
<real>0.11000000166951449</real>
</array>
<key>blue_density</key>
<array>
<real>0.44999999369830818</real>
<real>0.44999999398335949</real>
<real>0.4499999944309046</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.23999999567946317</real>
<real>0.23999999579784967</real>
<real>0.23999999583870221</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.22615400241575034</real>
<real>0.22615400241575034</real>
<real>0.22615400241575034</real>
<real>1</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.36000001430511475</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00030000001824737163</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>3.0208916693946743e-009</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.0010000000214212465</real>
<real>-0.47999999165502744</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>3.9999999963077992</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>1.7901579546794781e-010</real>
<real>0.19915600437467304</real>
<real>0.19915600437467304</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>906.20003957594895</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.34876692389196384</real>
<real>0.3557424864638451</real>
<real>0.65999994893325931</real>
<real>0.22000000284673543</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.20405027105862608</real>
<real>0.24246673976617727</real>
<real>0.32999997392212316</real>
<real>0.11000000166951449</real>
</array>
<key>blue_density</key>
<array>
<real>0.44999999369830818</real>
<real>0.44999999398335949</real>
<real>0.4499999944309046</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.23999999567946317</real>
<real>0.23999999579784967</real>
<real>0.23999999583870221</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.22615400241575034</real>
<real>0.22615400241575034</real>
<real>0.22615400241575034</real>
<real>1</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.36000001430511475</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00030000001824737163</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>3.0208916693946743e-009</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.0010000000214212465</real>
<real>-0.47999999165502744</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>3.9999999963077992</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>1.7901579546794781e-010</real>
<real>0.19915600437467304</real>
<real>0.19915600437467304</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>906.20003957594895</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.34876692389196384</real>
<real>0.3557424864638451</real>
<real>0.65999994893325931</real>
<real>0.22000000284673543</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Pirate.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.27825063467025757</real>
<real>0.33063584566116333</real>
<real>0.44999998807907104</real>
<real>0.14999999105930328</real>
</array>
<key>blue_density</key>
<array>
<real>0.14522500336170197</real>
<real>0.39999699592590332</real>
<real>0.80000197887420654</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.15130999684333801</real>
<real>0.30000001192092896</real>
<real>0.35131001472473145</real>
<real>1</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.2046600580215454</real>
<real>0.51547497510910034</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>1.2046600580215454</real>
<real>0.51547497510910034</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.33064401149749756</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.0003499999875202775</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>3.4000000953674316</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>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.36000001430511475</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.69999998807907104</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.062790460884571075</real>
<real>-0.99802672863006592</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>600</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>27</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>3.0787608623504639</real>
<key>sunlight_color</key>
<array>
<real>2.8385701179504395</real>
<real>2.8385701179504395</real>
<real>2.8385701179504395</real>
<real>1</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.27825063467025757</real>
<real>0.33063584566116333</real>
<real>0.44999998807907104</real>
<real>0.14999999105930328</real>
</array>
<key>blue_density</key>
<array>
<real>0.14522500336170197</real>
<real>0.39999699592590332</real>
<real>0.80000197887420654</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.15130999684333801</real>
<real>0.30000001192092896</real>
<real>0.35131001472473145</real>
<real>1</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.2046600580215454</real>
<real>0.51547497510910034</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>1.2046600580215454</real>
<real>0.51547497510910034</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.33064401149749756</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.0003499999875202775</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>3.4000000953674316</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>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.36000001430511475</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.69999998807907104</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.062790460884571075</real>
<real>-0.99802672863006592</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>600</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>27</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>3.0787608623504639</real>
<key>sunlight_color</key>
<array>
<real>2.8385701179504395</real>
<real>2.8385701179504395</real>
<real>2.8385701179504395</real>
<real>1</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Purple.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.1978670060634613</real>
<real>0.23511900007724762</real>
<real>0.31999999284744263</real>
<real>1</real>
</array>
<key>blue_density</key>
<array>
<real>0.13977900147438049</real>
<real>0.38499599695205688</real>
<real>0.76999998092651367</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.18999999761581421</real>
<real>0.18999999761581421</real>
<real>0.18999999761581421</real>
<real>1</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>5.3780298233032227</real>
<real>1.9675600528717041</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>5.3780298233032227</real>
<real>1.9675600528717041</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.739999771118164</real>
<real>10.600000381469727</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.31000000238418579</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00052000000141561031</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>3.4000000953674316</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>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.47999998927116394</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>1.1000000238418579</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.12999999523162842</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.094108030200004578</real>
<real>-0.99556201696395874</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>656.20001220703125</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>28</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>3.0473451614379883</real>
<key>sunlight_color</key>
<array>
<real>1.5</real>
<real>1.5299999713897705</real>
<real>2.8385701179504395</real>
<real>1</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.1978670060634613</real>
<real>0.23511900007724762</real>
<real>0.31999999284744263</real>
<real>1</real>
</array>
<key>blue_density</key>
<array>
<real>0.13977900147438049</real>
<real>0.38499599695205688</real>
<real>0.76999998092651367</real>
<real>1</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.18999999761581421</real>
<real>0.18999999761581421</real>
<real>0.18999999761581421</real>
<real>1</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>5.3780298233032227</real>
<real>1.9675600528717041</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>5.3780298233032227</real>
<real>1.9675600528717041</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.739999771118164</real>
<real>10.600000381469727</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.31000000238418579</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00052000000141561031</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>3.4000000953674316</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>0</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>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.47999998927116394</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>1.1000000238418579</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.12999999523162842</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0</real>
<real>0.094108030200004578</real>
<real>-0.99556201696395874</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>656.20001220703125</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>28</integer>
<key>star_brightness</key>
<real>0</real>
<key>sun_angle</key>
<real>3.0473451614379883</real>
<key>sunlight_color</key>
<array>
<real>1.5</real>
<real>1.5299999713897705</real>
<real>2.8385701179504395</real>
<real>1</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Sailor%27s%20Delight.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.8399999737739563</real>
<real>0.090738050639629364</real>
<real>0.1234893873333931</real>
<real>0.8399999737739563</real>
</array>
<key>blue_density</key>
<array>
<real>0.93999999761581421</real>
<real>0.69999998807907104</real>
<real>0.25</real>
<real>0.93999999761581421</real>
</array>
<key>blue_horizon</key>
<array>
<real>1</real>
<real>0.59999996423721313</real>
<real>0.25001853704452515</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.65999996662139893</real>
<real>0.38999998569488525</real>
<real>0.22618354856967926</real>
<real>0.65999996662139893</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.76999998092651367</real>
<real>0.50999999046325684</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5899999737739563</real>
<real>0.019999999552965164</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.26999998092651367</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>9.4499998092651367</real>
<real>9.4399995803833008</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.5</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00019999999494757503</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>6.7000002861022949</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>3.7070791721343994</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>1.4800000190734863</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>0.79999923706054688</real>
<real>0.0010000000474974513</real>
<real>-0.94999998807907104</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.89999997615814209</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.29999998211860657</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0.53160154819488525</real>
<real>0.12533323466777802</real>
<real>-0.83767020702362061</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>281.70001220703125</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>18</integer>
<key>star_brightness</key>
<real>1.3799999952316284</real>
<key>sun_angle</key>
<real>0.12566371262073517</real>
<key>sunlight_color</key>
<array>
<real>0.75</real>
<real>1.6800000667572021</real>
<real>1.0777359008789062</real>
<real>0.56000000238418579</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0.8399999737739563</real>
<real>0.090738050639629364</real>
<real>0.1234893873333931</real>
<real>0.8399999737739563</real>
</array>
<key>blue_density</key>
<array>
<real>0.93999999761581421</real>
<real>0.69999998807907104</real>
<real>0.25</real>
<real>0.93999999761581421</real>
</array>
<key>blue_horizon</key>
<array>
<real>1</real>
<real>0.59999996423721313</real>
<real>0.25001853704452515</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.65999996662139893</real>
<real>0.38999998569488525</real>
<real>0.22618354856967926</real>
<real>0.65999996662139893</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.76999998092651367</real>
<real>0.50999999046325684</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.5</real>
<real>0.5899999737739563</real>
<real>0.019999999552965164</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.26999998092651367</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>9.4499998092651367</real>
<real>9.4399995803833008</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.5</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00019999999494757503</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>6.7000002861022949</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>3.7070791721343994</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>1.4800000190734863</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>0.79999923706054688</real>
<real>0.0010000000474974513</real>
<real>-0.94999998807907104</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.89999997615814209</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.29999998211860657</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>0.53160154819488525</real>
<real>0.12533323466777802</real>
<real>-0.83767020702362061</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>281.70001220703125</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>18</integer>
<key>star_brightness</key>
<real>1.3799999952316284</real>
<key>sun_angle</key>
<real>0.12566371262073517</real>
<key>sunlight_color</key>
<array>
<real>0.75</real>
<real>1.6800000667572021</real>
<real>1.0777359008789062</real>
<real>0.56000000238418579</real>
</array>
</map>
</llsd>

282
indra/newview/app_settings/windlight/skies/Sheer%20Surreality.xml
View File

@@ -1,141 +1,141 @@
<llsd>
<map>
<key>ambient</key>
<array>
<real>0</real>
<real>0.059999998658895493</real>
<real>0</real>
<real>0.059999998658895493</real>
</array>
<key>blue_density</key>
<array>
<real>0</real>
<real>0.099999994039535522</real>
<real>0.32999998331069946</real>
<real>0.32999998331069946</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.029999999329447746</real>
<real>0</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.81999999284744263</real>
<real>0.18999999761581421</real>
<real>0.039999999105930328</real>
<real>0.81999999284744263</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.74000000953674316</real>
<real>0.93999999761581421</real>
<real>0.20999999344348907</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.65999996662139893</real>
<real>0.52999997138977051</real>
<real>0.0099999997764825821</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.14000000059604645</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>18</real>
<real>20</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.37999999523162842</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00018000000272877514</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>6.7000002861022949</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>2.3247785568237305</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>1.9499999284744263</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>17.399999618530273</real>
<real>0.0010000000474974513</real>
<real>-0.64999997615814209</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.40999999642372131</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.17000000178813934</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>-0.72322052717208862</real>
<real>0.12533323466777802</real>
<real>-0.67914927005767822</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>263</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>24</integer>
<key>star_brightness</key>
<real>1.0399999618530273</real>
<key>sun_angle</key>
<real>0.12566371262073517</real>
<key>sunlight_color</key>
<array>
<real>1.5899999141693115</real>
<real>1.5299999713897705</real>
<real>0.53999996185302734</real>
<real>1.5899999141693115</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>ambient</key>
<array>
<real>0</real>
<real>0.059999998658895493</real>
<real>0</real>
<real>0.059999998658895493</real>
</array>
<key>blue_density</key>
<array>
<real>0</real>
<real>0.099999994039535522</real>
<real>0.32999998331069946</real>
<real>0.32999998331069946</real>
</array>
<key>blue_horizon</key>
<array>
<real>0.029999999329447746</real>
<real>0</real>
<real>1</real>
<real>1</real>
</array>
<key>cloud_color</key>
<array>
<real>0.81999999284744263</real>
<real>0.18999999761581421</real>
<real>0.039999999105930328</real>
<real>0.81999999284744263</real>
</array>
<key>cloud_pos_density1</key>
<array>
<real>0.74000000953674316</real>
<real>0.93999999761581421</real>
<real>0.20999999344348907</real>
<real>1</real>
</array>
<key>cloud_pos_density2</key>
<array>
<real>0.65999996662139893</real>
<real>0.52999997138977051</real>
<real>0.0099999997764825821</real>
<real>1</real>
</array>
<key>cloud_scale</key>
<array>
<real>0.14000000059604645</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>cloud_scroll_rate</key>
<array>
<real>18</real>
<real>20</real>
</array>
<key>cloud_shadow</key>
<array>
<real>0.37999999523162842</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>density_multiplier</key>
<array>
<real>0.00018000000272877514</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>distance_multiplier</key>
<array>
<real>6.7000002861022949</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>east_angle</key>
<real>2.3247785568237305</real>
<key>enable_cloud_scroll</key>
<array>
<boolean>1</boolean>
<boolean>1</boolean>
</array>
<key>gamma</key>
<array>
<real>1.9499999284744263</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>glow</key>
<array>
<real>17.399999618530273</real>
<real>0.0010000000474974513</real>
<real>-0.64999997615814209</real>
<real>1</real>
</array>
<key>haze_density</key>
<array>
<real>0.40999999642372131</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>haze_horizon</key>
<array>
<real>0.17000000178813934</real>
<real>0.19915600121021271</real>
<real>0.19915600121021271</real>
<real>1</real>
</array>
<key>lightnorm</key>
<array>
<real>-0.72322052717208862</real>
<real>0.12533323466777802</real>
<real>-0.67914927005767822</real>
<real>0</real>
</array>
<key>max_y</key>
<array>
<real>263</real>
<real>0</real>
<real>0</real>
<real>1</real>
</array>
<key>preset_num</key>
<integer>24</integer>
<key>star_brightness</key>
<real>1.0399999618530273</real>
<key>sun_angle</key>
<real>0.12566371262073517</real>
<key>sunlight_color</key>
<array>
<real>1.5899999141693115</real>
<real>1.5299999713897705</real>
<real>0.53999996185302734</real>
<real>1.5899999141693115</real>
</array>
</map>
</llsd>

86
indra/newview/app_settings/windlight/water/Default.xml
View File

@@ -1,43 +1,43 @@
<llsd>
<map>
<key>blurMultiplier</key>
<real>0.040000002831220627</real>
<key>fresnelOffset</key>
<real>0.5</real>
<key>fresnelScale</key>
<real>0.39999997615814209</real>
<key>normScale</key>
<array>
<integer>2</integer>
<integer>2</integer>
<integer>2</integer>
</array>
<key>normalMap</key>
<uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
<key>scaleAbove</key>
<real>0.029999999329447746</real>
<key>scaleBelow</key>
<real>0.20000000298023224</real>
<key>underWaterFogMod</key>
<real>0.25</real>
<key>waterFogColor</key>
<array>
<real>0.015686275437474251</real>
<real>0.14901961386203766</real>
<real>0.25098040699958801</real>
<real>1</real>
</array>
<key>waterFogDensity</key>
<real>16</real>
<key>wave1Dir</key>
<array>
<real>1.0499997138977051</real>
<real>-0.42000007629394531</real>
</array>
<key>wave2Dir</key>
<array>
<real>1.1099996566772461</real>
<real>-1.1600000858306885</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>blurMultiplier</key>
<real>0.040000002831220627</real>
<key>fresnelOffset</key>
<real>0.5</real>
<key>fresnelScale</key>
<real>0.39999997615814209</real>
<key>normScale</key>
<array>
<integer>2</integer>
<integer>2</integer>
<integer>2</integer>
</array>
<key>normalMap</key>
<uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
<key>scaleAbove</key>
<real>0.029999999329447746</real>
<key>scaleBelow</key>
<real>0.20000000298023224</real>
<key>underWaterFogMod</key>
<real>0.25</real>
<key>waterFogColor</key>
<array>
<real>0.015686275437474251</real>
<real>0.14901961386203766</real>
<real>0.25098040699958801</real>
<real>1</real>
</array>
<key>waterFogDensity</key>
<real>16</real>
<key>wave1Dir</key>
<array>
<real>1.0499997138977051</real>
<real>-0.42000007629394531</real>
</array>
<key>wave2Dir</key>
<array>
<real>1.1099996566772461</real>
<real>-1.1600000858306885</real>
</array>
</map>
</llsd>

86
indra/newview/app_settings/windlight/water/Glassy.xml
View File

@@ -1,43 +1,43 @@
<llsd>
<map>
<key>blurMultiplier</key>
<real>0.003000000026077032089233398</real>
<key>fresnelOffset</key>
<real>0.579999983310699462890625</real>
<key>fresnelScale</key>
<real>0.0999999940395355224609375</real>
<key>normScale</key>
<array>
<integer>2</integer>
<integer>2</integer>
<integer>2</integer>
</array>
<key>normalMap</key>
<uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
<key>scaleAbove</key>
<real>0.07999999821186065673828125</real>
<key>scaleBelow</key>
<real>0.2000000029802322387695312</real>
<key>underWaterFogMod</key>
<real>0.25</real>
<key>waterFogColor</key>
<array>
<real>0.04999999701976776123046875</real>
<real>0.37999999523162841796875</real>
<real>0.5299999713897705078125</real>
<real>0.5299999713897705078125</real>
</array>
<key>waterFogDensity</key>
<real>1</real>
<key>wave1Dir</key>
<array>
<real>0.5</real>
<real>-0.1700000017881393432617188</real>
</array>
<key>wave2Dir</key>
<array>
<real>0.579999983310699462890625</real>
<real>-0.670000016689300537109375</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>blurMultiplier</key>
<real>0.003000000026077032089233398</real>
<key>fresnelOffset</key>
<real>0.579999983310699462890625</real>
<key>fresnelScale</key>
<real>0.0999999940395355224609375</real>
<key>normScale</key>
<array>
<integer>2</integer>
<integer>2</integer>
<integer>2</integer>
</array>
<key>normalMap</key>
<uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
<key>scaleAbove</key>
<real>0.07999999821186065673828125</real>
<key>scaleBelow</key>
<real>0.2000000029802322387695312</real>
<key>underWaterFogMod</key>
<real>0.25</real>
<key>waterFogColor</key>
<array>
<real>0.04999999701976776123046875</real>
<real>0.37999999523162841796875</real>
<real>0.5299999713897705078125</real>
<real>0.5299999713897705078125</real>
</array>
<key>waterFogDensity</key>
<real>1</real>
<key>wave1Dir</key>
<array>
<real>0.5</real>
<real>-0.1700000017881393432617188</real>
</array>
<key>wave2Dir</key>
<array>
<real>0.579999983310699462890625</real>
<real>-0.670000016689300537109375</real>
</array>
</map>
</llsd>

86
indra/newview/app_settings/windlight/water/Murky.xml
View File

@@ -1,43 +1,43 @@
<llsd>
<map>
<key>blurMultiplier</key>
<real>0.0030000000260770321</real>
<key>fresnelOffset</key>
<real>0.39999997615814209</real>
<key>fresnelScale</key>
<real>0.5</real>
<key>normScale</key>
<array>
<integer>2</integer>
<integer>2</integer>
<integer>2</integer>
</array>
<key>normalMap</key>
<uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
<key>scaleAbove</key>
<real>0.079999998211860657</real>
<key>scaleBelow</key>
<real>0.20000000298023224</real>
<key>underWaterFogMod</key>
<real>0.76999998092651367</real>
<key>waterFogColor</key>
<array>
<real>0.08999999612569809</real>
<real>0.17000000178813934</real>
<real>0.20999999344348907</real>
<real>0.20999999344348907</real>
</array>
<key>waterFogDensity</key>
<real>16</real>
<key>wave1Dir</key>
<array>
<real>0.5</real>
<real>-0.17000000178813934</real>
</array>
<key>wave2Dir</key>
<array>
<real>0.57999998331069946</real>
<real>-0.67000001668930054</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>blurMultiplier</key>
<real>0.0030000000260770321</real>
<key>fresnelOffset</key>
<real>0.39999997615814209</real>
<key>fresnelScale</key>
<real>0.5</real>
<key>normScale</key>
<array>
<integer>2</integer>
<integer>2</integer>
<integer>2</integer>
</array>
<key>normalMap</key>
<uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
<key>scaleAbove</key>
<real>0.079999998211860657</real>
<key>scaleBelow</key>
<real>0.20000000298023224</real>
<key>underWaterFogMod</key>
<real>0.76999998092651367</real>
<key>waterFogColor</key>
<array>
<real>0.08999999612569809</real>
<real>0.17000000178813934</real>
<real>0.20999999344348907</real>
<real>0.20999999344348907</real>
</array>
<key>waterFogDensity</key>
<real>16</real>
<key>wave1Dir</key>
<array>
<real>0.5</real>
<real>-0.17000000178813934</real>
</array>
<key>wave2Dir</key>
<array>
<real>0.57999998331069946</real>
<real>-0.67000001668930054</real>
</array>
</map>
</llsd>

86
indra/newview/app_settings/windlight/water/Pond.xml
View File

@@ -1,43 +1,43 @@
<llsd>
<map>
<key>blurMultiplier</key>
<real>0.0030000000260770321</real>
<key>fresnelOffset</key>
<real>0.50999999046325684</real>
<key>fresnelScale</key>
<real>0.099999994039535522</real>
<key>normScale</key>
<array>
<integer>2</integer>
<integer>2</integer>
<integer>2</integer>
</array>
<key>normalMap</key>
<uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
<key>scaleAbove</key>
<real>0.079999998211860657</real>
<key>scaleBelow</key>
<real>0.20000000298023224</real>
<key>underWaterFogMod</key>
<real>0.25</real>
<key>waterFogColor</key>
<array>
<real>0.059999998658895493</real>
<real>0.37999999523162842</real>
<real>0.52999997138977051</real>
<real>0.52999997138977051</real>
</array>
<key>waterFogDensity</key>
<real>2.1000001430511475</real>
<key>wave1Dir</key>
<array>
<real>0.5</real>
<real>-0.17000000178813934</real>
</array>
<key>wave2Dir</key>
<array>
<real>0.57999998331069946</real>
<real>-0.67000001668930054</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>blurMultiplier</key>
<real>0.0030000000260770321</real>
<key>fresnelOffset</key>
<real>0.50999999046325684</real>
<key>fresnelScale</key>
<real>0.099999994039535522</real>
<key>normScale</key>
<array>
<integer>2</integer>
<integer>2</integer>
<integer>2</integer>
</array>
<key>normalMap</key>
<uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
<key>scaleAbove</key>
<real>0.079999998211860657</real>
<key>scaleBelow</key>
<real>0.20000000298023224</real>
<key>underWaterFogMod</key>
<real>0.25</real>
<key>waterFogColor</key>
<array>
<real>0.059999998658895493</real>
<real>0.37999999523162842</real>
<real>0.52999997138977051</real>
<real>0.52999997138977051</real>
</array>
<key>waterFogDensity</key>
<real>2.1000001430511475</real>
<key>wave1Dir</key>
<array>
<real>0.5</real>
<real>-0.17000000178813934</real>
</array>
<key>wave2Dir</key>
<array>
<real>0.57999998331069946</real>
<real>-0.67000001668930054</real>
</array>
</map>
</llsd>

86
indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml
View File

@@ -1,43 +1,43 @@
<llsd>
<map>
<key>blurMultiplier</key>
<real>0.0030000000260770321</real>
<key>fresnelOffset</key>
<real>0.57999998331069946</real>
<key>fresnelScale</key>
<real>0.099999994039535522</real>
<key>normScale</key>
<array>
<real>10</real>
<real>10</real>
<real>10</real>
</array>
<key>normalMap</key>
<uuid>470626e3-ac38-8554-d49b-90311c0176a9</uuid>
<key>scaleAbove</key>
<real>0.91999995708465576</real>
<key>scaleBelow</key>
<real>0.93999999761581421</real>
<key>underWaterFogMod</key>
<real>0.25</real>
<key>waterFogColor</key>
<array>
<real>0.049999997019767761</real>
<real>0.37999999523162842</real>
<real>0.52999997138977051</real>
<real>0.52999997138977051</real>
</array>
<key>waterFogDensity</key>
<real>3.2000000476837158</real>
<key>wave1Dir</key>
<array>
<real>0.5</real>
<real>-0.17000000178813934</real>
</array>
<key>wave2Dir</key>
<array>
<real>0.57999998331069946</real>
<real>-0.67000001668930054</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>blurMultiplier</key>
<real>0.0030000000260770321</real>
<key>fresnelOffset</key>
<real>0.57999998331069946</real>
<key>fresnelScale</key>
<real>0.099999994039535522</real>
<key>normScale</key>
<array>
<real>10</real>
<real>10</real>
<real>10</real>
</array>
<key>normalMap</key>
<uuid>470626e3-ac38-8554-d49b-90311c0176a9</uuid>
<key>scaleAbove</key>
<real>0.91999995708465576</real>
<key>scaleBelow</key>
<real>0.93999999761581421</real>
<key>underWaterFogMod</key>
<real>0.25</real>
<key>waterFogColor</key>
<array>
<real>0.049999997019767761</real>
<real>0.37999999523162842</real>
<real>0.52999997138977051</real>
<real>0.52999997138977051</real>
</array>
<key>waterFogDensity</key>
<real>3.2000000476837158</real>
<key>wave1Dir</key>
<array>
<real>0.5</real>
<real>-0.17000000178813934</real>
</array>
<key>wave2Dir</key>
<array>
<real>0.57999998331069946</real>
<real>-0.67000001668930054</real>
</array>
</map>
</llsd>

86
indra/newview/app_settings/windlight/water/Second%20Plague.xml
View File

@@ -1,43 +1,43 @@
<llsd>
<map>
<key>blurMultiplier</key>
<real>0.017000000923871994</real>
<key>fresnelOffset</key>
<real>0.37000000476837158</real>
<key>fresnelScale</key>
<real>0</real>
<key>normScale</key>
<array>
<integer>2</integer>
<integer>2</integer>
<integer>2</integer>
</array>
<key>normalMap</key>
<uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
<key>scaleAbove</key>
<real>0.079999998211860657</real>
<key>scaleBelow</key>
<real>0.20000000298023224</real>
<key>underWaterFogMod</key>
<real>0.85999995470046997</real>
<key>waterFogColor</key>
<array>
<real>0.48999997973442078</real>
<real>0</real>
<real>0</real>
<real>0.48999997973442078</real>
</array>
<key>waterFogDensity</key>
<real>20</real>
<key>wave1Dir</key>
<array>
<real>0.5</real>
<real>-0.17000000178813934</real>
</array>
<key>wave2Dir</key>
<array>
<real>0.57999998331069946</real>
<real>-0.67000001668930054</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>blurMultiplier</key>
<real>0.017000000923871994</real>
<key>fresnelOffset</key>
<real>0.37000000476837158</real>
<key>fresnelScale</key>
<real>0</real>
<key>normScale</key>
<array>
<integer>2</integer>
<integer>2</integer>
<integer>2</integer>
</array>
<key>normalMap</key>
<uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
<key>scaleAbove</key>
<real>0.079999998211860657</real>
<key>scaleBelow</key>
<real>0.20000000298023224</real>
<key>underWaterFogMod</key>
<real>0.85999995470046997</real>
<key>waterFogColor</key>
<array>
<real>0.48999997973442078</real>
<real>0</real>
<real>0</real>
<real>0.48999997973442078</real>
</array>
<key>waterFogDensity</key>
<real>20</real>
<key>wave1Dir</key>
<array>
<real>0.5</real>
<real>-0.17000000178813934</real>
</array>
<key>wave2Dir</key>
<array>
<real>0.57999998331069946</real>
<real>-0.67000001668930054</real>
</array>
</map>
</llsd>

86
indra/newview/app_settings/windlight/water/Valdez.xml
View File

@@ -1,43 +1,43 @@
<llsd>
<map>
<key>blurMultiplier</key>
<real>0.0020000000949949026</real>
<key>fresnelOffset</key>
<real>0.28999999165534973</real>
<key>fresnelScale</key>
<real>0</real>
<key>normScale</key>
<array>
<integer>2</integer>
<integer>2</integer>
<integer>2</integer>
</array>
<key>normalMap</key>
<uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
<key>scaleAbove</key>
<real>0.079999998211860657</real>
<key>scaleBelow</key>
<real>0.20000000298023224</real>
<key>underWaterFogMod</key>
<real>1</real>
<key>waterFogColor</key>
<array>
<real>0</real>
<real>0</real>
<real>0</real>
<real>0</real>
</array>
<key>waterFogDensity</key>
<real>1024</real>
<key>wave1Dir</key>
<array>
<real>0.5</real>
<real>-0.17000000178813934</real>
</array>
<key>wave2Dir</key>
<array>
<real>0.57999998331069946</real>
<real>-0.67000001668930054</real>
</array>
</map>
</llsd>
<llsd>
<map>
<key>blurMultiplier</key>
<real>0.0020000000949949026</real>
<key>fresnelOffset</key>
<real>0.28999999165534973</real>
<key>fresnelScale</key>
<real>0</real>
<key>normScale</key>
<array>
<integer>2</integer>
<integer>2</integer>
<integer>2</integer>
</array>
<key>normalMap</key>
<uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
<key>scaleAbove</key>
<real>0.079999998211860657</real>
<key>scaleBelow</key>
<real>0.20000000298023224</real>
<key>underWaterFogMod</key>
<real>1</real>
<key>waterFogColor</key>
<array>
<real>0</real>
<real>0</real>
<real>0</real>
<real>0</real>
</array>
<key>waterFogDensity</key>
<real>1024</real>
<key>wave1Dir</key>
<array>
<real>0.5</real>
<real>-0.17000000178813934</real>
</array>
<key>wave2Dir</key>
<array>
<real>0.57999998331069946</real>
<real>-0.67000001668930054</real>
</array>
</map>
</llsd>

6
indra/newview/llaudiosourcevo.cpp
View File

@@ -40,9 +40,9 @@
#include "llviewerparcelmgr.h"
LLAudioSourceVO::LLAudioSourceVO(const LLUUID &sound_id, const LLUUID& owner_id, const F32 gain, LLViewerObject *objectp)
// <edit>
// : LLAudioSource(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX),
: LLAudioSource(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX, objectp->getID(), false),
// <edit>
// : LLAudioSource(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX),
: LLAudioSource(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX, objectp->getID(), false),
// </edit>
mObjectp(objectp)
{

30
indra/newview/llfloateravatartextures.cpp
View File

@@ -89,9 +89,9 @@ void LLFloaterAvatarTextures::draw()
LLFloater::draw();
}
// <edit>
//#if !LL_RELEASE_FOR_DOWNLOAD
// </edit>
// <edit>
//#if !LL_RELEASE_FOR_DOWNLOAD
// </edit>
static void update_texture_ctrl(LLVOAvatar* avatarp,
LLTextureCtrl* ctrl,
ETextureIndex te)
@@ -148,9 +148,9 @@ void LLFloaterAvatarTextures::refresh()
}
}
// <edit>
/*
// </edit>
// <edit>
/*
// </edit>
#else
void LLFloaterAvatarTextures::refresh()
@@ -158,16 +158,16 @@ void LLFloaterAvatarTextures::refresh()
}
#endif
// <edit>
*/
// </edit>
// <edit>
*/
// </edit>
// static
void LLFloaterAvatarTextures::onClickDump(void* data)
{
// <edit>
//#if !LL_RELEASE_FOR_DOWNLOAD
// </edit>
// <edit>
//#if !LL_RELEASE_FOR_DOWNLOAD
// </edit>
LLFloaterAvatarTextures* self = (LLFloaterAvatarTextures*)data;
LLVOAvatar* avatarp = find_avatar(self->mID);
if (!avatarp) return;
@@ -179,7 +179,7 @@ void LLFloaterAvatarTextures::onClickDump(void* data)
llinfos << "Avatar TE " << i << " id " << te->getID() << llendl;
}
// <edit>
//#endif
// </edit>
// <edit>
//#endif
// </edit>
}

32
indra/newview/llfloaterproperties.h
View File

@@ -61,14 +61,14 @@ public:
static void closeByID(const LLUUID& item_id, const LLUUID& object_id);
// <edit>
static void onClickMore(void* user_data);
static void onClickLess(void* user_data);
static void onClickCopy(void* user_data);
static void onClickUpdate(void* user_data);
void setExpanded(BOOL expanded);
// </edit>
// <edit>
static void onClickMore(void* user_data);
static void onClickLess(void* user_data);
static void onClickCopy(void* user_data);
static void onClickUpdate(void* user_data);
void setExpanded(BOOL expanded);
// </edit>
LLFloaterProperties(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_id, const LLUUID& object_id);
virtual ~LLFloaterProperties();
@@ -102,9 +102,9 @@ protected:
LLUUID mObjectID;
BOOL mDirty;
// <edit>
BOOL mExpanded;
// </edit>
// <edit>
BOOL mExpanded;
// </edit>
typedef std::map<LLUUID, LLFloaterProperties*, lluuid_less> instance_map;
static instance_map sInstances;
@@ -116,11 +116,11 @@ class LLMultiProperties : public LLMultiFloater
{
public:
LLMultiProperties(const LLRect& rect);
// <edit>
void setExpanded(BOOL expanded);
protected:
BOOL mExpanded;
// </edit>
// <edit>
void setExpanded(BOOL expanded);
protected:
BOOL mExpanded;
// </edit>
};
#endif // LL_LLFLOATERPROPERTIES_H

82
indra/newview/llfloatervfsexplorer.h
View File

@@ -1,41 +1,41 @@
// <edit>
#ifndef LL_LLFLOATERVFSEXPLORER_H
#define LL_LLFLOATERVFSEXPLORER_H
#include "llfloater.h"
#include "llassettype.h"
#include "llvfs.h"
class LLFloaterVFSExplorer : LLFloater
{
typedef struct
{
std::string mFilename;
std::string mName;
LLUUID mID;
LLAssetType::EType mType;
} entry;
public:
LLFloaterVFSExplorer();
~LLFloaterVFSExplorer();
static void show();
BOOL postBuild();
void refresh();
void reloadAll();
void removeEntry();
void setEditID(LLUUID edit_id);
LLVFSFileSpecifier getEditEntry();
static void onCommitFileList(LLUICtrl* ctrl, void* user_data);
static void onClickCopyUUID(void* user_data);
static void onClickRemove(void* user_data);
static void onClickReload(void* user_data);
static void onClickEditData(void* user_data);
static void onClickItem(void* user_data);
private:
static LLFloaterVFSExplorer* sInstance;
static std::map<LLVFSFileSpecifier, LLVFSFileBlock*> sVFSFileMap;
LLUUID mEditID;
void setEditEnabled(bool enabled);
};
#endif
// </edit>
// <edit>
#ifndef LL_LLFLOATERVFSEXPLORER_H
#define LL_LLFLOATERVFSEXPLORER_H
#include "llfloater.h"
#include "llassettype.h"
#include "llvfs.h"
class LLFloaterVFSExplorer : LLFloater
{
typedef struct
{
std::string mFilename;
std::string mName;
LLUUID mID;
LLAssetType::EType mType;
} entry;
public:
LLFloaterVFSExplorer();
~LLFloaterVFSExplorer();
static void show();
BOOL postBuild();
void refresh();
void reloadAll();
void removeEntry();
void setEditID(LLUUID edit_id);
LLVFSFileSpecifier getEditEntry();
static void onCommitFileList(LLUICtrl* ctrl, void* user_data);
static void onClickCopyUUID(void* user_data);
static void onClickRemove(void* user_data);
static void onClickReload(void* user_data);
static void onClickEditData(void* user_data);
static void onClickItem(void* user_data);
private:
static LLFloaterVFSExplorer* sInstance;
static std::map<LLVFSFileSpecifier, LLVFSFileBlock*> sVFSFileMap;
LLUUID mEditID;
void setEditEnabled(bool enabled);
};
#endif
// </edit>

36
indra/newview/llpreviewanim.h
View File

@@ -46,29 +46,29 @@ public:
static void playAnim( void* userdata );
static void auditionAnim( void* userdata );
// <edit>
/*
static void copyAnim(void* userdata);
static void gotAssetForCopy(LLVFS *vfs,
const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status);
static void onSaveCopyComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
*/
static void gotAssetForSave(LLVFS *vfs,
const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status);
static void copyAnimID(void* userdata);
// <edit>
/*
static void copyAnim(void* userdata);
static void gotAssetForCopy(LLVFS *vfs,
const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status);
static void onSaveCopyComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
*/
static void gotAssetForSave(LLVFS *vfs,
const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status);
static void copyAnimID(void* userdata);
// </edit>
static void endAnimCallback( void *userdata );
protected:
virtual void onClose(bool app_quitting);
// <edit>
virtual BOOL canSaveAs() const;
virtual void saveAs();
virtual LLUUID getItemID();
// <edit>
virtual BOOL canSaveAs() const;
virtual void saveAs();
virtual LLUUID getItemID();
// </edit>
virtual const char *getTitleName() const { return "Animation"; }

12
indra/newview/llpreviewscript.h
View File

@@ -186,9 +186,9 @@ protected:
void uploadAssetLegacy(const std::string& filename,
const LLUUID& item_id,
const LLTransactionID& tid);
// <edit>
virtual BOOL canSaveAs() const;
virtual void saveAs();
// <edit>
virtual BOOL canSaveAs() const;
virtual void saveAs();
// </edit>
static void onSearchReplace(void* userdata);
@@ -258,9 +258,9 @@ protected:
LLViewerObject* object,
const LLTransactionID& tid,
BOOL is_running);
// <edit>
virtual BOOL canSaveAs() const;
virtual void saveAs();
// <edit>
virtual BOOL canSaveAs() const;
virtual void saveAs();
// </edit>
static void onSearchReplace(void* userdata);

484
indra/newview/llpreviewsound.cpp
View File

@@ -43,14 +43,14 @@
#include "llviewercontrol.h"
#include "llviewermessage.h" // send_guid_sound_trigger
#include "lluictrlfactory.h"
// <edit>
#include "llvoavatar.h"
#include "llchat.h"
#include "llfloaterchat.h"
#include "llviewerwindow.h" // for alert
#include "llfilepicker.h"
// for ambient play:
#include "llviewerregion.h"
// <edit>
#include "llvoavatar.h"
#include "llchat.h"
#include "llfloaterchat.h"
#include "llviewerwindow.h" // for alert
#include "llfilepicker.h"
// for ambient play:
#include "llviewerregion.h"
// </edit>
extern LLAudioEngine* gAudiop;
@@ -66,9 +66,9 @@ LLPreviewSound::LLPreviewSound(const std::string& name, const LLRect& rect, cons
childSetAction("Sound play btn",&LLPreviewSound::playSound,this);
childSetAction("Sound audition btn",&LLPreviewSound::auditionSound,this);
// <edit>
childSetAction("Sound copy uuid btn", &LLPreviewSound::copyUUID, this);
childSetAction("Play ambient btn", &LLPreviewSound::playAmbient, this);
// <edit>
childSetAction("Sound copy uuid btn", &LLPreviewSound::copyUUID, this);
childSetAction("Play ambient btn", &LLPreviewSound::playAmbient, this);
// </edit>
LLButton* button = getChild<LLButton>("Sound play btn");
@@ -87,12 +87,12 @@ LLPreviewSound::LLPreviewSound(const std::string& name, const LLRect& rect, cons
if(item && gAudiop)
{
gAudiop->preloadSound(item->getAssetUUID());
// <edit>
// that thing above doesn't actually start a sound transfer, so I will do it
//LLAudioSource *asp = new LLAudioSource(gAgent.getID(), gAgent.getID(), F32(1.0f), LLAudioEngine::AUDIO_TYPE_UI);
LLAudioSource *asp = gAgent.getAvatarObject()->getAudioSource(gAgent.getID());
LLAudioData *datap = gAudiop->getAudioData(item->getAssetUUID());
asp->addAudioData(datap, FALSE);
// <edit>
// that thing above doesn't actually start a sound transfer, so I will do it
//LLAudioSource *asp = new LLAudioSource(gAgent.getID(), gAgent.getID(), F32(1.0f), LLAudioEngine::AUDIO_TYPE_UI);
LLAudioSource *asp = gAgent.getAvatarObject()->getAudioSource(gAgent.getID());
LLAudioData *datap = gAudiop->getAudioData(item->getAssetUUID());
asp->addAudioData(datap, FALSE);
// </edit>
}
@@ -130,228 +130,228 @@ void LLPreviewSound::auditionSound( void *userdata )
gAudiop->triggerSound(item->getAssetUUID(), gAgent.getID(), SOUND_GAIN, LLAudioEngine::AUDIO_TYPE_UI, lpos_global);
}
}
// <edit>
void LLPreviewSound::playAmbient( void* userdata )
{
LLPreviewSound* self = (LLPreviewSound*) userdata;
const LLInventoryItem *item = self->getItem();
if(item && gAudiop)
{
int gain = 0.01f;
for(int i = 0; i < 2; i++)
{
gMessageSystem->newMessageFast(_PREHASH_SoundTrigger);
gMessageSystem->nextBlockFast(_PREHASH_SoundData);
gMessageSystem->addUUIDFast(_PREHASH_SoundID, LLUUID(item->getAssetUUID()));
gMessageSystem->addUUIDFast(_PREHASH_OwnerID, LLUUID::null);
gMessageSystem->addUUIDFast(_PREHASH_ObjectID, LLUUID::null);
gMessageSystem->addUUIDFast(_PREHASH_ParentID, LLUUID::null);
gMessageSystem->addU64Fast(_PREHASH_Handle, gAgent.getRegion()->getHandle());
LLVector3d pos = -from_region_handle(gAgent.getRegion()->getHandle());
gMessageSystem->addVector3Fast(_PREHASH_Position, (LLVector3)pos);
gMessageSystem->addF32Fast(_PREHASH_Gain, gain);
gMessageSystem->sendReliable(gAgent.getRegionHost());
gain = 1.0f;
}
}
}
// <edit>
/*
struct LLSaveInfo
{
LLSaveInfo(const LLUUID& item_id, const LLUUID& object_id, const std::string& desc,
const LLTransactionID tid)
: mItemUUID(item_id), mObjectUUID(object_id), mDesc(desc), mTransactionID(tid)
{
}
LLUUID mItemUUID;
LLUUID mObjectUUID;
std::string mDesc;
LLTransactionID mTransactionID;
};
// static
void LLPreviewSound::makeCopy( void *userdata )
{
LLPreviewSound* self = (LLPreviewSound*) userdata;
const LLInventoryItem *item = self->getItem();
if(item && gAudiop)
{
// Find out if asset data is ready
// I might be able to get rid of this
if(!gAssetStorage->hasLocalAsset(item->getAssetUUID(), LLAssetType::AT_SOUND))
{
LLChat chat("Sound isn't downloaded yet, please try again in a moment.");
LLFloaterChat::addChat(chat);
return;
}
gAssetStorage->getAssetData(item->getAssetUUID(), LLAssetType::AT_SOUND, LLPreviewSound::gotAssetForCopy, self, TRUE);
}
}
// static
void LLPreviewSound::gotAssetForCopy(LLVFS *vfs,
const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status)
{
LLPreviewSound* self = (LLPreviewSound*) user_data;
//const LLInventoryItem *item = self->getItem();
LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
S32 size = file.getSize();
char* buffer = new char[size];
if (buffer == NULL)
{
llerrs << "Memory Allocation Failed" << llendl;
return;
}
file.read((U8*)buffer, size);
// Write it back out...
LLTransactionID tid;
LLAssetID asset_id;
tid.generate();
asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
LLVFile ofile(gVFS, asset_id, LLAssetType::AT_SOUND, LLVFile::APPEND);
ofile.setMaxSize(size);
ofile.write((U8*)buffer, size);
// Upload that asset to the database
LLSaveInfo* info = new LLSaveInfo(self->mItemUUID, self->mObjectUUID, "sound", tid);
gAssetStorage->storeAssetData(tid, LLAssetType::AT_SOUND, onSaveCopyComplete, info, FALSE);
}
// static
void LLPreviewSound::onSaveCopyComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status)
{
LLSaveInfo* info = (LLSaveInfo*)user_data;
if (status == 0)
{
std::string item_name = "New Sound";
std::string item_desc = "";
// Saving into user inventory
LLViewerInventoryItem* item;
item = (LLViewerInventoryItem*)gInventory.getItem(info->mItemUUID);
if(item)
{
item_name = item->getName();
item_desc = item->getDescription();
}
gMessageSystem->newMessageFast(_PREHASH_CreateInventoryItem);
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
gMessageSystem->nextBlockFast(_PREHASH_InventoryBlock);
gMessageSystem->addU32Fast(_PREHASH_CallbackID, 0);
gMessageSystem->addUUIDFast(_PREHASH_FolderID, LLUUID::null);
gMessageSystem->addUUIDFast(_PREHASH_TransactionID, info->mTransactionID);
gMessageSystem->addU32Fast(_PREHASH_NextOwnerMask, 2147483647);
gMessageSystem->addS8Fast(_PREHASH_Type, 1);
gMessageSystem->addS8Fast(_PREHASH_InvType, 1);
gMessageSystem->addU8Fast(_PREHASH_WearableType, 0);
gMessageSystem->addStringFast(_PREHASH_Name, item_name);
gMessageSystem->addStringFast(_PREHASH_Description, item_desc);
gMessageSystem->sendReliable(gAgent.getRegionHost());
}
else
{
llwarns << "Problem saving sound: " << status << llendl;
LLStringUtil::format_map_t args;
args["[REASON]"] = std::string(LLAssetStorage::getErrorString(status));
gViewerWindow->alertXml("CannotUploadReason",args);
}
}
*/
// static
void LLPreviewSound::copyUUID( void *userdata )
{
LLPreviewSound* self = (LLPreviewSound*) userdata;
const LLInventoryItem *item = self->getItem();
if(item )
{
gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(item->getAssetUUID().asString()));
}
}
// </edit>
// <edit>
// virtual
BOOL LLPreviewSound::canSaveAs() const
{
return TRUE;
}
// virtual
void LLPreviewSound::saveAs()
{
const LLInventoryItem *item = getItem();
if(item)
{
gAssetStorage->getAssetData(item->getAssetUUID(), LLAssetType::AT_SOUND, LLPreviewSound::gotAssetForSave, this, TRUE);
}
}
// static
void LLPreviewSound::gotAssetForSave(LLVFS *vfs,
const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status)
{
LLPreviewSound* self = (LLPreviewSound*) user_data;
//const LLInventoryItem *item = self->getItem();
LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
S32 size = file.getSize();
char* buffer = new char[size];
if (buffer == NULL)
{
llerrs << "Memory Allocation Failed" << llendl;
return;
}
file.read((U8*)buffer, size);
// Write it back out...
LLFilePicker& file_picker = LLFilePicker::instance();
if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_OGG, LLDir::getScrubbedFileName(self->getItem()->getName())) )
{
// User canceled or we failed to acquire save file.
return;
}
// remember the user-approved/edited file name.
std::string filename = file_picker.getFirstFile();
std::ofstream export_file(filename.c_str(), std::ofstream::binary);
export_file.write(buffer, size);
export_file.close();
}
// virtual
LLUUID LLPreviewSound::getItemID()
{
const LLViewerInventoryItem* item = getItem();
if(item)
{
return item->getUUID();
}
return LLUUID::null;
}
// </edit>
// <edit>
void LLPreviewSound::playAmbient( void* userdata )
{
LLPreviewSound* self = (LLPreviewSound*) userdata;
const LLInventoryItem *item = self->getItem();
if(item && gAudiop)
{
int gain = 0.01f;
for(int i = 0; i < 2; i++)
{
gMessageSystem->newMessageFast(_PREHASH_SoundTrigger);
gMessageSystem->nextBlockFast(_PREHASH_SoundData);
gMessageSystem->addUUIDFast(_PREHASH_SoundID, LLUUID(item->getAssetUUID()));
gMessageSystem->addUUIDFast(_PREHASH_OwnerID, LLUUID::null);
gMessageSystem->addUUIDFast(_PREHASH_ObjectID, LLUUID::null);
gMessageSystem->addUUIDFast(_PREHASH_ParentID, LLUUID::null);
gMessageSystem->addU64Fast(_PREHASH_Handle, gAgent.getRegion()->getHandle());
LLVector3d pos = -from_region_handle(gAgent.getRegion()->getHandle());
gMessageSystem->addVector3Fast(_PREHASH_Position, (LLVector3)pos);
gMessageSystem->addF32Fast(_PREHASH_Gain, gain);
gMessageSystem->sendReliable(gAgent.getRegionHost());
gain = 1.0f;
}
}
}
// <edit>
/*
struct LLSaveInfo
{
LLSaveInfo(const LLUUID& item_id, const LLUUID& object_id, const std::string& desc,
const LLTransactionID tid)
: mItemUUID(item_id), mObjectUUID(object_id), mDesc(desc), mTransactionID(tid)
{
}
LLUUID mItemUUID;
LLUUID mObjectUUID;
std::string mDesc;
LLTransactionID mTransactionID;
};
// static
void LLPreviewSound::makeCopy( void *userdata )
{
LLPreviewSound* self = (LLPreviewSound*) userdata;
const LLInventoryItem *item = self->getItem();
if(item && gAudiop)
{
// Find out if asset data is ready
// I might be able to get rid of this
if(!gAssetStorage->hasLocalAsset(item->getAssetUUID(), LLAssetType::AT_SOUND))
{
LLChat chat("Sound isn't downloaded yet, please try again in a moment.");
LLFloaterChat::addChat(chat);
return;
}
gAssetStorage->getAssetData(item->getAssetUUID(), LLAssetType::AT_SOUND, LLPreviewSound::gotAssetForCopy, self, TRUE);
}
}
// static
void LLPreviewSound::gotAssetForCopy(LLVFS *vfs,
const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status)
{
LLPreviewSound* self = (LLPreviewSound*) user_data;
//const LLInventoryItem *item = self->getItem();
LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
S32 size = file.getSize();
char* buffer = new char[size];
if (buffer == NULL)
{
llerrs << "Memory Allocation Failed" << llendl;
return;
}
file.read((U8*)buffer, size);
// Write it back out...
LLTransactionID tid;
LLAssetID asset_id;
tid.generate();
asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
LLVFile ofile(gVFS, asset_id, LLAssetType::AT_SOUND, LLVFile::APPEND);
ofile.setMaxSize(size);
ofile.write((U8*)buffer, size);
// Upload that asset to the database
LLSaveInfo* info = new LLSaveInfo(self->mItemUUID, self->mObjectUUID, "sound", tid);
gAssetStorage->storeAssetData(tid, LLAssetType::AT_SOUND, onSaveCopyComplete, info, FALSE);
}
// static
void LLPreviewSound::onSaveCopyComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status)
{
LLSaveInfo* info = (LLSaveInfo*)user_data;
if (status == 0)
{
std::string item_name = "New Sound";
std::string item_desc = "";
// Saving into user inventory
LLViewerInventoryItem* item;
item = (LLViewerInventoryItem*)gInventory.getItem(info->mItemUUID);
if(item)
{
item_name = item->getName();
item_desc = item->getDescription();
}
gMessageSystem->newMessageFast(_PREHASH_CreateInventoryItem);
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
gMessageSystem->nextBlockFast(_PREHASH_InventoryBlock);
gMessageSystem->addU32Fast(_PREHASH_CallbackID, 0);
gMessageSystem->addUUIDFast(_PREHASH_FolderID, LLUUID::null);
gMessageSystem->addUUIDFast(_PREHASH_TransactionID, info->mTransactionID);
gMessageSystem->addU32Fast(_PREHASH_NextOwnerMask, 2147483647);
gMessageSystem->addS8Fast(_PREHASH_Type, 1);
gMessageSystem->addS8Fast(_PREHASH_InvType, 1);
gMessageSystem->addU8Fast(_PREHASH_WearableType, 0);
gMessageSystem->addStringFast(_PREHASH_Name, item_name);
gMessageSystem->addStringFast(_PREHASH_Description, item_desc);
gMessageSystem->sendReliable(gAgent.getRegionHost());
}
else
{
llwarns << "Problem saving sound: " << status << llendl;
LLStringUtil::format_map_t args;
args["[REASON]"] = std::string(LLAssetStorage::getErrorString(status));
gViewerWindow->alertXml("CannotUploadReason",args);
}
}
*/
// static
void LLPreviewSound::copyUUID( void *userdata )
{
LLPreviewSound* self = (LLPreviewSound*) userdata;
const LLInventoryItem *item = self->getItem();
if(item )
{
gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(item->getAssetUUID().asString()));
}
}
// </edit>
// <edit>
// virtual
BOOL LLPreviewSound::canSaveAs() const
{
return TRUE;
}
// virtual
void LLPreviewSound::saveAs()
{
const LLInventoryItem *item = getItem();
if(item)
{
gAssetStorage->getAssetData(item->getAssetUUID(), LLAssetType::AT_SOUND, LLPreviewSound::gotAssetForSave, this, TRUE);
}
}
// static
void LLPreviewSound::gotAssetForSave(LLVFS *vfs,
const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status)
{
LLPreviewSound* self = (LLPreviewSound*) user_data;
//const LLInventoryItem *item = self->getItem();
LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
S32 size = file.getSize();
char* buffer = new char[size];
if (buffer == NULL)
{
llerrs << "Memory Allocation Failed" << llendl;
return;
}
file.read((U8*)buffer, size);
// Write it back out...
LLFilePicker& file_picker = LLFilePicker::instance();
if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_OGG, LLDir::getScrubbedFileName(self->getItem()->getName())) )
{
// User canceled or we failed to acquire save file.
return;
}
// remember the user-approved/edited file name.
std::string filename = file_picker.getFirstFile();
std::ofstream export_file(filename.c_str(), std::ofstream::binary);
export_file.write(buffer, size);
export_file.close();
}
// virtual
LLUUID LLPreviewSound::getItemID()
{
const LLViewerInventoryItem* item = getItem();
if(item)
{
return item->getUUID();
}
return LLUUID::null;
}
// </edit>

38
indra/newview/llpreviewsound.h
View File

@@ -44,29 +44,29 @@ public:
static void playSound( void* userdata );
static void auditionSound( void* userdata );
// <edit>
/*
static void makeCopy(void* userdata);
static void gotAssetForCopy(LLVFS *vfs,
const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status);
static void onSaveCopyComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
*/
static void playAmbient(void* userdata);
static void copyUUID(void* userdata);
static void gotAssetForSave(LLVFS *vfs,
const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status);
// <edit>
/*
static void makeCopy(void* userdata);
static void gotAssetForCopy(LLVFS *vfs,
const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status);
static void onSaveCopyComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
*/
static void playAmbient(void* userdata);
static void copyUUID(void* userdata);
static void gotAssetForSave(LLVFS *vfs,
const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status);
// </edit>
protected:
virtual const char *getTitleName() const { return "Sound"; }
// <edit>
virtual BOOL canSaveAs() const;
virtual void saveAs();
virtual LLUUID getItemID();
// <edit>
virtual BOOL canSaveAs() const;
virtual void saveAs();
virtual LLUUID getItemID();
// </edit>
};

13164
indra/newview/llselectmgr.cpp
View File

File diff suppressed because it is too large Load Diff

4
indra/newview/llviewertexteditor.h
View File

@@ -97,8 +97,8 @@ public:
// should be changed to get a different asset id from the verifier
// rather than checking if a re-load is necessary. Phoenix 2007-02-27
bool hasEmbeddedInventory();
// <edit>
std::vector<LLPointer<LLInventoryItem> > getEmbeddedItems();
// <edit>
std::vector<LLPointer<LLInventoryItem> > getEmbeddedItems();
// </edit>
private:

6
indra/newview/skins/Pony-Aquablue/colors.xml
View File

@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings version = "101">
</settings>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings version = "101">
</settings>

10
indra/newview/skins/Pony-Aquablue/colors_base.xml
View File

@@ -58,11 +58,11 @@
<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- i.e. About Land name that you don't own -->
<TextEmbeddedItemColor value="0, 0, 128, 255" />
<TextDefaultColor value="0, 20, 0, 255"/>
<TextLinkColor value="144, 165, 208, 255"/>
<TextLinkHoverColor value="255, 255, 255, 255"/>
<!-- LISTBOXES -->
<TextLinkColor value="144, 165, 208, 255"/>
<TextLinkHoverColor value="255, 255, 255, 255"/>
<!-- LISTBOXES -->
<ScrollBgReadOnlyColor value="200, 209, 204, 255" />
<ScrollBgWriteableColor value="200, 209, 204, 255" />
<ScrollBGStripeColor value="100, 100, 100, 40" />

412
indra/newview/skins/dark/colors_base.xml
View File

@@ -1,206 +1,206 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings version = "101">
<!-- WINDOWS -->
<TitleBarFocusColor value="255, 255, 255, 30" /> <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
<FloaterFocusBorderColor value="0, 0, 0, 80"/>
<FloaterUnfocusBorderColor value="0, 0, 0, 80"/>
<FocusBackgroundColor value="62, 62, 62, 255"/> <!-- Background color of focused floaters -->
<DefaultBackgroundColor value="62, 62, 62, 140"/> <!-- Background color for unfocused floaters -->
<ColorDropShadow value="0, 0, 0, 200"/> <!-- The drop shadow behind windows and menus -->
<DefaultHighlightDark value="26, 26, 26, 255"/>
<DefaultHighlightLight value="132, 132, 132, 255"/>
<DefaultShadowDark value="26, 26, 26, 255"/>
<DefaultShadowLight value="0, 0, 0, 255"/>
<!-- LABELS -->
<LabelDisabledColor value="147, 169, 213, 77"/>
<LabelSelectedColor value="255, 255, 255, 255"/>
<LabelSelectedDisabledColor value="116, 116, 116, 128"/>
<LabelTextColor value="200, 200, 200, 255"/>
<!-- LOGIN -->
<LoginProgressBarBgColor value="255, 255, 255, 255" />
<LoginProgressBarFgColor value="255, 255, 255, 255" />
<LoginProgressBoxBorderColor value="0, 30, 60, 0" />
<LoginProgressBoxCenterColor value="0, 0, 0, 200" />
<LoginProgressBoxShadowColor value="0, 0, 0, 200" />
<LoginProgressBoxTextColor value="255, 255, 255, 255"/>
<!-- BUTTONS -->
<ButtonLabelColor value="220, 220, 220, 255"/> <!-- Text labels for buttons, like the "OK" text -->
<ButtonLabelSelectedColor value="220, 220, 220, 255"/>
<ButtonLabelDisabledColor value="147, 169, 213, 200"/>
<ButtonLabelSelectedDisabledColor value="164, 190, 237, 200"/>
<ButtonSelectedBgColor value="62, 62, 62, 255"/>
<ButtonSelectedColor value="255, 255, 255, 255"/>
<ButtonUnselectedBgColor value="62, 62, 62, 255"/>
<ButtonUnselectedFgColor value="255, 255, 255, 255"/>
<ButtonBorderColor value="238, 156, 0, 255"/>
<ButtonFlashBgColor value="255, 190, 62, 127" />
<ButtonColor value="255, 255, 255, 255"/> <!-- Blended with button art, usually left as opaque white -->
<ButtonImageColor value="255, 255, 255, 255"/> <!-- Blended with button art, usually left as opaque white -->
<!-- SLIDERS -->
<SliderDisabledThumbColor value="0, 0, 0, 255" />
<SliderThumbCenterColor value="200, 200, 200, 255"/>
<SliderThumbOutlineColor value="255, 255, 255, 255"/>
<SliderTrackColor value="255, 255, 255, 255"/>
<!-- TEXTFIELDS -->
<TextBgFocusColor value="200, 209, 204, 255"/> <!-- Text field background when receiving input (focused) -->
<TextBgReadOnlyColor value="62, 62, 62, 160"/> <!-- Text field background when read-only -->
<TextBgWriteableColor value="200, 209, 204, 230"/> <!-- Text field background when not receiving input (unfocused) -->
<TextCursorColor value="0, 0, 0, 255"/>
<TextFgColor value="0, 0, 0, 255"/>
<TextFgReadOnlyColor value="255, 255, 255, 200"/>
<TextFgTentativeColor value="0, 0, 0, 128"/>
<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255"/> <!-- i.e. About Land name that you don't own -->
<TextEmbeddedItemColor value="0, 0, 128, 255"/>
<TextDefaultColor value="0, 20, 0, 255"/>
<!-- LISTBOXES -->
<ScrollBgReadOnlyColor value="200, 209, 204, 255"/>
<ScrollBgWriteableColor value="200, 209, 204, 255"/>
<ScrollBGStripeColor value="100, 100, 100, 40"/>
<ScrollDisabledColor value="128, 128, 128, 204"/>
<ScrollSelectedBGColor value="100, 100, 100, 150"/>
<ScrollSelectedFGColor value="0, 0, 0, 204"/> <!-- Text color -->
<ScrollUnselectedColor value="0, 0, 0, 204"/> <!-- Text color -->
<ScrollHighlightedColor value="183, 184, 188, 128"/> <!-- Hover color -->
<ScrollbarThumbColor value="100, 100, 100, 255"/>
<ScrollbarTrackColor value="153, 154, 158, 255"/>
<!-- MENUS -->
<MenuBarBgColor value="62, 62, 62, 255"/>
<MenuBarGodBgColor value="62, 128, 62, 255"/>
<MenuNonProductionBgColor value="128, 0, 0, 255"/>
<MenuNonProductionGodBgColor value="0,128,0,255"/>
<MenuDefaultBgColor value="0, 0, 0, 255"/>
<MenuItemDisabledColor value="133, 133, 164, 128"/> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
<MenuItemEnabledColor value="255, 255, 255, 255"/> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
<MenuItemHighlightBgColor value="183, 184, 188, 100"/>
<MenuItemHighlightFgColor value="255, 255, 255, 255"/> <!-- Highlighted menu text color; also treeview node selection highlight -->
<MenuPopupBgColor value="0, 0, 0, 255"/>
<!-- PIE MENUS -->
<PieMenuBgColor value="62, 62, 62, 150"/>
<PieMenuLineColor value="0, 0, 0, 128"/>
<PieMenuSelectedColor value="183, 184, 188, 77"/>
<!-- TOOLTIPS -->
<ToolTipBgColor value="183, 184, 188, 200"/>
<ToolTipBorderColor value="171, 212, 245, 255"/>
<ToolTipTextColor value="0, 0, 0, 255"/>
<!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="66, 66, 66, 255"/>
<NotifyTextColor value="200, 200, 200, 255"/>
<NotifyCautionBoxColor value="254, 209, 118, 255"/> <!-- the background color of caution permissions prompts -->
<NotifyCautionWarnColor value="0, 0, 0, 255"/> <!-- the foreground color of the special title text in caution permissions prompts -->
<GroupNotifyBoxColor value="70, 170, 255, 255"/>
<GroupNotifyTextColor value="0, 0, 0 255" />
<!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
<ChatHistoryBgColor value="30, 30, 30, 200" />
<ChatHistoryTextColor value="255, 255, 255, 255" />
<IMHistoryBgColor value="30, 30, 30, 200" />
<IMHistoryTextColor value="255, 255, 255, 255" />
<!-- IN-WORLD SELECTION -->
<SilhouetteParentColor value="255, 255, 0, 255"/>
<SilhouetteChildColor value="32, 106, 196, 255"/>
<HighlightParentColor value="171, 212, 245, 255"/>
<HighlightChildColor value="171, 212, 245, 255"/>
<HighlightInspectColor value="255, 0, 255, 255"/>
<!-- EDIT MODE GRID -->
<GridFocusPointColor value="255, 255, 255, 128"/>
<GridlineColor value="255, 255, 255, 255"/>
<GridlineBGColor value="235, 235, 255, 200"/>
<GridlineShadowColor value="0, 0, 0, 80"/>
<!-- PROPERTY LINES -->
<PropertyColorAvail value="0, 0, 0, 0"/>
<PropertyColorGroup value="0, 184, 184, 102"/>
<PropertyColorOther value="255, 0, 0, 102"/>
<PropertyColorSelf value="0, 255, 0, 102"/>
<PropertyColorForSale value="255, 128, 0, 102"/>
<PropertyColorAuction value="128, 0, 255, 102"/> <!-- Match the color on the world map -->
<!-- Icon Enable/Disable -->
<IconEnabledColor value="255, 255, 255, 255"/>
<IconDisabledColor value="147, 169, 213, 200"/>
<!-- MAP -->
<MapAvatar value="0, 255, 0, 255" />
<MapFriend value="255, 255, 0, 255" />
<MapLinden value="0, 0, 255, 255" />
<MapMuted value="110, 110, 110, 255" />
<!-- MINI-MAP -->
<NetMapBackgroundColor value="0, 0, 0, 77" />
<NetMapYouOwnAboveWater value="0, 255, 255, 255" />
<NetMapYouOwnBelowWater value="0, 200, 200, 255" />
<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />
<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />
<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />
<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />
<NetMapThisRegion value="255, 255, 255, 255" />
<NetMapLiveRegion value="204, 204, 204, 255" />
<NetMapDeadRegion value="255, 128, 128, 255" />
<NetMapFrustum value="255, 255, 255, 20" />
<NetMapFrustumRotating value="255, 255, 255, 51" />
<!-- HELP WINDOW -->
<HelpBgColor value="200, 209, 204, 255"/>
<HelpFgColor value="0, 0, 0, 255"/>
<HelpScrollTrackColor value="183, 184, 188, 255"/>
<HelpScrollThumbColor value="80, 96, 124, 255"/>
<HelpScrollHighlightColor value="115, 132, 155, 255"/>
<HelpScrollShadowColor value="0, 0, 0, 255"/>
<!-- MISC -->
<AvatarNameColor value="251, 175, 93, 255"/> <!-- Text color of avatar nametags -->
<FocusColor value="238, 156, 0, 255"/> <!-- Color of the glow around UI controls with keyboard focus -->
<FloaterButtonImageColor value="239, 156, 0, 255"/> <!-- The floater buttons (like the close box) are white images that receive this color. -->
<ButtonCautionImageColor value="255, 255, 255, 255"/> <!-- Match the caution dialog buttons to the default -->
<MapAutopilotColor value="255, 128, 0, 255"/>
<ContextSilhouetteColor value="239, 156, 0, 255"/> <!-- For "context" highlighting, i.e. pie menu -->
<ScriptBgReadOnlyColor value="100, 100, 100, 255"/>
<ParcelTextColor value="0, 200, 100, 200" /> <!-- Parcel name on menu bar, normal state -->
<ParcelHoverColor value="0, 200, 100, 255" /> <!-- Parcel name on menu bar, hover state -->
<TimeTextColor value="255, 255, 255, 255" /> <!-- SL Time on menu bar -->
<BalanceTextColor value="0, 255, 0, 255"/> <!-- Linden dollar balance on menu bar -->
<HealthTextColor value="255, 255, 255, 255"/> <!-- Damage meter text on menu bar -->
<GroupOverTierColor value="110, 15, 15, 255" /> <!-- Warning text in Group Info window -->
<FilterBackgroundColor value="0, 0, 20, 255"/> <!-- Matching region of Inventory search text -->
<FilterTextColor value="255, 200, 70, 255"/>
<InventoryItemSuffixColor value="200, 200, 200, 255"/>
<InventorySearchStatusColor value="0, 0, 0, 255" />
<ConsoleBackground value="0, 0, 0, 255" />
<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>
<InventoryBackgroundColor value="62, 62, 62, 80"/>
<ComboBoxBg value="255, 255, 255, 255"/>
<AvatarListTextDistNormalRange value="0, 0, 0, 255"/>
<AvatarListTextDistShoutRange value="0, 0, 0, 128"/>
<AvatarListTextDistOver value="128, 0, 0, 128"/>
<AvatarListTextAgeYoung value="255, 0, 0, 255"/>
<AvatarListTextAgeNormal value="0, 0, 0, 255"/>
<!-- Alert box colors -->
<AlertBoxColor value="62, 62, 62, 255"/>
<AlertTextColor value="147, 169, 213, 255"/>
<AlertCautionBoxColor value="96, 96, 0, 255"/> <!-- Background color of caution alerts -->
<AlertCautionTextColor value="0, 0, 0, 255"/> <!-- Foreground color of the special title text in caution alerts -->
<!-- Multi sliders, as in the sky animation setting -->
<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>
<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>
<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>
<MultiSliderTrackColor value="30, 30, 30, 255"/>
<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/>
<MultiSliderTriangleColor value="255, 255, 50, 255"/>
</settings>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings version = "101">
<!-- WINDOWS -->
<TitleBarFocusColor value="255, 255, 255, 30" /> <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
<FloaterFocusBorderColor value="0, 0, 0, 80"/>
<FloaterUnfocusBorderColor value="0, 0, 0, 80"/>
<FocusBackgroundColor value="62, 62, 62, 255"/> <!-- Background color of focused floaters -->
<DefaultBackgroundColor value="62, 62, 62, 140"/> <!-- Background color for unfocused floaters -->
<ColorDropShadow value="0, 0, 0, 200"/> <!-- The drop shadow behind windows and menus -->
<DefaultHighlightDark value="26, 26, 26, 255"/>
<DefaultHighlightLight value="132, 132, 132, 255"/>
<DefaultShadowDark value="26, 26, 26, 255"/>
<DefaultShadowLight value="0, 0, 0, 255"/>
<!-- LABELS -->
<LabelDisabledColor value="147, 169, 213, 77"/>
<LabelSelectedColor value="255, 255, 255, 255"/>
<LabelSelectedDisabledColor value="116, 116, 116, 128"/>
<LabelTextColor value="200, 200, 200, 255"/>
<!-- LOGIN -->
<LoginProgressBarBgColor value="255, 255, 255, 255" />
<LoginProgressBarFgColor value="255, 255, 255, 255" />
<LoginProgressBoxBorderColor value="0, 30, 60, 0" />
<LoginProgressBoxCenterColor value="0, 0, 0, 200" />
<LoginProgressBoxShadowColor value="0, 0, 0, 200" />
<LoginProgressBoxTextColor value="255, 255, 255, 255"/>
<!-- BUTTONS -->
<ButtonLabelColor value="220, 220, 220, 255"/> <!-- Text labels for buttons, like the "OK" text -->
<ButtonLabelSelectedColor value="220, 220, 220, 255"/>
<ButtonLabelDisabledColor value="147, 169, 213, 200"/>
<ButtonLabelSelectedDisabledColor value="164, 190, 237, 200"/>
<ButtonSelectedBgColor value="62, 62, 62, 255"/>
<ButtonSelectedColor value="255, 255, 255, 255"/>
<ButtonUnselectedBgColor value="62, 62, 62, 255"/>
<ButtonUnselectedFgColor value="255, 255, 255, 255"/>
<ButtonBorderColor value="238, 156, 0, 255"/>
<ButtonFlashBgColor value="255, 190, 62, 127" />
<ButtonColor value="255, 255, 255, 255"/> <!-- Blended with button art, usually left as opaque white -->
<ButtonImageColor value="255, 255, 255, 255"/> <!-- Blended with button art, usually left as opaque white -->
<!-- SLIDERS -->
<SliderDisabledThumbColor value="0, 0, 0, 255" />
<SliderThumbCenterColor value="200, 200, 200, 255"/>
<SliderThumbOutlineColor value="255, 255, 255, 255"/>
<SliderTrackColor value="255, 255, 255, 255"/>
<!-- TEXTFIELDS -->
<TextBgFocusColor value="200, 209, 204, 255"/> <!-- Text field background when receiving input (focused) -->
<TextBgReadOnlyColor value="62, 62, 62, 160"/> <!-- Text field background when read-only -->
<TextBgWriteableColor value="200, 209, 204, 230"/> <!-- Text field background when not receiving input (unfocused) -->
<TextCursorColor value="0, 0, 0, 255"/>
<TextFgColor value="0, 0, 0, 255"/>
<TextFgReadOnlyColor value="255, 255, 255, 200"/>
<TextFgTentativeColor value="0, 0, 0, 128"/>
<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255"/> <!-- i.e. About Land name that you don't own -->
<TextEmbeddedItemColor value="0, 0, 128, 255"/>
<TextDefaultColor value="0, 20, 0, 255"/>
<!-- LISTBOXES -->
<ScrollBgReadOnlyColor value="200, 209, 204, 255"/>
<ScrollBgWriteableColor value="200, 209, 204, 255"/>
<ScrollBGStripeColor value="100, 100, 100, 40"/>
<ScrollDisabledColor value="128, 128, 128, 204"/>
<ScrollSelectedBGColor value="100, 100, 100, 150"/>
<ScrollSelectedFGColor value="0, 0, 0, 204"/> <!-- Text color -->
<ScrollUnselectedColor value="0, 0, 0, 204"/> <!-- Text color -->
<ScrollHighlightedColor value="183, 184, 188, 128"/> <!-- Hover color -->
<ScrollbarThumbColor value="100, 100, 100, 255"/>
<ScrollbarTrackColor value="153, 154, 158, 255"/>
<!-- MENUS -->
<MenuBarBgColor value="62, 62, 62, 255"/>
<MenuBarGodBgColor value="62, 128, 62, 255"/>
<MenuNonProductionBgColor value="128, 0, 0, 255"/>
<MenuNonProductionGodBgColor value="0,128,0,255"/>
<MenuDefaultBgColor value="0, 0, 0, 255"/>
<MenuItemDisabledColor value="133, 133, 164, 128"/> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
<MenuItemEnabledColor value="255, 255, 255, 255"/> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
<MenuItemHighlightBgColor value="183, 184, 188, 100"/>
<MenuItemHighlightFgColor value="255, 255, 255, 255"/> <!-- Highlighted menu text color; also treeview node selection highlight -->
<MenuPopupBgColor value="0, 0, 0, 255"/>
<!-- PIE MENUS -->
<PieMenuBgColor value="62, 62, 62, 150"/>
<PieMenuLineColor value="0, 0, 0, 128"/>
<PieMenuSelectedColor value="183, 184, 188, 77"/>
<!-- TOOLTIPS -->
<ToolTipBgColor value="183, 184, 188, 200"/>
<ToolTipBorderColor value="171, 212, 245, 255"/>
<ToolTipTextColor value="0, 0, 0, 255"/>
<!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="66, 66, 66, 255"/>
<NotifyTextColor value="200, 200, 200, 255"/>
<NotifyCautionBoxColor value="254, 209, 118, 255"/> <!-- the background color of caution permissions prompts -->
<NotifyCautionWarnColor value="0, 0, 0, 255"/> <!-- the foreground color of the special title text in caution permissions prompts -->
<GroupNotifyBoxColor value="70, 170, 255, 255"/>
<GroupNotifyTextColor value="0, 0, 0 255" />
<!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
<ChatHistoryBgColor value="30, 30, 30, 200" />
<ChatHistoryTextColor value="255, 255, 255, 255" />
<IMHistoryBgColor value="30, 30, 30, 200" />
<IMHistoryTextColor value="255, 255, 255, 255" />
<!-- IN-WORLD SELECTION -->
<SilhouetteParentColor value="255, 255, 0, 255"/>
<SilhouetteChildColor value="32, 106, 196, 255"/>
<HighlightParentColor value="171, 212, 245, 255"/>
<HighlightChildColor value="171, 212, 245, 255"/>
<HighlightInspectColor value="255, 0, 255, 255"/>
<!-- EDIT MODE GRID -->
<GridFocusPointColor value="255, 255, 255, 128"/>
<GridlineColor value="255, 255, 255, 255"/>
<GridlineBGColor value="235, 235, 255, 200"/>
<GridlineShadowColor value="0, 0, 0, 80"/>
<!-- PROPERTY LINES -->
<PropertyColorAvail value="0, 0, 0, 0"/>
<PropertyColorGroup value="0, 184, 184, 102"/>
<PropertyColorOther value="255, 0, 0, 102"/>
<PropertyColorSelf value="0, 255, 0, 102"/>
<PropertyColorForSale value="255, 128, 0, 102"/>
<PropertyColorAuction value="128, 0, 255, 102"/> <!-- Match the color on the world map -->
<!-- Icon Enable/Disable -->
<IconEnabledColor value="255, 255, 255, 255"/>
<IconDisabledColor value="147, 169, 213, 200"/>
<!-- MAP -->
<MapAvatar value="0, 255, 0, 255" />
<MapFriend value="255, 255, 0, 255" />
<MapLinden value="0, 0, 255, 255" />
<MapMuted value="110, 110, 110, 255" />
<!-- MINI-MAP -->
<NetMapBackgroundColor value="0, 0, 0, 77" />
<NetMapYouOwnAboveWater value="0, 255, 255, 255" />
<NetMapYouOwnBelowWater value="0, 200, 200, 255" />
<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />
<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />
<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />
<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />
<NetMapThisRegion value="255, 255, 255, 255" />
<NetMapLiveRegion value="204, 204, 204, 255" />
<NetMapDeadRegion value="255, 128, 128, 255" />
<NetMapFrustum value="255, 255, 255, 20" />
<NetMapFrustumRotating value="255, 255, 255, 51" />
<!-- HELP WINDOW -->
<HelpBgColor value="200, 209, 204, 255"/>
<HelpFgColor value="0, 0, 0, 255"/>
<HelpScrollTrackColor value="183, 184, 188, 255"/>
<HelpScrollThumbColor value="80, 96, 124, 255"/>
<HelpScrollHighlightColor value="115, 132, 155, 255"/>
<HelpScrollShadowColor value="0, 0, 0, 255"/>
<!-- MISC -->
<AvatarNameColor value="251, 175, 93, 255"/> <!-- Text color of avatar nametags -->
<FocusColor value="238, 156, 0, 255"/> <!-- Color of the glow around UI controls with keyboard focus -->
<FloaterButtonImageColor value="239, 156, 0, 255"/> <!-- The floater buttons (like the close box) are white images that receive this color. -->
<ButtonCautionImageColor value="255, 255, 255, 255"/> <!-- Match the caution dialog buttons to the default -->
<MapAutopilotColor value="255, 128, 0, 255"/>
<ContextSilhouetteColor value="239, 156, 0, 255"/> <!-- For "context" highlighting, i.e. pie menu -->
<ScriptBgReadOnlyColor value="100, 100, 100, 255"/>
<ParcelTextColor value="0, 200, 100, 200" /> <!-- Parcel name on menu bar, normal state -->
<ParcelHoverColor value="0, 200, 100, 255" /> <!-- Parcel name on menu bar, hover state -->
<TimeTextColor value="255, 255, 255, 255" /> <!-- SL Time on menu bar -->
<BalanceTextColor value="0, 255, 0, 255"/> <!-- Linden dollar balance on menu bar -->
<HealthTextColor value="255, 255, 255, 255"/> <!-- Damage meter text on menu bar -->
<GroupOverTierColor value="110, 15, 15, 255" /> <!-- Warning text in Group Info window -->
<FilterBackgroundColor value="0, 0, 20, 255"/> <!-- Matching region of Inventory search text -->
<FilterTextColor value="255, 200, 70, 255"/>
<InventoryItemSuffixColor value="200, 200, 200, 255"/>
<InventorySearchStatusColor value="0, 0, 0, 255" />
<ConsoleBackground value="0, 0, 0, 255" />
<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>
<InventoryBackgroundColor value="62, 62, 62, 80"/>
<ComboBoxBg value="255, 255, 255, 255"/>
<AvatarListTextDistNormalRange value="0, 0, 0, 255"/>
<AvatarListTextDistShoutRange value="0, 0, 0, 128"/>
<AvatarListTextDistOver value="128, 0, 0, 128"/>
<AvatarListTextAgeYoung value="255, 0, 0, 255"/>
<AvatarListTextAgeNormal value="0, 0, 0, 255"/>
<!-- Alert box colors -->
<AlertBoxColor value="62, 62, 62, 255"/>
<AlertTextColor value="147, 169, 213, 255"/>
<AlertCautionBoxColor value="96, 96, 0, 255"/> <!-- Background color of caution alerts -->
<AlertCautionTextColor value="0, 0, 0, 255"/> <!-- Foreground color of the special title text in caution alerts -->
<!-- Multi sliders, as in the sky animation setting -->
<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>
<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>
<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>
<MultiSliderTrackColor value="30, 30, 30, 255"/>
<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/>
<MultiSliderTriangleColor value="255, 255, 50, 255"/>
</settings>

32
indra/newview/skins/default/xui/en-us/floater_clothing.xml
View File

@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
height="435" min_height="200" min_width="325" name="clothing"
rect_control="FloaterClothingRect" title="Clothing" width="325">
<scroll_list bottom="-395" draw_border="true" draw_heading="true"
follows="top|left|bottom|right" height="370" left="15" multi_select="false"
name="clothing_list" width="295">
<column label="" name="icon" width="16" />
<column label="Name" name="name" width="250" />
<column name="sort" width="-1" />
</scroll_list>
<button bottom_delta="-30" follows="bottom|right" height="20" label="Take Off"
left="-200" name="take_off_btn" width="80" />
<button bottom_delta="0" follows="bottom|right" height="20" label="Wear" left="-100"
name="wear_btn" width="80" />
</floater>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
height="435" min_height="200" min_width="325" name="clothing"
rect_control="FloaterClothingRect" title="Clothing" width="325">
<scroll_list bottom="-395" draw_border="true" draw_heading="true"
follows="top|left|bottom|right" height="370" left="15" multi_select="false"
name="clothing_list" width="295">
<column label="" name="icon" width="16" />
<column label="Name" name="name" width="250" />
<column name="sort" width="-1" />
</scroll_list>
<button bottom_delta="-30" follows="bottom|right" height="20" label="Take Off"
left="-200" name="take_off_btn" width="80" />
<button bottom_delta="0" follows="bottom|right" height="20" label="Wear" left="-100"
name="wear_btn" width="80" />
</floater>

32
indra/newview/skins/default/xui/en-us/floater_inventory_backup_settings.xml
View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="false"
width="200" height="300" name="inventory_backup_settings" title="Download Options">
<check_box bottom_delta="-50" follows="left|top" left="10" name="chk_textures" label="Textures" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_sounds" label="Sounds" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_callingcards" label="Calling Cards" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_landmarks" label="Landmarks" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_scripts" label="Scripts" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_wearables" label="Wearables" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_objects" label="Objects" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_notecards" label="Notecards" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_animations" label="Animations" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_gestures" label="Gestures" />
<!--<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_others" label="Others" />-->
<button bottom="10" follows="bottom|left" height="20" label="Next >>"
left="110" width="80" name="next_btn" />
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="false"
width="200" height="300" name="inventory_backup_settings" title="Download Options">
<check_box bottom_delta="-50" follows="left|top" left="10" name="chk_textures" label="Textures" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_sounds" label="Sounds" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_callingcards" label="Calling Cards" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_landmarks" label="Landmarks" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_scripts" label="Scripts" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_wearables" label="Wearables" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_objects" label="Objects" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_notecards" label="Notecards" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_animations" label="Animations" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_gestures" label="Gestures" />
<!--<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_others" label="Others" />-->
<button bottom="10" follows="bottom|left" height="20" label="Next >>"
left="110" width="80" name="next_btn" />
</floater>

28
indra/newview/skins/default/xui/en-us/floater_preview_embedded_texture.xml
View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-338" can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="true" enabled="true" height="331" left="201" min_height="120"
min_width="300" mouse_opaque="true" name="preview_texture" width="300">
<button bottom="-325" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="Copy To Inventory" left="105"
mouse_opaque="true" name="Copy To Inventory" scale_image="true" width="170" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="30" drop_shadow_visible="true" enabled="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
mouse_opaque="true" name="dimensions" v_pad="0" width="163">
Dimensions: [WIDTH] x [HEIGHT]
</text>
</floater>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-338" can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="true" enabled="true" height="331" left="201" min_height="120"
min_width="300" mouse_opaque="true" name="preview_texture" width="300">
<button bottom="-325" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="Copy To Inventory" left="105"
mouse_opaque="true" name="Copy To Inventory" scale_image="true" width="170" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="30" drop_shadow_visible="true" enabled="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
mouse_opaque="true" name="dimensions" v_pad="0" width="163">
Dimensions: [WIDTH] x [HEIGHT]
</text>
</floater>

58
indra/newview/skins/default/xui/en-us/floater_preview_texture_keep_discard.xml
View File

@@ -1,29 +1,29 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-331" can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="true" enabled="true" height="331" left="176" min_height="120"
min_width="300" mouse_opaque="true" name="preview_texture" width="300">
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerif" h_pad="0" halign="left" height="19" left="13"
mouse_opaque="true" name="desc txt" v_pad="0" width="80">
Description:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
enabled="true" follows="left|top|right" font="SansSerif"
handle_edit_keys_directly="false" height="19" left="93" max_length="127"
mouse_opaque="true" name="desc" select_all_on_focus_received="false"
select_on_focus="false" width="194" spell_check="true" />
<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="Keep" label_selected="Keep" left="9"
mouse_opaque="true" name="Keep" scale_image="true" width="100" />
<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="Discard" label_selected="Discard"
left="114" mouse_opaque="true" name="Discard" scale_image="true"
width="100" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="30" drop_shadow_visible="true" enabled="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
mouse_opaque="true" name="dimensions" v_pad="0" width="163">
Dimensions: [WIDTH] x [HEIGHT]
</text>
</floater>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-331" can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="true" enabled="true" height="331" left="176" min_height="120"
min_width="300" mouse_opaque="true" name="preview_texture" width="300">
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerif" h_pad="0" halign="left" height="19" left="13"
mouse_opaque="true" name="desc txt" v_pad="0" width="80">
Description:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
enabled="true" follows="left|top|right" font="SansSerif"
handle_edit_keys_directly="false" height="19" left="93" max_length="127"
mouse_opaque="true" name="desc" select_all_on_focus_received="false"
select_on_focus="false" width="194" spell_check="true" />
<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="Keep" label_selected="Keep" left="9"
mouse_opaque="true" name="Keep" scale_image="true" width="100" />
<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="Discard" label_selected="Discard"
left="114" mouse_opaque="true" name="Discard" scale_image="true"
width="100" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="30" drop_shadow_visible="true" enabled="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
mouse_opaque="true" name="dimensions" v_pad="0" width="163">
Dimensions: [WIDTH] x [HEIGHT]
</text>
</floater>

13888
indra/newview/skins/default/xui/en-us/notifications.xml
View File

File diff suppressed because it is too large Load Diff

120
indra/newview/skins/default/xui/en-us/panel_land_covenant.xml
View File

@@ -1,60 +1,60 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="0" follows="top|left" height="220" left="0"
name="Covenant" title="Covenant" width="480">
<text bottom_delta="-5" follows="left|top"
font="SansSerifSmall" height="20" left="180" name="covenant_timestamp_text"
width="250" />
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
left="10" name="region_name_lbl" width="100">
Region:
</text>
<text bottom_delta="0" follows="left|top"
font="SansSerifSmall" height="20" left="120" name="region_name_text"
width="150">
(unknown)
</text>
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
left="10" name="estate_name_lbl" width="100">
Estate:
</text>
<text bottom_delta="0" follows="left|top"
font="SansSerifSmall" height="20" left="120" name="estate_name_text"
width="150">
(unknown)
</text>
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
left="10" name="estate_owner_lbl" width="100">
Estate Owner:
</text>
<text bottom_delta="0" follows="left|top"
font="SansSerifSmall" height="20" left="120" name="estate_owner_text"
width="150">
(unknown)
</text>
<text bottom_delta="-20" follows="left|top"
font="SansSerif" height="20" left="60" name="resellable_clause"
width="300">
Purchased land in this region may or may not be resold.
</text>
<text bottom_delta="-20" follows="left|top"
font="SansSerif" height="20" left="60" name="changeable_clause"
width="375">
Purchased land in this region may or may not be joined or subdivided.
</text>
<text_editor bottom_delta="-200" enabled="false"
follows="left|top" font="SansSerifSmall" height="200" left="15"
max_length="65535" name="covenant_editor"
width="425" word_wrap="true" />
<string name="can_resell">
Purchased land in this region may be resold.
</string>
<string name="can_not_resell">
Purchased land in this region may not be resold.
</string>
<string name="can_change">
Purchased land in this region may be joined or subdivided.
</string>
<string name="can_not_change">
Purchased land in this region may not be joined or subdivided.
</string>
</panel>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="0" follows="top|left" height="220" left="0"
name="Covenant" title="Covenant" width="480">
<text bottom_delta="-5" follows="left|top"
font="SansSerifSmall" height="20" left="180" name="covenant_timestamp_text"
width="250" />
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
left="10" name="region_name_lbl" width="100">
Region:
</text>
<text bottom_delta="0" follows="left|top"
font="SansSerifSmall" height="20" left="120" name="region_name_text"
width="150">
(unknown)
</text>
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
left="10" name="estate_name_lbl" width="100">
Estate:
</text>
<text bottom_delta="0" follows="left|top"
font="SansSerifSmall" height="20" left="120" name="estate_name_text"
width="150">
(unknown)
</text>
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
left="10" name="estate_owner_lbl" width="100">
Estate Owner:
</text>
<text bottom_delta="0" follows="left|top"
font="SansSerifSmall" height="20" left="120" name="estate_owner_text"
width="150">
(unknown)
</text>
<text bottom_delta="-20" follows="left|top"
font="SansSerif" height="20" left="60" name="resellable_clause"
width="300">
Purchased land in this region may or may not be resold.
</text>
<text bottom_delta="-20" follows="left|top"
font="SansSerif" height="20" left="60" name="changeable_clause"
width="375">
Purchased land in this region may or may not be joined or subdivided.
</text>
<text_editor bottom_delta="-200" enabled="false"
follows="left|top" font="SansSerifSmall" height="200" left="15"
max_length="65535" name="covenant_editor"
width="425" word_wrap="true" />
<string name="can_resell">
Purchased land in this region may be resold.
</string>
<string name="can_not_resell">
Purchased land in this region may not be resold.
</string>
<string name="can_change">
Purchased land in this region may be joined or subdivided.
</string>
<string name="can_not_change">
Purchased land in this region may not be joined or subdivided.
</string>
</panel>