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

Remove CR from configuration, source and xml files.

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

118
indra/cmake/Boost.cmake
View File

@@ -1,59 +1,59 @@
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
set(Boost_FIND_QUIETLY ON) set(Boost_FIND_QUIETLY ON)
set(Boost_FIND_REQUIRED ON) set(Boost_FIND_REQUIRED ON)
if (STANDALONE) if (STANDALONE)
include(FindBoost) include(FindBoost)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt) set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
set(BOOST_REGEX_LIBRARY boost_regex-mt) set(BOOST_REGEX_LIBRARY boost_regex-mt)
set(BOOST_SIGNALS_LIBRARY boost_signals-mt) set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
set(BOOST_SYSTEM_LIBRARY boost_system-mt) set(BOOST_SYSTEM_LIBRARY boost_system-mt)
else (STANDALONE) else (STANDALONE)
use_prebuilt_binary(boost) use_prebuilt_binary(boost)
set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
if (WINDOWS) if (WINDOWS)
set(BOOST_VERSION 1_45) set(BOOST_VERSION 1_45)
# SNOW-788 # SNOW-788
# 00-Common.cmake alreay sets MSVC_SUFFIX to be correct for the VS we are using eg VC71, VC80, VC90 etc # 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 # 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 # 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. # boost libs are avaiable - RC.
if (MSVC71) if (MSVC71)
set(BOOST_OPTIM_SUFFIX mt-s) set(BOOST_OPTIM_SUFFIX mt-s)
set(BOOST_DEBUG_SUFFIX mt-sgd) set(BOOST_DEBUG_SUFFIX mt-sgd)
else (MSVC71) else (MSVC71)
set(BOOST_OPTIM_SUFFIX mt) set(BOOST_OPTIM_SUFFIX mt)
set(BOOST_DEBUG_SUFFIX mt-gd) set(BOOST_DEBUG_SUFFIX mt-gd)
endif (MSVC71) endif (MSVC71)
set(BOOST_PROGRAM_OPTIONS_LIBRARY set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION} optimized libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION}
debug libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION}) debug libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION})
set(BOOST_REGEX_LIBRARY set(BOOST_REGEX_LIBRARY
optimized libboost_regex-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION} optimized libboost_regex-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION}
debug libboost_regex-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION}) debug libboost_regex-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION})
set(BOOST_SIGNALS_LIBRARY set(BOOST_SIGNALS_LIBRARY
optimized libboost_signals-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION} optimized libboost_signals-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION}
debug libboost_signals-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION}) debug libboost_signals-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION})
elseif (DARWIN) elseif (DARWIN)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt) set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
set(BOOST_REGEX_LIBRARY boost_regex-mt) set(BOOST_REGEX_LIBRARY boost_regex-mt)
set(BOOST_SIGNALS_LIBRARY boost_signals-mt) set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
set(BOOST_SYSTEM_LIBRARY boost_system-mt) set(BOOST_SYSTEM_LIBRARY boost_system-mt)
elseif (LINUX) elseif (LINUX)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt) set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
set(BOOST_REGEX_LIBRARY boost_regex-mt) set(BOOST_REGEX_LIBRARY boost_regex-mt)
set(BOOST_SIGNALS_LIBRARY boost_signals-mt) set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
set(BOOST_SYSTEM_LIBRARY boost_system-mt) set(BOOST_SYSTEM_LIBRARY boost_system-mt)
endif (WINDOWS) endif (WINDOWS)
endif (STANDALONE) endif (STANDALONE)

978
indra/cmake/CopyWinLibs.cmake
View File

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

100
indra/cmake/GooglePerfTools.cmake
View File

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

114
indra/cmake/Python.cmake
View File

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

428
indra/llcommon/CMakeLists.txt
View File

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

370
indra/llcommon/llpreprocessor.h
View File

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

94
indra/llcommon/llversionviewer.h
View File

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

16
indra/llmessage/llavatarnamecache.cpp
View File

@@ -334,14 +334,14 @@ void LLAvatarNameCache::processName(const LLUUID& agent_id,
{ {
if (add_to_cache) if (add_to_cache)
{ {
// 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 // [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 // Don't replace existing entries with dummies
cache_t::iterator itName = (av_name.mIsDummy) ? sCache.find(agent_id) : sCache.end(); cache_t::iterator itName = (av_name.mIsDummy) ? sCache.find(agent_id) : sCache.end();
if (sCache.end() != itName) if (sCache.end() != itName)
itName->second.mExpires = av_name.mExpires; itName->second.mExpires = av_name.mExpires;
else else
sCache[agent_id] = av_name; sCache[agent_id] = av_name;
// [/SL:KB] // [/SL:KB]
} }

296
indra/llmessage/llnetcanary.cpp
View File

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

50
indra/llmessage/llnetcanary.h
View File

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

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

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

1488
indra/llprimitive/llmaterialtable.cpp
View File

File diff suppressed because it is too large Load Diff

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

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

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

@@ -1,15 +1,15 @@
<llsd> <llsd>
<map> <map>
<key>CrashSubmitBehavior</key> <key>CrashSubmitBehavior</key>
<map> <map>
<key>Comment</key> <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> <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> <key>Persist</key>
<integer>2</integer> <integer>2</integer>
<key>Type</key> <key>Type</key>
<string>S32</string> <string>S32</string>
<key>Value</key> <key>Value</key>
<integer>2</integer> <integer>2</integer>
</map> </map>
</map> </map>
</llsd> </llsd>

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

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

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

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

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

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

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

@@ -1,141 +1,141 @@
<llsd> <llsd>
<map> <map>
<key>ambient</key> <key>ambient</key>
<array> <array>
<real>0.20405027270317078</real> <real>0.20405027270317078</real>
<real>0.24246673285961151</real> <real>0.24246673285961151</real>
<real>0.32999998331069946</real> <real>0.32999998331069946</real>
<real>0.10999999940395355</real> <real>0.10999999940395355</real>
</array> </array>
<key>blue_density</key> <key>blue_density</key>
<array> <array>
<real>0.44999998807907104</real> <real>0.44999998807907104</real>
<real>0.44999998807907104</real> <real>0.44999998807907104</real>
<real>0.44999998807907104</real> <real>0.44999998807907104</real>
<real>1</real> <real>1</real>
</array> </array>
<key>blue_horizon</key> <key>blue_horizon</key>
<array> <array>
<real>0.23999999463558197</real> <real>0.23999999463558197</real>
<real>0.23999999463558197</real> <real>0.23999999463558197</real>
<real>0.23999999463558197</real> <real>0.23999999463558197</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_color</key> <key>cloud_color</key>
<array> <array>
<real>0.22615399956703186</real> <real>0.22615399956703186</real>
<real>0.22615399956703186</real> <real>0.22615399956703186</real>
<real>0.22615399956703186</real> <real>0.22615399956703186</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density1</key> <key>cloud_pos_density1</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>0.87999999523162842</real> <real>0.87999999523162842</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density2</key> <key>cloud_pos_density2</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>0.125</real> <real>0.125</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scale</key> <key>cloud_scale</key>
<array> <array>
<real>0.41999998688697815</real> <real>0.41999998688697815</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scroll_rate</key> <key>cloud_scroll_rate</key>
<array> <array>
<real>10.49940013885498</real> <real>10.49940013885498</real>
<real>10.01099967956543</real> <real>10.01099967956543</real>
</array> </array>
<key>cloud_shadow</key> <key>cloud_shadow</key>
<array> <array>
<real>0.26999998092651367</real> <real>0.26999998092651367</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>density_multiplier</key> <key>density_multiplier</key>
<array> <array>
<real>0.00030000001424923539</real> <real>0.00030000001424923539</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>distance_multiplier</key> <key>distance_multiplier</key>
<array> <array>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>east_angle</key> <key>east_angle</key>
<real>0</real> <real>0</real>
<key>enable_cloud_scroll</key> <key>enable_cloud_scroll</key>
<array> <array>
<boolean>1</boolean> <boolean>1</boolean>
<boolean>1</boolean> <boolean>1</boolean>
</array> </array>
<key>gamma</key> <key>gamma</key>
<array> <array>
<real>1</real> <real>1</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>glow</key> <key>glow</key>
<array> <array>
<real>5</real> <real>5</real>
<real>0.0010000000474974513</real> <real>0.0010000000474974513</real>
<real>-0.47999998927116394</real> <real>-0.47999998927116394</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_density</key> <key>haze_density</key>
<array> <array>
<real>4</real> <real>4</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_horizon</key> <key>haze_horizon</key>
<array> <array>
<real>0</real> <real>0</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>1</real> <real>1</real>
</array> </array>
<key>lightnorm</key> <key>lightnorm</key>
<array> <array>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
<real>-4.8876205482883961e-007</real> <real>-4.8876205482883961e-007</real>
<real>1</real> <real>1</real>
</array> </array>
<key>max_y</key> <key>max_y</key>
<array> <array>
<real>906.20001220703125</real> <real>906.20001220703125</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>preset_num</key> <key>preset_num</key>
<integer>22</integer> <integer>22</integer>
<key>star_brightness</key> <key>star_brightness</key>
<real>2</real> <real>2</real>
<key>sun_angle</key> <key>sun_angle</key>
<real>4.7123894691467285</real> <real>4.7123894691467285</real>
<key>sunlight_color</key> <key>sunlight_color</key>
<array> <array>
<real>0.34876692295074463</real> <real>0.34876692295074463</real>
<real>0.35574248433113098</real> <real>0.35574248433113098</real>
<real>0.65999996662139893</real> <real>0.65999996662139893</real>
<real>0.2199999988079071</real> <real>0.2199999988079071</real>
</array> </array>
</map> </map>
</llsd> </llsd>

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

@@ -1,141 +1,141 @@
<llsd> <llsd>
<map> <map>
<key>ambient</key> <key>ambient</key>
<array> <array>
<real>1.0499999523162842</real> <real>1.0499999523162842</real>
<real>1.0499999523162842</real> <real>1.0499999523162842</real>
<real>1.0499999523162842</real> <real>1.0499999523162842</real>
<real>0.34999999403953552</real> <real>0.34999999403953552</real>
</array> </array>
<key>blue_density</key> <key>blue_density</key>
<array> <array>
<real>0.24475815892219543</real> <real>0.24475815892219543</real>
<real>0.44872328639030457</real> <real>0.44872328639030457</real>
<real>0.75999999046325684</real> <real>0.75999999046325684</real>
<real>0.37999999523162842</real> <real>0.37999999523162842</real>
</array> </array>
<key>blue_horizon</key> <key>blue_horizon</key>
<array> <array>
<real>0.49548381567001343</real> <real>0.49548381567001343</real>
<real>0.49548381567001343</real> <real>0.49548381567001343</real>
<real>0.63999998569488525</real> <real>0.63999998569488525</real>
<real>0.31999999284744263</real> <real>0.31999999284744263</real>
</array> </array>
<key>cloud_color</key> <key>cloud_color</key>
<array> <array>
<real>0.40999999642372131</real> <real>0.40999999642372131</real>
<real>0.40999999642372131</real> <real>0.40999999642372131</real>
<real>0.40999999642372131</real> <real>0.40999999642372131</real>
<real>0.40999999642372131</real> <real>0.40999999642372131</real>
</array> </array>
<key>cloud_pos_density1</key> <key>cloud_pos_density1</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>1</real> <real>1</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density2</key> <key>cloud_pos_density2</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>0.125</real> <real>0.125</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scale</key> <key>cloud_scale</key>
<array> <array>
<real>0.41999998688697815</real> <real>0.41999998688697815</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scroll_rate</key> <key>cloud_scroll_rate</key>
<array> <array>
<real>10.199999809265137</real> <real>10.199999809265137</real>
<real>10.01099967956543</real> <real>10.01099967956543</real>
</array> </array>
<key>cloud_shadow</key> <key>cloud_shadow</key>
<array> <array>
<real>0.26999998092651367</real> <real>0.26999998092651367</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>density_multiplier</key> <key>density_multiplier</key>
<array> <array>
<real>0.00017999998817685992</real> <real>0.00017999998817685992</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>distance_multiplier</key> <key>distance_multiplier</key>
<array> <array>
<real>0.80000001192092896</real> <real>0.80000001192092896</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>east_angle</key> <key>east_angle</key>
<real>0</real> <real>0</real>
<key>enable_cloud_scroll</key> <key>enable_cloud_scroll</key>
<array> <array>
<boolean>1</boolean> <boolean>1</boolean>
<boolean>1</boolean> <boolean>1</boolean>
</array> </array>
<key>gamma</key> <key>gamma</key>
<array> <array>
<real>1</real> <real>1</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>glow</key> <key>glow</key>
<array> <array>
<real>5</real> <real>5</real>
<real>0.0010000000474974513</real> <real>0.0010000000474974513</real>
<real>-0.47999998927116394</real> <real>-0.47999998927116394</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_density</key> <key>haze_density</key>
<array> <array>
<real>0.69999998807907104</real> <real>0.69999998807907104</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_horizon</key> <key>haze_horizon</key>
<array> <array>
<real>0.18999999761581421</real> <real>0.18999999761581421</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>1</real> <real>1</real>
</array> </array>
<key>lightnorm</key> <key>lightnorm</key>
<array> <array>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
<real>-4.3711388286737929e-008</real> <real>-4.3711388286737929e-008</real>
<real>0</real> <real>0</real>
</array> </array>
<key>max_y</key> <key>max_y</key>
<array> <array>
<real>1605</real> <real>1605</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>preset_num</key> <key>preset_num</key>
<integer>22</integer> <integer>22</integer>
<key>star_brightness</key> <key>star_brightness</key>
<real>0</real> <real>0</real>
<key>sun_angle</key> <key>sun_angle</key>
<real>1.5707963705062866</real> <real>1.5707963705062866</real>
<key>sunlight_color</key> <key>sunlight_color</key>
<array> <array>
<real>0.7342105507850647</real> <real>0.7342105507850647</real>
<real>0.78157895803451538</real> <real>0.78157895803451538</real>
<real>0.89999997615814209</real> <real>0.89999997615814209</real>
<real>0.29999998211860657</real> <real>0.29999998211860657</real>
</array> </array>
</map> </map>
</llsd> </llsd>

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

@@ -1,141 +1,141 @@
<llsd> <llsd>
<map> <map>
<key>ambient</key> <key>ambient</key>
<array> <array>
<real>0.22259476780891418</real> <real>0.22259476780891418</real>
<real>0.26450252532958984</real> <real>0.26450252532958984</real>
<real>0.35999998450279236</real> <real>0.35999998450279236</real>
<real>0.11999999731779099</real> <real>0.11999999731779099</real>
</array> </array>
<key>blue_density</key> <key>blue_density</key>
<array> <array>
<real>0.44999116536295314</real> <real>0.44999116536295314</real>
<real>0.44999854555993368</real> <real>0.44999854555993368</real>
<real>0.45001013284446073</real> <real>0.45001013284446073</real>
<real>1</real> <real>1</real>
</array> </array>
<key>blue_horizon</key> <key>blue_horizon</key>
<array> <array>
<real>0.23999616268583132</real> <real>0.23999616268583132</real>
<real>0.239999227803052</real> <real>0.239999227803052</real>
<real>0.24000028550619668</real> <real>0.24000028550619668</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_color</key> <key>cloud_color</key>
<array> <array>
<real>0.22615400241566114</real> <real>0.22615400241566114</real>
<real>0.22615400241566114</real> <real>0.22615400241566114</real>
<real>0.22615400241566114</real> <real>0.22615400241566114</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density1</key> <key>cloud_pos_density1</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>0.88000000953681223</real> <real>0.88000000953681223</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density2</key> <key>cloud_pos_density2</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>0.125</real> <real>0.125</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scale</key> <key>cloud_scale</key>
<array> <array>
<real>0.41999998688697815</real> <real>0.41999998688697815</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scroll_rate</key> <key>cloud_scroll_rate</key>
<array> <array>
<real>10.499400354105791</real> <real>10.499400354105791</real>
<real>10.011000104419489</real> <real>10.011000104419489</real>
</array> </array>
<key>cloud_shadow</key> <key>cloud_shadow</key>
<array> <array>
<real>0.26999998092651367</real> <real>0.26999998092651367</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>density_multiplier</key> <key>density_multiplier</key>
<array> <array>
<real>0.0003000046529240592</real> <real>0.0003000046529240592</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>distance_multiplier</key> <key>distance_multiplier</key>
<array> <array>
<real>7.8213197608078763e-005</real> <real>7.8213197608078763e-005</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>east_angle</key> <key>east_angle</key>
<real>0</real> <real>0</real>
<key>enable_cloud_scroll</key> <key>enable_cloud_scroll</key>
<array> <array>
<boolean>1</boolean> <boolean>1</boolean>
<boolean>1</boolean> <boolean>1</boolean>
</array> </array>
<key>gamma</key> <key>gamma</key>
<array> <array>
<real>1</real> <real>1</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>glow</key> <key>glow</key>
<array> <array>
<real>5.0000000000023022</real> <real>5.0000000000023022</real>
<real>0.0010000000214220922</real> <real>0.0010000000214220922</real>
<real>-0.47999999165507345</real> <real>-0.47999999165507345</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_density</key> <key>haze_density</key>
<array> <array>
<real>3.9999044060931555</real> <real>3.9999044060931555</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_horizon</key> <key>haze_horizon</key>
<array> <array>
<real>4.6348559691012062e-006</real> <real>4.6348559691012062e-006</real>
<real>0.19915600437461423</real> <real>0.19915600437461423</real>
<real>0.19915600437461423</real> <real>0.19915600437461423</real>
<real>1</real> <real>1</real>
</array> </array>
<key>lightnorm</key> <key>lightnorm</key>
<array> <array>
<real>0</real> <real>0</real>
<real>0.70710653066635132</real> <real>0.70710653066635132</real>
<real>-0.70710700750350952</real> <real>-0.70710700750350952</real>
<real>1</real> <real>1</real>
</array> </array>
<key>max_y</key> <key>max_y</key>
<array> <array>
<real>906.19008370909478</real> <real>906.19008370909478</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>preset_num</key> <key>preset_num</key>
<integer>22</integer> <integer>22</integer>
<key>star_brightness</key> <key>star_brightness</key>
<real>1.9999420642852783</real> <real>1.9999420642852783</real>
<key>sun_angle</key> <key>sun_angle</key>
<real>5.4977874755859375</real> <real>5.4977874755859375</real>
<key>sunlight_color</key> <key>sunlight_color</key>
<array> <array>
<real>0.60242295265197754</real> <real>0.60242295265197754</real>
<real>0.61447036266326904</real> <real>0.61447036266326904</real>
<real>1.1399999856948853</real> <real>1.1399999856948853</real>
<real>0.37999999523162842</real> <real>0.37999999523162842</real>
</array> </array>
</map> </map>
</llsd> </llsd>

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

@@ -1,141 +1,141 @@
<llsd> <llsd>
<map> <map>
<key>ambient</key> <key>ambient</key>
<array> <array>
<real>1.0499999523162842</real> <real>1.0499999523162842</real>
<real>1.0499999523162842</real> <real>1.0499999523162842</real>
<real>1.0499999523162842</real> <real>1.0499999523162842</real>
<real>0.34999999403953552</real> <real>0.34999999403953552</real>
</array> </array>
<key>blue_density</key> <key>blue_density</key>
<array> <array>
<real>0.2447581488182351</real> <real>0.2447581488182351</real>
<real>0.44872328639030457</real> <real>0.44872328639030457</real>
<real>0.75999999046325684</real> <real>0.75999999046325684</real>
<real>0.38000004053115788</real> <real>0.38000004053115788</real>
</array> </array>
<key>blue_horizon</key> <key>blue_horizon</key>
<array> <array>
<real>0.49548382097675159</real> <real>0.49548382097675159</real>
<real>0.49548381382419748</real> <real>0.49548381382419748</real>
<real>0.63999999284744291</real> <real>0.63999999284744291</real>
<real>0.31999999642372146</real> <real>0.31999999642372146</real>
</array> </array>
<key>cloud_color</key> <key>cloud_color</key>
<array> <array>
<real>0.40999999165535073</real> <real>0.40999999165535073</real>
<real>0.40999999165535073</real> <real>0.40999999165535073</real>
<real>0.40999999165535073</real> <real>0.40999999165535073</real>
<real>0.40999999165535073</real> <real>0.40999999165535073</real>
</array> </array>
<key>cloud_pos_density1</key> <key>cloud_pos_density1</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>0.99999999999999289</real> <real>0.99999999999999289</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density2</key> <key>cloud_pos_density2</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>0.125</real> <real>0.125</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scale</key> <key>cloud_scale</key>
<array> <array>
<real>0.4199999868869746</real> <real>0.4199999868869746</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scroll_rate</key> <key>cloud_scroll_rate</key>
<array> <array>
<real>10.199999809265137</real> <real>10.199999809265137</real>
<real>10.01099967956543</real> <real>10.01099967956543</real>
</array> </array>
<key>cloud_shadow</key> <key>cloud_shadow</key>
<array> <array>
<real>0.26999998092651367</real> <real>0.26999998092651367</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>density_multiplier</key> <key>density_multiplier</key>
<array> <array>
<real>0.00017999998817685818</real> <real>0.00017999998817685818</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>distance_multiplier</key> <key>distance_multiplier</key>
<array> <array>
<real>0.80000001192093606</real> <real>0.80000001192093606</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>east_angle</key> <key>east_angle</key>
<real>0</real> <real>0</real>
<key>enable_cloud_scroll</key> <key>enable_cloud_scroll</key>
<array> <array>
<boolean>1</boolean> <boolean>1</boolean>
<boolean>1</boolean> <boolean>1</boolean>
</array> </array>
<key>gamma</key> <key>gamma</key>
<array> <array>
<real>1</real> <real>1</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>glow</key> <key>glow</key>
<array> <array>
<real>5</real> <real>5</real>
<real>0.0010000000474974513</real> <real>0.0010000000474974513</real>
<real>-0.47999998927116394</real> <real>-0.47999998927116394</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_density</key> <key>haze_density</key>
<array> <array>
<real>0.69999998807907104</real> <real>0.69999998807907104</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_horizon</key> <key>haze_horizon</key>
<array> <array>
<real>0.18999999761581243</real> <real>0.18999999761581243</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>1</real> <real>1</real>
</array> </array>
<key>lightnorm</key> <key>lightnorm</key>
<array> <array>
<real>0</real> <real>0</real>
<real>0.70710659027099609</real> <real>0.70710659027099609</real>
<real>-0.70710694789886475</real> <real>-0.70710694789886475</real>
<real>0</real> <real>0</real>
</array> </array>
<key>max_y</key> <key>max_y</key>
<array> <array>
<real>1605</real> <real>1605</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>preset_num</key> <key>preset_num</key>
<integer>22</integer> <integer>22</integer>
<key>star_brightness</key> <key>star_brightness</key>
<real>0</real> <real>0</real>
<key>sun_angle</key> <key>sun_angle</key>
<real>2.3561947345733643</real> <real>2.3561947345733643</real>
<key>sunlight_color</key> <key>sunlight_color</key>
<array> <array>
<real>0.73421055078505759</real> <real>0.73421055078505759</real>
<real>0.78157895803450828</real> <real>0.78157895803450828</real>
<real>0.89999997615813498</real> <real>0.89999997615813498</real>
<real>0.29999998211860301</real> <real>0.29999998211860301</real>
</array> </array>
</map> </map>
</llsd> </llsd>

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

@@ -1,141 +1,141 @@
<llsd> <llsd>
<map> <map>
<key>ambient</key> <key>ambient</key>
<array> <array>
<real>0.80999994277954102</real> <real>0.80999994277954102</real>
<real>0.46289783716201782</real> <real>0.46289783716201782</real>
<real>0.62999993562698364</real> <real>0.62999993562698364</real>
<real>0.26999998092651367</real> <real>0.26999998092651367</real>
</array> </array>
<key>blue_density</key> <key>blue_density</key>
<array> <array>
<real>0.15793180465698242</real> <real>0.15793180465698242</real>
<real>0.43499568104743958</real> <real>0.43499568104743958</real>
<real>0.87000000476837158</real> <real>0.87000000476837158</real>
<real>0.87000000476837158</real> <real>0.87000000476837158</real>
</array> </array>
<key>blue_horizon</key> <key>blue_horizon</key>
<array> <array>
<real>0.20673196017742157</real> <real>0.20673196017742157</real>
<real>0.40988314151763916</real> <real>0.40988314151763916</real>
<real>0.47999998927116394</real> <real>0.47999998927116394</real>
<real>0.47999998927116394</real> <real>0.47999998927116394</real>
</array> </array>
<key>cloud_color</key> <key>cloud_color</key>
<array> <array>
<real>0.22616604226328718</real> <real>0.22616604226328718</real>
<real>0.22616604226328718</real> <real>0.22616604226328718</real>
<real>0.22616604226328718</real> <real>0.22616604226328718</real>
<real>0.99997219085526012</real> <real>0.99997219085526012</real>
</array> </array>
<key>cloud_pos_density1</key> <key>cloud_pos_density1</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>0.88000025272481253</real> <real>0.88000025272481253</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density2</key> <key>cloud_pos_density2</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>0.125</real> <real>0.125</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scale</key> <key>cloud_scale</key>
<array> <array>
<real>0.41999998688697815</real> <real>0.41999998688697815</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scroll_rate</key> <key>cloud_scroll_rate</key>
<array> <array>
<real>10.49940013883861</real> <real>10.49940013883861</real>
<real>10.010999679576344</real> <real>10.010999679576344</real>
</array> </array>
<key>cloud_shadow</key> <key>cloud_shadow</key>
<array> <array>
<real>0.26999998092651367</real> <real>0.26999998092651367</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>density_multiplier</key> <key>density_multiplier</key>
<array> <array>
<real>0.00062000000616535544</real> <real>0.00062000000616535544</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>distance_multiplier</key> <key>distance_multiplier</key>
<array> <array>
<real>2.6999279499073054</real> <real>2.6999279499073054</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>east_angle</key> <key>east_angle</key>
<real>0</real> <real>0</real>
<key>enable_cloud_scroll</key> <key>enable_cloud_scroll</key>
<array> <array>
<boolean>1</boolean> <boolean>1</boolean>
<boolean>1</boolean> <boolean>1</boolean>
</array> </array>
<key>gamma</key> <key>gamma</key>
<array> <array>
<real>1</real> <real>1</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>glow</key> <key>glow</key>
<array> <array>
<real>5.0009990693069994</real> <real>5.0009990693069994</real>
<real>0.0010000000474963411</real> <real>0.0010000000474963411</real>
<real>-0.48000101923815919</real> <real>-0.48000101923815919</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_density</key> <key>haze_density</key>
<array> <array>
<real>0.53999996185302734</real> <real>0.53999996185302734</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_horizon</key> <key>haze_horizon</key>
<array> <array>
<real>0.15999999642372131</real> <real>0.15999999642372131</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>1</real> <real>1</real>
</array> </array>
<key>lightnorm</key> <key>lightnorm</key>
<array> <array>
<real>0</real> <real>0</real>
<real>0.094108223915100098</real> <real>0.094108223915100098</real>
<real>0.99556195735931396</real> <real>0.99556195735931396</real>
<real>0</real> <real>0</real>
</array> </array>
<key>max_y</key> <key>max_y</key>
<array> <array>
<real>563</real> <real>563</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>preset_num</key> <key>preset_num</key>
<integer>22</integer> <integer>22</integer>
<key>star_brightness</key> <key>star_brightness</key>
<real>0</real> <real>0</real>
<key>sun_angle</key> <key>sun_angle</key>
<real>0.094247691333293915</real> <real>0.094247691333293915</real>
<key>sunlight_color</key> <key>sunlight_color</key>
<array> <array>
<real>2.369999885559082</real> <real>2.369999885559082</real>
<real>2.369999885559082</real> <real>2.369999885559082</real>
<real>2.369999885559082</real> <real>2.369999885559082</real>
<real>0.78999996185302734</real> <real>0.78999996185302734</real>
</array> </array>
</map> </map>
</llsd> </llsd>

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

@@ -1,142 +1,142 @@
<llsd> <llsd>
<map> <map>
<key>ambient</key> <key>ambient</key>
<array> <array>
<real>1.0199999809265137</real> <real>1.0199999809265137</real>
<real>0.80999994277954102</real> <real>0.80999994277954102</real>
<real>0.80999994277954102</real> <real>0.80999994277954102</real>
<real>1.0199999809265137</real> <real>1.0199999809265137</real>
</array> </array>
<key>blue_density</key> <key>blue_density</key>
<array> <array>
<real>0.14522500336170197</real> <real>0.14522500336170197</real>
<real>0.39999699592590332</real> <real>0.39999699592590332</real>
<real>0.80000197887420654</real> <real>0.80000197887420654</real>
<real>1</real> <real>1</real>
</array> </array>
<key>blue_horizon</key> <key>blue_horizon</key>
<array> <array>
<real>0.10767599940299988</real> <real>0.10767599940299988</real>
<real>0.21348699927330017</real> <real>0.21348699927330017</real>
<real>0.25</real> <real>0.25</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_color</key> <key>cloud_color</key>
<array> <array>
<real>0.22615399956703186</real> <real>0.22615399956703186</real>
<real>0.22615399956703186</real> <real>0.22615399956703186</real>
<real>0.22615399956703186</real> <real>0.22615399956703186</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density1</key> <key>cloud_pos_density1</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>0.87999999523162842</real> <real>0.87999999523162842</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density2</key> <key>cloud_pos_density2</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>0.125</real> <real>0.125</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scale</key> <key>cloud_scale</key>
<array> <array>
<real>0.41999998688697815</real> <real>0.41999998688697815</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scroll_rate</key> <key>cloud_scroll_rate</key>
<array> <array>
<real>10.49940013885498</real> <real>10.49940013885498</real>
<real>10.01099967956543</real> <real>10.01099967956543</real>
</array> </array>
<key>cloud_shadow</key> <key>cloud_shadow</key>
<array> <array>
<real>0.26999998092651367</real> <real>0.26999998092651367</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>density_multiplier</key> <key>density_multiplier</key>
<array> <array>
<real>0.00046000001020729542</real> <real>0.00046000001020729542</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>distance_multiplier</key> <key>distance_multiplier</key>
<array> <array>
<real>1</real> <real>1</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>east_angle</key> <key>east_angle</key>
<real>0</real> <real>0</real>
<key>enable_cloud_scroll</key> <key>enable_cloud_scroll</key>
<array> <array>
<boolean>1</boolean> <boolean>1</boolean>
<boolean>1</boolean> <boolean>1</boolean>
</array> </array>
<key>gamma</key> <key>gamma</key>
<array> <array>
<real>1</real> <real>1</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>glow</key> <key>glow</key>
<array> <array>
<real>5</real> <real>5</real>
<real>0.0010000000474974513</real> <real>0.0010000000474974513</real>
<real>-0.47999998927116394</real> <real>-0.47999998927116394</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_density</key> <key>haze_density</key>
<array> <array>
<real>0.69999998807907104</real> <real>0.69999998807907104</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_horizon</key> <key>haze_horizon</key>
<array> <array>
<real>0.15999999642372131</real> <real>0.15999999642372131</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>1</real> <real>1</real>
</array> </array>
<key>lightnorm</key> <key>lightnorm</key>
<array> <array>
<real>0</real> <real>0</real>
<real>0.07532646507024765</real> <real>0.07532646507024765</real>
<real>-0.99715894460678101</real> <real>-0.99715894460678101</real>
<real>0</real> <real>0</real>
</array> </array>
<key>max_y</key> <key>max_y</key>
<array> <array>
<real>562.5</real> <real>562.5</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>preset_num</key> <key>preset_num</key>
<integer>22</integer> <integer>22</integer>
<key>star_brightness</key> <key>star_brightness</key>
<real>0</real> <real>0</real>
<key>sun_angle</key> <key>sun_angle</key>
<real>3.0661947727203369</real> <real>3.0661947727203369</real>
<key>sunlight_color</key> <key>sunlight_color</key>
<array> <array>
<real>2.8385701179504395</real> <real>2.8385701179504395</real>
<real>2.8385701179504395</real> <real>2.8385701179504395</real>
<real>2.8385701179504395</real> <real>2.8385701179504395</real>
<real>1</real> <real>1</real>
</array> </array>
</map> </map>
</llsd> </llsd>

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

@@ -1,141 +1,141 @@
<llsd> <llsd>
<map> <map>
<key>ambient</key> <key>ambient</key>
<array> <array>
<real>1.0499999949065426</real> <real>1.0499999949065426</real>
<real>1.0499999988079054</real> <real>1.0499999988079054</real>
<real>1.0499999988079054</real> <real>1.0499999988079054</real>
<real>0.3500000095367426</real> <real>0.3500000095367426</real>
</array> </array>
<key>blue_density</key> <key>blue_density</key>
<array> <array>
<real>0.15999999642372131</real> <real>0.15999999642372131</real>
<real>0.44872328639030457</real> <real>0.44872328639030457</real>
<real>0.75999999046325684</real> <real>0.75999999046325684</real>
<real>0.75999999046325684</real> <real>0.75999999046325684</real>
</array> </array>
<key>blue_horizon</key> <key>blue_horizon</key>
<array> <array>
<real>0.53999996185302734</real> <real>0.53999996185302734</real>
<real>0.47999998927116394</real> <real>0.47999998927116394</real>
<real>0.69999998807907104</real> <real>0.69999998807907104</real>
<real>0.34999999403953552</real> <real>0.34999999403953552</real>
</array> </array>
<key>cloud_color</key> <key>cloud_color</key>
<array> <array>
<real>0.37000000476837158</real> <real>0.37000000476837158</real>
<real>0.37000000476837158</real> <real>0.37000000476837158</real>
<real>0.37000000476837158</real> <real>0.37000000476837158</real>
<real>0.37000000476837158</real> <real>0.37000000476837158</real>
</array> </array>
<key>cloud_pos_density1</key> <key>cloud_pos_density1</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>0.99999998569455784</real> <real>0.99999998569455784</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density2</key> <key>cloud_pos_density2</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>0.125</real> <real>0.125</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scale</key> <key>cloud_scale</key>
<array> <array>
<real>0.41999997615814166</real> <real>0.41999997615814166</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scroll_rate</key> <key>cloud_scroll_rate</key>
<array> <array>
<real>10.199999844956437</real> <real>10.199999844956437</real>
<real>10.01099967956543</real> <real>10.01099967956543</real>
</array> </array>
<key>cloud_shadow</key> <key>cloud_shadow</key>
<array> <array>
<real>0.27333331108093262</real> <real>0.27333331108093262</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>density_multiplier</key> <key>density_multiplier</key>
<array> <array>
<real>0.00017999998102430359</real> <real>0.00017999998102430359</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>distance_multiplier</key> <key>distance_multiplier</key>
<array> <array>
<real>0.80000008344649842</real> <real>0.80000008344649842</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>east_angle</key> <key>east_angle</key>
<real>0</real> <real>0</real>
<key>enable_cloud_scroll</key> <key>enable_cloud_scroll</key>
<array> <array>
<boolean>1</boolean> <boolean>1</boolean>
<boolean>1</boolean> <boolean>1</boolean>
</array> </array>
<key>gamma</key> <key>gamma</key>
<array> <array>
<real>1</real> <real>1</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>glow</key> <key>glow</key>
<array> <array>
<real>4.9999999284740397</real> <real>4.9999999284740397</real>
<real>0.0010000000474974513</real> <real>0.0010000000474974513</real>
<real>-0.47999999046327346</real> <real>-0.47999999046327346</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_density</key> <key>haze_density</key>
<array> <array>
<real>0.70000003576435432</real> <real>0.70000003576435432</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_horizon</key> <key>haze_horizon</key>
<array> <array>
<real>0.18999999284767277</real> <real>0.18999999284767277</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>1</real> <real>1</real>
</array> </array>
<key>lightnorm</key> <key>lightnorm</key>
<array> <array>
<real>0</real> <real>0</real>
<real>0.70710676908493042</real> <real>0.70710676908493042</real>
<real>0.70710676908493042</real> <real>0.70710676908493042</real>
<real>0</real> <real>0</real>
</array> </array>
<key>max_y</key> <key>max_y</key>
<array> <array>
<real>1605</real> <real>1605</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>preset_num</key> <key>preset_num</key>
<integer>22</integer> <integer>22</integer>
<key>star_brightness</key> <key>star_brightness</key>
<real>0</real> <real>0</real>
<key>sun_angle</key> <key>sun_angle</key>
<real>0.78539818525314331</real> <real>0.78539818525314331</real>
<key>sunlight_color</key> <key>sunlight_color</key>
<array> <array>
<real>0.73421054104441197</real> <real>0.73421054104441197</real>
<real>0.7815789463510896</real> <real>0.7815789463510896</real>
<real>0.89999995470046912</real> <real>0.89999995470046912</real>
<real>0.29999997496605069</real> <real>0.29999997496605069</real>
</array> </array>
</map> </map>
</llsd> </llsd>

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

@@ -1,141 +1,141 @@
<llsd> <llsd>
<map> <map>
<key>ambient</key> <key>ambient</key>
<array> <array>
<real>0.20404692765200849</real> <real>0.20404692765200849</real>
<real>0.24246276689169122</real> <real>0.24246276689169122</real>
<real>0.33000383615406292</real> <real>0.33000383615406292</real>
<real>0.1100123608103587</real> <real>0.1100123608103587</real>
</array> </array>
<key>blue_density</key> <key>blue_density</key>
<array> <array>
<real>0.44999116536295314</real> <real>0.44999116536295314</real>
<real>0.44999854555993368</real> <real>0.44999854555993368</real>
<real>0.45001013284446073</real> <real>0.45001013284446073</real>
<real>1</real> <real>1</real>
</array> </array>
<key>blue_horizon</key> <key>blue_horizon</key>
<array> <array>
<real>0.23999616268583132</real> <real>0.23999616268583132</real>
<real>0.239999227803052</real> <real>0.239999227803052</real>
<real>0.24000028550619668</real> <real>0.24000028550619668</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_color</key> <key>cloud_color</key>
<array> <array>
<real>0.22615400241566114</real> <real>0.22615400241566114</real>
<real>0.22615400241566114</real> <real>0.22615400241566114</real>
<real>0.22615400241566114</real> <real>0.22615400241566114</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density1</key> <key>cloud_pos_density1</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>0.88000000953681223</real> <real>0.88000000953681223</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density2</key> <key>cloud_pos_density2</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>0.125</real> <real>0.125</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scale</key> <key>cloud_scale</key>
<array> <array>
<real>0.41999998688697815</real> <real>0.41999998688697815</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scroll_rate</key> <key>cloud_scroll_rate</key>
<array> <array>
<real>10.499400354105791</real> <real>10.499400354105791</real>
<real>10.011000104419489</real> <real>10.011000104419489</real>
</array> </array>
<key>cloud_shadow</key> <key>cloud_shadow</key>
<array> <array>
<real>0.26999998092651367</real> <real>0.26999998092651367</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>density_multiplier</key> <key>density_multiplier</key>
<array> <array>
<real>0.0003000046529240592</real> <real>0.0003000046529240592</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>distance_multiplier</key> <key>distance_multiplier</key>
<array> <array>
<real>7.8213197608078763e-005</real> <real>7.8213197608078763e-005</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>east_angle</key> <key>east_angle</key>
<real>0</real> <real>0</real>
<key>enable_cloud_scroll</key> <key>enable_cloud_scroll</key>
<array> <array>
<boolean>1</boolean> <boolean>1</boolean>
<boolean>1</boolean> <boolean>1</boolean>
</array> </array>
<key>gamma</key> <key>gamma</key>
<array> <array>
<real>1</real> <real>1</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>glow</key> <key>glow</key>
<array> <array>
<real>5.0000000000023022</real> <real>5.0000000000023022</real>
<real>0.0010000000214220922</real> <real>0.0010000000214220922</real>
<real>-0.47999999165507345</real> <real>-0.47999999165507345</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_density</key> <key>haze_density</key>
<array> <array>
<real>3.9999044060931555</real> <real>3.9999044060931555</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_horizon</key> <key>haze_horizon</key>
<array> <array>
<real>4.6348559691012062e-006</real> <real>4.6348559691012062e-006</real>
<real>0.19915600437461423</real> <real>0.19915600437461423</real>
<real>0.19915600437461423</real> <real>0.19915600437461423</real>
<real>1</real> <real>1</real>
</array> </array>
<key>lightnorm</key> <key>lightnorm</key>
<array> <array>
<real>0</real> <real>0</real>
<real>0.70710688829421997</real> <real>0.70710688829421997</real>
<real>0.70710664987564087</real> <real>0.70710664987564087</real>
<real>1</real> <real>1</real>
</array> </array>
<key>max_y</key> <key>max_y</key>
<array> <array>
<real>906.19008370909478</real> <real>906.19008370909478</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>preset_num</key> <key>preset_num</key>
<integer>22</integer> <integer>22</integer>
<key>star_brightness</key> <key>star_brightness</key>
<real>1.9999420642852783</real> <real>1.9999420642852783</real>
<key>sun_angle</key> <key>sun_angle</key>
<real>3.9269909858703613</real> <real>3.9269909858703613</real>
<key>sunlight_color</key> <key>sunlight_color</key>
<array> <array>
<real>0.34878980098432066</real> <real>0.34878980098432066</real>
<real>0.35576509414380553</real> <real>0.35576509414380553</real>
<real>0.66003586768772493</real> <real>0.66003586768772493</real>
<real>0.22001197576412324</real> <real>0.22001197576412324</real>
</array> </array>
</map> </map>
</llsd> </llsd>

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

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

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

@@ -1,141 +1,141 @@
<llsd> <llsd>
<map> <map>
<key>ambient</key> <key>ambient</key>
<array> <array>
<real>0.4823022186756134</real> <real>0.4823022186756134</real>
<real>0.57310229539871216</real> <real>0.57310229539871216</real>
<real>0.77999997138977051</real> <real>0.77999997138977051</real>
<real>0.25999999046325684</real> <real>0.25999999046325684</real>
</array> </array>
<key>blue_density</key> <key>blue_density</key>
<array> <array>
<real>0.14522500336170197</real> <real>0.14522500336170197</real>
<real>0.39999699592590332</real> <real>0.39999699592590332</real>
<real>0.80000197887420654</real> <real>0.80000197887420654</real>
<real>1</real> <real>1</real>
</array> </array>
<key>blue_horizon</key> <key>blue_horizon</key>
<array> <array>
<real>0.15130999684333801</real> <real>0.15130999684333801</real>
<real>0.30000001192092896</real> <real>0.30000001192092896</real>
<real>0.35131001472473145</real> <real>0.35131001472473145</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_color</key> <key>cloud_color</key>
<array> <array>
<real>0.12862999737262726</real> <real>0.12862999737262726</real>
<real>0.12862999737262726</real> <real>0.12862999737262726</real>
<real>0.12862999737262726</real> <real>0.12862999737262726</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density1</key> <key>cloud_pos_density1</key>
<array> <array>
<real>0.88419097661972046</real> <real>0.88419097661972046</real>
<real>0.53047597408294678</real> <real>0.53047597408294678</real>
<real>0.4270470142364502</real> <real>0.4270470142364502</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density2</key> <key>cloud_pos_density2</key>
<array> <array>
<real>0.38419300317764282</real> <real>0.38419300317764282</real>
<real>0.5</real> <real>0.5</real>
<real>0.125</real> <real>0.125</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scale</key> <key>cloud_scale</key>
<array> <array>
<real>0.41999998688697815</real> <real>0.41999998688697815</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scroll_rate</key> <key>cloud_scroll_rate</key>
<array> <array>
<real>10</real> <real>10</real>
<real>10</real> <real>10</real>
</array> </array>
<key>cloud_shadow</key> <key>cloud_shadow</key>
<array> <array>
<real>0.61711597442626953</real> <real>0.61711597442626953</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>density_multiplier</key> <key>density_multiplier</key>
<array> <array>
<real>0.0001250890054507181</real> <real>0.0001250890054507181</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>distance_multiplier</key> <key>distance_multiplier</key>
<array> <array>
<real>11.40000057220459</real> <real>11.40000057220459</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>east_angle</key> <key>east_angle</key>
<real>0</real> <real>0</real>
<key>enable_cloud_scroll</key> <key>enable_cloud_scroll</key>
<array> <array>
<boolean>1</boolean> <boolean>1</boolean>
<boolean>1</boolean> <boolean>1</boolean>
</array> </array>
<key>gamma</key> <key>gamma</key>
<array> <array>
<real>1</real> <real>1</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>glow</key> <key>glow</key>
<array> <array>
<real>6.4079799652099609</real> <real>6.4079799652099609</real>
<real>0.0012815999798476696</real> <real>0.0012815999798476696</real>
<real>-0.42292699217796326</real> <real>-0.42292699217796326</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_density</key> <key>haze_density</key>
<array> <array>
<real>4</real> <real>4</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_horizon</key> <key>haze_horizon</key>
<array> <array>
<real>0.21744099259376526</real> <real>0.21744099259376526</real>
<real>0.21744099259376526</real> <real>0.21744099259376526</real>
<real>0.21744099259376526</real> <real>0.21744099259376526</real>
<real>1</real> <real>1</real>
</array> </array>
<key>lightnorm</key> <key>lightnorm</key>
<array> <array>
<real>0</real> <real>0</real>
<real>0.15643447637557983</real> <real>0.15643447637557983</real>
<real>0.98768836259841919</real> <real>0.98768836259841919</real>
<real>0</real> <real>0</real>
</array> </array>
<key>max_y</key> <key>max_y</key>
<array> <array>
<real>4000</real> <real>4000</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>preset_num</key> <key>preset_num</key>
<integer>2</integer> <integer>2</integer>
<key>star_brightness</key> <key>star_brightness</key>
<real>0</real> <real>0</real>
<key>sun_angle</key> <key>sun_angle</key>
<real>0.15707963705062866</real> <real>0.15707963705062866</real>
<key>sunlight_color</key> <key>sunlight_color</key>
<array> <array>
<real>3</real> <real>3</real>
<real>3</real> <real>3</real>
<real>3</real> <real>3</real>
<real>1</real> <real>1</real>
</array> </array>
</map> </map>
</llsd> </llsd>

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

@@ -1,141 +1,141 @@
<llsd> <llsd>
<map> <map>
<key>ambient</key> <key>ambient</key>
<array> <array>
<real>0.14999999105930328</real> <real>0.14999999105930328</real>
<real>0.14999999105930328</real> <real>0.14999999105930328</real>
<real>0.14999999105930328</real> <real>0.14999999105930328</real>
<real>0.049999997019767761</real> <real>0.049999997019767761</real>
</array> </array>
<key>blue_density</key> <key>blue_density</key>
<array> <array>
<real>0.18153078854084015</real> <real>0.18153078854084015</real>
<real>0.49999505281448364</real> <real>0.49999505281448364</real>
<real>1</real> <real>1</real>
<real>1</real> <real>1</real>
</array> </array>
<key>blue_horizon</key> <key>blue_horizon</key>
<array> <array>
<real>0.43070217967033386</real> <real>0.43070217967033386</real>
<real>0.85394656658172607</real> <real>0.85394656658172607</real>
<real>1</real> <real>1</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_color</key> <key>cloud_color</key>
<array> <array>
<real>0.53962135314941406</real> <real>0.53962135314941406</real>
<real>0.53962135314941406</real> <real>0.53962135314941406</real>
<real>0.53962135314941406</real> <real>0.53962135314941406</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density1</key> <key>cloud_pos_density1</key>
<array> <array>
<real>0.5</real> <real>0.5</real>
<real>0.5</real> <real>0.5</real>
<real>0.69569224119186401</real> <real>0.69569224119186401</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density2</key> <key>cloud_pos_density2</key>
<array> <array>
<real>0.5</real> <real>0.5</real>
<real>0.5</real> <real>0.5</real>
<real>0.125</real> <real>0.125</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scale</key> <key>cloud_scale</key>
<array> <array>
<real>0.10999999195337296</real> <real>0.10999999195337296</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scroll_rate</key> <key>cloud_scroll_rate</key>
<array> <array>
<real>10.49940013885498</real> <real>10.49940013885498</real>
<real>10.01099967956543</real> <real>10.01099967956543</real>
</array> </array>
<key>cloud_shadow</key> <key>cloud_shadow</key>
<array> <array>
<real>0.3765256404876709</real> <real>0.3765256404876709</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>density_multiplier</key> <key>density_multiplier</key>
<array> <array>
<real>0.0003499999875202775</real> <real>0.0003499999875202775</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>distance_multiplier</key> <key>distance_multiplier</key>
<array> <array>
<real>2.9846153259277344</real> <real>2.9846153259277344</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>east_angle</key> <key>east_angle</key>
<real>0</real> <real>0</real>
<key>enable_cloud_scroll</key> <key>enable_cloud_scroll</key>
<array> <array>
<boolean>1</boolean> <boolean>1</boolean>
<boolean>1</boolean> <boolean>1</boolean>
</array> </array>
<key>gamma</key> <key>gamma</key>
<array> <array>
<real>1</real> <real>1</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>glow</key> <key>glow</key>
<array> <array>
<real>4.2061538696289062</real> <real>4.2061538696289062</real>
<real>0.0010000000474974513</real> <real>0.0010000000474974513</real>
<real>-0.44246155023574829</real> <real>-0.44246155023574829</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_density</key> <key>haze_density</key>
<array> <array>
<real>2.8830769062042236</real> <real>2.8830769062042236</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_horizon</key> <key>haze_horizon</key>
<array> <array>
<real>0.49740666151046753</real> <real>0.49740666151046753</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>1</real> <real>1</real>
</array> </array>
<key>lightnorm</key> <key>lightnorm</key>
<array> <array>
<real>0</real> <real>0</real>
<real>0.86074197292327881</real> <real>0.86074197292327881</real>
<real>-0.50904154777526855</real> <real>-0.50904154777526855</real>
<real>0</real> <real>0</real>
</array> </array>
<key>max_y</key> <key>max_y</key>
<array> <array>
<real>600</real> <real>600</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>preset_num</key> <key>preset_num</key>
<integer>10</integer> <integer>10</integer>
<key>star_brightness</key> <key>star_brightness</key>
<real>0</real> <real>0</real>
<key>sun_angle</key> <key>sun_angle</key>
<real>2.1048672199249268</real> <real>2.1048672199249268</real>
<key>sunlight_color</key> <key>sunlight_color</key>
<array> <array>
<real>0.88526362180709839</real> <real>0.88526362180709839</real>
<real>1.2300000190734863</real> <real>1.2300000190734863</real>
<real>1.2300000190734863</real> <real>1.2300000190734863</real>
<real>0.40999999642372131</real> <real>0.40999999642372131</real>
</array> </array>
</map> </map>
</llsd> </llsd>

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

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

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

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

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

@@ -1,141 +1,141 @@
<llsd> <llsd>
<map> <map>
<key>ambient</key> <key>ambient</key>
<array> <array>
<real>1.0499999523162842</real> <real>1.0499999523162842</real>
<real>1.0499999523162842</real> <real>1.0499999523162842</real>
<real>1.0499999523162842</real> <real>1.0499999523162842</real>
<real>0.34999999403953552</real> <real>0.34999999403953552</real>
</array> </array>
<key>blue_density</key> <key>blue_density</key>
<array> <array>
<real>0.24475815892219543</real> <real>0.24475815892219543</real>
<real>0.44872328639030457</real> <real>0.44872328639030457</real>
<real>0.75999999046325684</real> <real>0.75999999046325684</real>
<real>0.37999999523162842</real> <real>0.37999999523162842</real>
</array> </array>
<key>blue_horizon</key> <key>blue_horizon</key>
<array> <array>
<real>0.49548381567001343</real> <real>0.49548381567001343</real>
<real>0.49548381567001343</real> <real>0.49548381567001343</real>
<real>0.63999998569488525</real> <real>0.63999998569488525</real>
<real>0.31999999284744263</real> <real>0.31999999284744263</real>
</array> </array>
<key>cloud_color</key> <key>cloud_color</key>
<array> <array>
<real>0.40999999642372131</real> <real>0.40999999642372131</real>
<real>0.40999999642372131</real> <real>0.40999999642372131</real>
<real>0.40999999642372131</real> <real>0.40999999642372131</real>
<real>0.40999999642372131</real> <real>0.40999999642372131</real>
</array> </array>
<key>cloud_pos_density1</key> <key>cloud_pos_density1</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>1</real> <real>1</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density2</key> <key>cloud_pos_density2</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>0.125</real> <real>0.125</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scale</key> <key>cloud_scale</key>
<array> <array>
<real>0.41999998688697815</real> <real>0.41999998688697815</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scroll_rate</key> <key>cloud_scroll_rate</key>
<array> <array>
<real>10.199999809265137</real> <real>10.199999809265137</real>
<real>10.01099967956543</real> <real>10.01099967956543</real>
</array> </array>
<key>cloud_shadow</key> <key>cloud_shadow</key>
<array> <array>
<real>0.26999998092651367</real> <real>0.26999998092651367</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>density_multiplier</key> <key>density_multiplier</key>
<array> <array>
<real>0.00017999998817685992</real> <real>0.00017999998817685992</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>distance_multiplier</key> <key>distance_multiplier</key>
<array> <array>
<real>0.80000001192092896</real> <real>0.80000001192092896</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>east_angle</key> <key>east_angle</key>
<real>0</real> <real>0</real>
<key>enable_cloud_scroll</key> <key>enable_cloud_scroll</key>
<array> <array>
<boolean>1</boolean> <boolean>1</boolean>
<boolean>1</boolean> <boolean>1</boolean>
</array> </array>
<key>gamma</key> <key>gamma</key>
<array> <array>
<real>1</real> <real>1</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>glow</key> <key>glow</key>
<array> <array>
<real>5</real> <real>5</real>
<real>0.0010000000474974513</real> <real>0.0010000000474974513</real>
<real>-0.47999998927116394</real> <real>-0.47999998927116394</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_density</key> <key>haze_density</key>
<array> <array>
<real>0.69999998807907104</real> <real>0.69999998807907104</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_horizon</key> <key>haze_horizon</key>
<array> <array>
<real>0.18999999761581421</real> <real>0.18999999761581421</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>1</real> <real>1</real>
</array> </array>
<key>lightnorm</key> <key>lightnorm</key>
<array> <array>
<real>0</real> <real>0</real>
<real>0.91269159317016602</real> <real>0.91269159317016602</real>
<real>-0.40864911675453186</real> <real>-0.40864911675453186</real>
<real>0</real> <real>0</real>
</array> </array>
<key>max_y</key> <key>max_y</key>
<array> <array>
<real>1605</real> <real>1605</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>preset_num</key> <key>preset_num</key>
<integer>22</integer> <integer>22</integer>
<key>star_brightness</key> <key>star_brightness</key>
<real>0</real> <real>0</real>
<key>sun_angle</key> <key>sun_angle</key>
<real>1.9917697906494141</real> <real>1.9917697906494141</real>
<key>sunlight_color</key> <key>sunlight_color</key>
<array> <array>
<real>0.7342105507850647</real> <real>0.7342105507850647</real>
<real>0.78157895803451538</real> <real>0.78157895803451538</real>
<real>0.89999997615814209</real> <real>0.89999997615814209</real>
<real>0.29999998211860657</real> <real>0.29999998211860657</real>
</array> </array>
</map> </map>
</llsd> </llsd>

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

@@ -1,141 +1,141 @@
<llsd> <llsd>
<map> <map>
<key>ambient</key> <key>ambient</key>
<array> <array>
<real>0.07420019805431366</real> <real>0.07420019805431366</real>
<real>0.088169597089290619</real> <real>0.088169597089290619</real>
<real>0.11999999731779099</real> <real>0.11999999731779099</real>
<real>1</real> <real>1</real>
</array> </array>
<key>blue_density</key> <key>blue_density</key>
<array> <array>
<real>0.14522500336170197</real> <real>0.14522500336170197</real>
<real>0.39999699592590332</real> <real>0.39999699592590332</real>
<real>0.80000197887420654</real> <real>0.80000197887420654</real>
<real>1</real> <real>1</real>
</array> </array>
<key>blue_horizon</key> <key>blue_horizon</key>
<array> <array>
<real>0.10767599940299988</real> <real>0.10767599940299988</real>
<real>0.21348699927330017</real> <real>0.21348699927330017</real>
<real>0.25</real> <real>0.25</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_color</key> <key>cloud_color</key>
<array> <array>
<real>0.22615399956703186</real> <real>0.22615399956703186</real>
<real>0.22615399956703186</real> <real>0.22615399956703186</real>
<real>0.22615399956703186</real> <real>0.22615399956703186</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density1</key> <key>cloud_pos_density1</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>1</real> <real>1</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density2</key> <key>cloud_pos_density2</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>0.125</real> <real>0.125</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scale</key> <key>cloud_scale</key>
<array> <array>
<real>0.41999998688697815</real> <real>0.41999998688697815</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scroll_rate</key> <key>cloud_scroll_rate</key>
<array> <array>
<real>10.199999809265137</real> <real>10.199999809265137</real>
<real>10.01099967956543</real> <real>10.01099967956543</real>
</array> </array>
<key>cloud_shadow</key> <key>cloud_shadow</key>
<array> <array>
<real>0.37999999523162842</real> <real>0.37999999523162842</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>density_multiplier</key> <key>density_multiplier</key>
<array> <array>
<real>0.00046000001020729542</real> <real>0.00046000001020729542</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>distance_multiplier</key> <key>distance_multiplier</key>
<array> <array>
<real>2</real> <real>2</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>east_angle</key> <key>east_angle</key>
<real>0</real> <real>0</real>
<key>enable_cloud_scroll</key> <key>enable_cloud_scroll</key>
<array> <array>
<boolean>1</boolean> <boolean>1</boolean>
<boolean>1</boolean> <boolean>1</boolean>
</array> </array>
<key>gamma</key> <key>gamma</key>
<array> <array>
<real>1.6100000143051147</real> <real>1.6100000143051147</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>glow</key> <key>glow</key>
<array> <array>
<real>5</real> <real>5</real>
<real>0.0010000000474974513</real> <real>0.0010000000474974513</real>
<real>-0.47999998927116394</real> <real>-0.47999998927116394</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_density</key> <key>haze_density</key>
<array> <array>
<real>0.69999998807907104</real> <real>0.69999998807907104</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_horizon</key> <key>haze_horizon</key>
<array> <array>
<real>0.15999999642372131</real> <real>0.15999999642372131</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>1</real> <real>1</real>
</array> </array>
<key>lightnorm</key> <key>lightnorm</key>
<array> <array>
<real>0</real> <real>0</real>
<real>0.062790460884571075</real> <real>0.062790460884571075</real>
<real>-0.99802672863006592</real> <real>-0.99802672863006592</real>
<real>0</real> <real>0</real>
</array> </array>
<key>max_y</key> <key>max_y</key>
<array> <array>
<real>562.5</real> <real>562.5</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>preset_num</key> <key>preset_num</key>
<integer>22</integer> <integer>22</integer>
<key>star_brightness</key> <key>star_brightness</key>
<real>0</real> <real>0</real>
<key>sun_angle</key> <key>sun_angle</key>
<real>3.0787608623504639</real> <real>3.0787608623504639</real>
<key>sunlight_color</key> <key>sunlight_color</key>
<array> <array>
<real>2.8385701179504395</real> <real>2.8385701179504395</real>
<real>2.8385701179504395</real> <real>2.8385701179504395</real>
<real>2.8385701179504395</real> <real>2.8385701179504395</real>
<real>1</real> <real>1</real>
</array> </array>
</map> </map>
</llsd> </llsd>

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

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

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

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

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

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

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

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

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

@@ -1,141 +1,141 @@
<llsd> <llsd>
<map> <map>
<key>ambient</key> <key>ambient</key>
<array> <array>
<real>0.32999998331069946</real> <real>0.32999998331069946</real>
<real>0.32999998331069946</real> <real>0.32999998331069946</real>
<real>0.32999998331069946</real> <real>0.32999998331069946</real>
<real>0.10999999940395355</real> <real>0.10999999940395355</real>
</array> </array>
<key>blue_density</key> <key>blue_density</key>
<array> <array>
<real>0.14522500336170197</real> <real>0.14522500336170197</real>
<real>0.39999699592590332</real> <real>0.39999699592590332</real>
<real>0.80000197887420654</real> <real>0.80000197887420654</real>
<real>1</real> <real>1</real>
</array> </array>
<key>blue_horizon</key> <key>blue_horizon</key>
<array> <array>
<real>0.15130999684333801</real> <real>0.15130999684333801</real>
<real>0.30000001192092896</real> <real>0.30000001192092896</real>
<real>0.35131001472473145</real> <real>0.35131001472473145</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_color</key> <key>cloud_color</key>
<array> <array>
<real>0.22615399956703186</real> <real>0.22615399956703186</real>
<real>0.22615399956703186</real> <real>0.22615399956703186</real>
<real>0.22615399956703186</real> <real>0.22615399956703186</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density1</key> <key>cloud_pos_density1</key>
<array> <array>
<real>0.65280699729919434</real> <real>0.65280699729919434</real>
<real>0.50335597991943359</real> <real>0.50335597991943359</real>
<real>1</real> <real>1</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density2</key> <key>cloud_pos_density2</key>
<array> <array>
<real>0.65280699729919434</real> <real>0.65280699729919434</real>
<real>0.50335597991943359</real> <real>0.50335597991943359</real>
<real>0.125</real> <real>0.125</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scale</key> <key>cloud_scale</key>
<array> <array>
<real>0.41999998688697815</real> <real>0.41999998688697815</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scroll_rate</key> <key>cloud_scroll_rate</key>
<array> <array>
<real>10.49940013885498</real> <real>10.49940013885498</real>
<real>10.01099967956543</real> <real>10.01099967956543</real>
</array> </array>
<key>cloud_shadow</key> <key>cloud_shadow</key>
<array> <array>
<real>0.33064401149749756</real> <real>0.33064401149749756</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>density_multiplier</key> <key>density_multiplier</key>
<array> <array>
<real>0.0003499999875202775</real> <real>0.0003499999875202775</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>distance_multiplier</key> <key>distance_multiplier</key>
<array> <array>
<real>1</real> <real>1</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>east_angle</key> <key>east_angle</key>
<real>0</real> <real>0</real>
<key>enable_cloud_scroll</key> <key>enable_cloud_scroll</key>
<array> <array>
<boolean>1</boolean> <boolean>1</boolean>
<boolean>1</boolean> <boolean>1</boolean>
</array> </array>
<key>gamma</key> <key>gamma</key>
<array> <array>
<real>1</real> <real>1</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>glow</key> <key>glow</key>
<array> <array>
<real>5</real> <real>5</real>
<real>0.0010000000474974513</real> <real>0.0010000000474974513</real>
<real>-0.33000001311302185</real> <real>-0.33000001311302185</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_density</key> <key>haze_density</key>
<array> <array>
<real>0.69999998807907104</real> <real>0.69999998807907104</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_horizon</key> <key>haze_horizon</key>
<array> <array>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>1</real> <real>1</real>
</array> </array>
<key>lightnorm</key> <key>lightnorm</key>
<array> <array>
<real>0</real> <real>0</real>
<real>0.062790460884571075</real> <real>0.062790460884571075</real>
<real>-0.99802672863006592</real> <real>-0.99802672863006592</real>
<real>0</real> <real>0</real>
</array> </array>
<key>max_y</key> <key>max_y</key>
<array> <array>
<real>600</real> <real>600</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>preset_num</key> <key>preset_num</key>
<integer>11</integer> <integer>11</integer>
<key>star_brightness</key> <key>star_brightness</key>
<real>0</real> <real>0</real>
<key>sun_angle</key> <key>sun_angle</key>
<real>3.0787608623504639</real> <real>3.0787608623504639</real>
<key>sunlight_color</key> <key>sunlight_color</key>
<array> <array>
<real>0.86811381578445435</real> <real>0.86811381578445435</real>
<real>2.2200000286102295</real> <real>2.2200000286102295</real>
<real>2.2200000286102295</real> <real>2.2200000286102295</real>
<real>0.74000000953674316</real> <real>0.74000000953674316</real>
</array> </array>
</map> </map>
</llsd> </llsd>

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

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

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

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

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

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

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

@@ -1,141 +1,141 @@
<llsd> <llsd>
<map> <map>
<key>ambient</key> <key>ambient</key>
<array> <array>
<real>1.0499999523162842</real> <real>1.0499999523162842</real>
<real>1.0499999523162842</real> <real>1.0499999523162842</real>
<real>1.0499999523162842</real> <real>1.0499999523162842</real>
<real>0.34999999403953552</real> <real>0.34999999403953552</real>
</array> </array>
<key>blue_density</key> <key>blue_density</key>
<array> <array>
<real>0.24475815892219543</real> <real>0.24475815892219543</real>
<real>0.44872328639030457</real> <real>0.44872328639030457</real>
<real>0.75999999046325684</real> <real>0.75999999046325684</real>
<real>0.37999999523162842</real> <real>0.37999999523162842</real>
</array> </array>
<key>blue_horizon</key> <key>blue_horizon</key>
<array> <array>
<real>0.49548381567001343</real> <real>0.49548381567001343</real>
<real>0.49548381567001343</real> <real>0.49548381567001343</real>
<real>0.63999998569488525</real> <real>0.63999998569488525</real>
<real>0.31999999284744263</real> <real>0.31999999284744263</real>
</array> </array>
<key>cloud_color</key> <key>cloud_color</key>
<array> <array>
<real>0.40999999642372131</real> <real>0.40999999642372131</real>
<real>0.40999999642372131</real> <real>0.40999999642372131</real>
<real>0.40999999642372131</real> <real>0.40999999642372131</real>
<real>0.40999999642372131</real> <real>0.40999999642372131</real>
</array> </array>
<key>cloud_pos_density1</key> <key>cloud_pos_density1</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>1</real> <real>1</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density2</key> <key>cloud_pos_density2</key>
<array> <array>
<real>1.6884100437164307</real> <real>1.6884100437164307</real>
<real>0.52609699964523315</real> <real>0.52609699964523315</real>
<real>0.125</real> <real>0.125</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scale</key> <key>cloud_scale</key>
<array> <array>
<real>0.41999998688697815</real> <real>0.41999998688697815</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scroll_rate</key> <key>cloud_scroll_rate</key>
<array> <array>
<real>10.199999809265137</real> <real>10.199999809265137</real>
<real>10.01099967956543</real> <real>10.01099967956543</real>
</array> </array>
<key>cloud_shadow</key> <key>cloud_shadow</key>
<array> <array>
<real>0.26999998092651367</real> <real>0.26999998092651367</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>density_multiplier</key> <key>density_multiplier</key>
<array> <array>
<real>0.00017999998817685992</real> <real>0.00017999998817685992</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>distance_multiplier</key> <key>distance_multiplier</key>
<array> <array>
<real>0.80000001192092896</real> <real>0.80000001192092896</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>east_angle</key> <key>east_angle</key>
<real>0</real> <real>0</real>
<key>enable_cloud_scroll</key> <key>enable_cloud_scroll</key>
<array> <array>
<boolean>1</boolean> <boolean>1</boolean>
<boolean>1</boolean> <boolean>1</boolean>
</array> </array>
<key>gamma</key> <key>gamma</key>
<array> <array>
<real>1</real> <real>1</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>glow</key> <key>glow</key>
<array> <array>
<real>5</real> <real>5</real>
<real>0.0010000000474974513</real> <real>0.0010000000474974513</real>
<real>-0.47999998927116394</real> <real>-0.47999998927116394</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_density</key> <key>haze_density</key>
<array> <array>
<real>0.69999998807907104</real> <real>0.69999998807907104</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_horizon</key> <key>haze_horizon</key>
<array> <array>
<real>0.18999999761581421</real> <real>0.18999999761581421</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>1</real> <real>1</real>
</array> </array>
<key>lightnorm</key> <key>lightnorm</key>
<array> <array>
<real>0</real> <real>0</real>
<real>0.91269159317016602</real> <real>0.91269159317016602</real>
<real>-0.40864911675453186</real> <real>-0.40864911675453186</real>
<real>0</real> <real>0</real>
</array> </array>
<key>max_y</key> <key>max_y</key>
<array> <array>
<real>1605</real> <real>1605</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>preset_num</key> <key>preset_num</key>
<integer>22</integer> <integer>22</integer>
<key>star_brightness</key> <key>star_brightness</key>
<real>0</real> <real>0</real>
<key>sun_angle</key> <key>sun_angle</key>
<real>1.9917697906494141</real> <real>1.9917697906494141</real>
<key>sunlight_color</key> <key>sunlight_color</key>
<array> <array>
<real>0.7342105507850647</real> <real>0.7342105507850647</real>
<real>0.78157895803451538</real> <real>0.78157895803451538</real>
<real>0.89999997615814209</real> <real>0.89999997615814209</real>
<real>0.29999998211860657</real> <real>0.29999998211860657</real>
</array> </array>
</map> </map>
</llsd> </llsd>

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

@@ -1,141 +1,141 @@
<llsd> <llsd>
<map> <map>
<key>ambient</key> <key>ambient</key>
<array> <array>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
</array> </array>
<key>blue_density</key> <key>blue_density</key>
<array> <array>
<real>0.14522500336170197</real> <real>0.14522500336170197</real>
<real>0.39999699592590332</real> <real>0.39999699592590332</real>
<real>0.80000197887420654</real> <real>0.80000197887420654</real>
<real>1</real> <real>1</real>
</array> </array>
<key>blue_horizon</key> <key>blue_horizon</key>
<array> <array>
<real>0.43070214986801147</real> <real>0.43070214986801147</real>
<real>0.85394668579101563</real> <real>0.85394668579101563</real>
<real>1</real> <real>1</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_color</key> <key>cloud_color</key>
<array> <array>
<real>0.69999998807907104</real> <real>0.69999998807907104</real>
<real>0.69999998807907104</real> <real>0.69999998807907104</real>
<real>0.69999998807907104</real> <real>0.69999998807907104</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density1</key> <key>cloud_pos_density1</key>
<array> <array>
<real>0.5</real> <real>0.5</real>
<real>0.5</real> <real>0.5</real>
<real>0.53999996185302734</real> <real>0.53999996185302734</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density2</key> <key>cloud_pos_density2</key>
<array> <array>
<real>0.5</real> <real>0.5</real>
<real>0.5</real> <real>0.5</real>
<real>0.125</real> <real>0.125</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scale</key> <key>cloud_scale</key>
<array> <array>
<real>0.29999998211860657</real> <real>0.29999998211860657</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scroll_rate</key> <key>cloud_scroll_rate</key>
<array> <array>
<real>10.199999809265137</real> <real>10.199999809265137</real>
<real>10.069999694824219</real> <real>10.069999694824219</real>
</array> </array>
<key>cloud_shadow</key> <key>cloud_shadow</key>
<array> <array>
<real>0.22999998927116394</real> <real>0.22999998927116394</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>density_multiplier</key> <key>density_multiplier</key>
<array> <array>
<real>0.0003499999875202775</real> <real>0.0003499999875202775</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>distance_multiplier</key> <key>distance_multiplier</key>
<array> <array>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>east_angle</key> <key>east_angle</key>
<real>0</real> <real>0</real>
<key>enable_cloud_scroll</key> <key>enable_cloud_scroll</key>
<array> <array>
<boolean>1</boolean> <boolean>1</boolean>
<boolean>1</boolean> <boolean>1</boolean>
</array> </array>
<key>gamma</key> <key>gamma</key>
<array> <array>
<real>1.6100000143051147</real> <real>1.6100000143051147</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>glow</key> <key>glow</key>
<array> <array>
<real>3.7999999523162842</real> <real>3.7999999523162842</real>
<real>0.0010000000474974513</real> <real>0.0010000000474974513</real>
<real>-0.5</real> <real>-0.5</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_density</key> <key>haze_density</key>
<array> <array>
<real>0.69999998807907104</real> <real>0.69999998807907104</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_horizon</key> <key>haze_horizon</key>
<array> <array>
<real>0.41999998688697815</real> <real>0.41999998688697815</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>1</real> <real>1</real>
</array> </array>
<key>lightnorm</key> <key>lightnorm</key>
<array> <array>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
<real>-4.3711388286737929e-008</real> <real>-4.3711388286737929e-008</real>
<real>0</real> <real>0</real>
</array> </array>
<key>max_y</key> <key>max_y</key>
<array> <array>
<real>600</real> <real>600</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>preset_num</key> <key>preset_num</key>
<integer>-1163005939</integer> <integer>-1163005939</integer>
<key>star_brightness</key> <key>star_brightness</key>
<real>0</real> <real>0</real>
<key>sun_angle</key> <key>sun_angle</key>
<real>1.5707963705062866</real> <real>1.5707963705062866</real>
<key>sunlight_color</key> <key>sunlight_color</key>
<array> <array>
<real>0.80999994277954102</real> <real>0.80999994277954102</real>
<real>0.80999994277954102</real> <real>0.80999994277954102</real>
<real>0.80999994277954102</real> <real>0.80999994277954102</real>
<real>0.26999998092651367</real> <real>0.26999998092651367</real>
</array> </array>
</map> </map>
</llsd> </llsd>

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

@@ -1,141 +1,141 @@
<llsd> <llsd>
<map> <map>
<key>ambient</key> <key>ambient</key>
<array> <array>
<real>0.33000001311302185</real> <real>0.33000001311302185</real>
<real>0.33000001311302185</real> <real>0.33000001311302185</real>
<real>0.33000001311302185</real> <real>0.33000001311302185</real>
<real>1</real> <real>1</real>
</array> </array>
<key>blue_density</key> <key>blue_density</key>
<array> <array>
<real>0.16449999809265137</real> <real>0.16449999809265137</real>
<real>0.4699999988079071</real> <real>0.4699999988079071</real>
<real>0.93999999761581421</real> <real>0.93999999761581421</real>
<real>1</real> <real>1</real>
</array> </array>
<key>blue_horizon</key> <key>blue_horizon</key>
<array> <array>
<real>0.17547200620174408</real> <real>0.17547200620174408</real>
<real>0.35094299912452698</real> <real>0.35094299912452698</real>
<real>0.62000000476837158</real> <real>0.62000000476837158</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_color</key> <key>cloud_color</key>
<array> <array>
<real>0.5899999737739563</real> <real>0.5899999737739563</real>
<real>0.79000002145767212</real> <real>0.79000002145767212</real>
<real>0.80000001192092896</real> <real>0.80000001192092896</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density1</key> <key>cloud_pos_density1</key>
<array> <array>
<real>2.8148899078369141</real> <real>2.8148899078369141</real>
<real>5.6909198760986328</real> <real>5.6909198760986328</real>
<real>1</real> <real>1</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density2</key> <key>cloud_pos_density2</key>
<array> <array>
<real>5.9584097862243652</real> <real>5.9584097862243652</real>
<real>6.9909601211547852</real> <real>6.9909601211547852</real>
<real>0.070000000298023224</real> <real>0.070000000298023224</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scale</key> <key>cloud_scale</key>
<array> <array>
<real>0.41999998688697815</real> <real>0.41999998688697815</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scroll_rate</key> <key>cloud_scroll_rate</key>
<array> <array>
<real>9.9300003051757813</real> <real>9.9300003051757813</real>
<real>10.199999809265137</real> <real>10.199999809265137</real>
</array> </array>
<key>cloud_shadow</key> <key>cloud_shadow</key>
<array> <array>
<real>0.25999999046325684</real> <real>0.25999999046325684</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>density_multiplier</key> <key>density_multiplier</key>
<array> <array>
<real>0.00039000000106170774</real> <real>0.00039000000106170774</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>distance_multiplier</key> <key>distance_multiplier</key>
<array> <array>
<real>0.69999998807907104</real> <real>0.69999998807907104</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>east_angle</key> <key>east_angle</key>
<real>0</real> <real>0</real>
<key>enable_cloud_scroll</key> <key>enable_cloud_scroll</key>
<array> <array>
<boolean>1</boolean> <boolean>1</boolean>
<boolean>1</boolean> <boolean>1</boolean>
</array> </array>
<key>gamma</key> <key>gamma</key>
<array> <array>
<real>1.6100000143051147</real> <real>1.6100000143051147</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>glow</key> <key>glow</key>
<array> <array>
<real>5</real> <real>5</real>
<real>0.0010000000474974513</real> <real>0.0010000000474974513</real>
<real>-1.1599999666213989</real> <real>-1.1599999666213989</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_density</key> <key>haze_density</key>
<array> <array>
<real>0.20999999344348907</real> <real>0.20999999344348907</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_horizon</key> <key>haze_horizon</key>
<array> <array>
<real>0.11999999731779099</real> <real>0.11999999731779099</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>1</real> <real>1</real>
</array> </array>
<key>lightnorm</key> <key>lightnorm</key>
<array> <array>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
<real>-4.3711388286737929e-008</real> <real>-4.3711388286737929e-008</real>
<real>0</real> <real>0</real>
</array> </array>
<key>max_y</key> <key>max_y</key>
<array> <array>
<real>2250</real> <real>2250</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>preset_num</key> <key>preset_num</key>
<integer>24</integer> <integer>24</integer>
<key>star_brightness</key> <key>star_brightness</key>
<real>0</real> <real>0</real>
<key>sun_angle</key> <key>sun_angle</key>
<real>1.5707963705062866</real> <real>1.5707963705062866</real>
<key>sunlight_color</key> <key>sunlight_color</key>
<array> <array>
<real>1.2599999904632568</real> <real>1.2599999904632568</real>
<real>1.2599999904632568</real> <real>1.2599999904632568</real>
<real>1.2599999904632568</real> <real>1.2599999904632568</real>
<real>1</real> <real>1</real>
</array> </array>
</map> </map>
</llsd> </llsd>

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

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

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

@@ -1,141 +1,141 @@
<llsd> <llsd>
<map> <map>
<key>ambient</key> <key>ambient</key>
<array> <array>
<real>0.20405027105862608</real> <real>0.20405027105862608</real>
<real>0.24246673976617727</real> <real>0.24246673976617727</real>
<real>0.32999997392212316</real> <real>0.32999997392212316</real>
<real>0.11000000166951449</real> <real>0.11000000166951449</real>
</array> </array>
<key>blue_density</key> <key>blue_density</key>
<array> <array>
<real>0.44999999369830818</real> <real>0.44999999369830818</real>
<real>0.44999999398335949</real> <real>0.44999999398335949</real>
<real>0.4499999944309046</real> <real>0.4499999944309046</real>
<real>1</real> <real>1</real>
</array> </array>
<key>blue_horizon</key> <key>blue_horizon</key>
<array> <array>
<real>0.23999999567946317</real> <real>0.23999999567946317</real>
<real>0.23999999579784967</real> <real>0.23999999579784967</real>
<real>0.23999999583870221</real> <real>0.23999999583870221</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_color</key> <key>cloud_color</key>
<array> <array>
<real>0.22615400241575034</real> <real>0.22615400241575034</real>
<real>0.22615400241575034</real> <real>0.22615400241575034</real>
<real>0.22615400241575034</real> <real>0.22615400241575034</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density1</key> <key>cloud_pos_density1</key>
<array> <array>
<real>0.5</real> <real>0.5</real>
<real>0.5</real> <real>0.5</real>
<real>0.88000000953711155</real> <real>0.88000000953711155</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density2</key> <key>cloud_pos_density2</key>
<array> <array>
<real>0.5</real> <real>0.5</real>
<real>0.5</real> <real>0.5</real>
<real>0.125</real> <real>0.125</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scale</key> <key>cloud_scale</key>
<array> <array>
<real>0.41999998688697815</real> <real>0.41999998688697815</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scroll_rate</key> <key>cloud_scroll_rate</key>
<array> <array>
<real>10.49940035411295</real> <real>10.49940035411295</real>
<real>10.011000104431371</real> <real>10.011000104431371</real>
</array> </array>
<key>cloud_shadow</key> <key>cloud_shadow</key>
<array> <array>
<real>0.36000001430511475</real> <real>0.36000001430511475</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>density_multiplier</key> <key>density_multiplier</key>
<array> <array>
<real>0.00030000001824737163</real> <real>0.00030000001824737163</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>distance_multiplier</key> <key>distance_multiplier</key>
<array> <array>
<real>3.0208916693946743e-009</real> <real>3.0208916693946743e-009</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>east_angle</key> <key>east_angle</key>
<real>0</real> <real>0</real>
<key>enable_cloud_scroll</key> <key>enable_cloud_scroll</key>
<array> <array>
<boolean>1</boolean> <boolean>1</boolean>
<boolean>1</boolean> <boolean>1</boolean>
</array> </array>
<key>gamma</key> <key>gamma</key>
<array> <array>
<real>1</real> <real>1</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>glow</key> <key>glow</key>
<array> <array>
<real>5</real> <real>5</real>
<real>0.0010000000214212465</real> <real>0.0010000000214212465</real>
<real>-0.47999999165502744</real> <real>-0.47999999165502744</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_density</key> <key>haze_density</key>
<array> <array>
<real>3.9999999963077992</real> <real>3.9999999963077992</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_horizon</key> <key>haze_horizon</key>
<array> <array>
<real>1.7901579546794781e-010</real> <real>1.7901579546794781e-010</real>
<real>0.19915600437467304</real> <real>0.19915600437467304</real>
<real>0.19915600437467304</real> <real>0.19915600437467304</real>
<real>1</real> <real>1</real>
</array> </array>
<key>lightnorm</key> <key>lightnorm</key>
<array> <array>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
<real>3.0028815672267228e-005</real> <real>3.0028815672267228e-005</real>
<real>1</real> <real>1</real>
</array> </array>
<key>max_y</key> <key>max_y</key>
<array> <array>
<real>906.20003957594895</real> <real>906.20003957594895</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>preset_num</key> <key>preset_num</key>
<integer>26</integer> <integer>26</integer>
<key>star_brightness</key> <key>star_brightness</key>
<real>2</real> <real>2</real>
<key>sun_angle</key> <key>sun_angle</key>
<real>4.7123589515686035</real> <real>4.7123589515686035</real>
<key>sunlight_color</key> <key>sunlight_color</key>
<array> <array>
<real>0.34876692389196384</real> <real>0.34876692389196384</real>
<real>0.3557424864638451</real> <real>0.3557424864638451</real>
<real>0.65999994893325931</real> <real>0.65999994893325931</real>
<real>0.22000000284673543</real> <real>0.22000000284673543</real>
</array> </array>
</map> </map>
</llsd> </llsd>

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

@@ -1,141 +1,141 @@
<llsd> <llsd>
<map> <map>
<key>ambient</key> <key>ambient</key>
<array> <array>
<real>0.27825063467025757</real> <real>0.27825063467025757</real>
<real>0.33063584566116333</real> <real>0.33063584566116333</real>
<real>0.44999998807907104</real> <real>0.44999998807907104</real>
<real>0.14999999105930328</real> <real>0.14999999105930328</real>
</array> </array>
<key>blue_density</key> <key>blue_density</key>
<array> <array>
<real>0.14522500336170197</real> <real>0.14522500336170197</real>
<real>0.39999699592590332</real> <real>0.39999699592590332</real>
<real>0.80000197887420654</real> <real>0.80000197887420654</real>
<real>1</real> <real>1</real>
</array> </array>
<key>blue_horizon</key> <key>blue_horizon</key>
<array> <array>
<real>0.15130999684333801</real> <real>0.15130999684333801</real>
<real>0.30000001192092896</real> <real>0.30000001192092896</real>
<real>0.35131001472473145</real> <real>0.35131001472473145</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_color</key> <key>cloud_color</key>
<array> <array>
<real>0.22615399956703186</real> <real>0.22615399956703186</real>
<real>0.22615399956703186</real> <real>0.22615399956703186</real>
<real>0.22615399956703186</real> <real>0.22615399956703186</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density1</key> <key>cloud_pos_density1</key>
<array> <array>
<real>1.2046600580215454</real> <real>1.2046600580215454</real>
<real>0.51547497510910034</real> <real>0.51547497510910034</real>
<real>1</real> <real>1</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density2</key> <key>cloud_pos_density2</key>
<array> <array>
<real>1.2046600580215454</real> <real>1.2046600580215454</real>
<real>0.51547497510910034</real> <real>0.51547497510910034</real>
<real>0.125</real> <real>0.125</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scale</key> <key>cloud_scale</key>
<array> <array>
<real>0.41999998688697815</real> <real>0.41999998688697815</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scroll_rate</key> <key>cloud_scroll_rate</key>
<array> <array>
<real>10.49940013885498</real> <real>10.49940013885498</real>
<real>10.01099967956543</real> <real>10.01099967956543</real>
</array> </array>
<key>cloud_shadow</key> <key>cloud_shadow</key>
<array> <array>
<real>0.33064401149749756</real> <real>0.33064401149749756</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>density_multiplier</key> <key>density_multiplier</key>
<array> <array>
<real>0.0003499999875202775</real> <real>0.0003499999875202775</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>distance_multiplier</key> <key>distance_multiplier</key>
<array> <array>
<real>3.4000000953674316</real> <real>3.4000000953674316</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>east_angle</key> <key>east_angle</key>
<real>0</real> <real>0</real>
<key>enable_cloud_scroll</key> <key>enable_cloud_scroll</key>
<array> <array>
<boolean>1</boolean> <boolean>1</boolean>
<boolean>1</boolean> <boolean>1</boolean>
</array> </array>
<key>gamma</key> <key>gamma</key>
<array> <array>
<real>1</real> <real>1</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>glow</key> <key>glow</key>
<array> <array>
<real>5</real> <real>5</real>
<real>0.0010000000474974513</real> <real>0.0010000000474974513</real>
<real>-0.36000001430511475</real> <real>-0.36000001430511475</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_density</key> <key>haze_density</key>
<array> <array>
<real>0.69999998807907104</real> <real>0.69999998807907104</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_horizon</key> <key>haze_horizon</key>
<array> <array>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>1</real> <real>1</real>
</array> </array>
<key>lightnorm</key> <key>lightnorm</key>
<array> <array>
<real>0</real> <real>0</real>
<real>0.062790460884571075</real> <real>0.062790460884571075</real>
<real>-0.99802672863006592</real> <real>-0.99802672863006592</real>
<real>0</real> <real>0</real>
</array> </array>
<key>max_y</key> <key>max_y</key>
<array> <array>
<real>600</real> <real>600</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>preset_num</key> <key>preset_num</key>
<integer>27</integer> <integer>27</integer>
<key>star_brightness</key> <key>star_brightness</key>
<real>0</real> <real>0</real>
<key>sun_angle</key> <key>sun_angle</key>
<real>3.0787608623504639</real> <real>3.0787608623504639</real>
<key>sunlight_color</key> <key>sunlight_color</key>
<array> <array>
<real>2.8385701179504395</real> <real>2.8385701179504395</real>
<real>2.8385701179504395</real> <real>2.8385701179504395</real>
<real>2.8385701179504395</real> <real>2.8385701179504395</real>
<real>1</real> <real>1</real>
</array> </array>
</map> </map>
</llsd> </llsd>

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

@@ -1,141 +1,141 @@
<llsd> <llsd>
<map> <map>
<key>ambient</key> <key>ambient</key>
<array> <array>
<real>0.1978670060634613</real> <real>0.1978670060634613</real>
<real>0.23511900007724762</real> <real>0.23511900007724762</real>
<real>0.31999999284744263</real> <real>0.31999999284744263</real>
<real>1</real> <real>1</real>
</array> </array>
<key>blue_density</key> <key>blue_density</key>
<array> <array>
<real>0.13977900147438049</real> <real>0.13977900147438049</real>
<real>0.38499599695205688</real> <real>0.38499599695205688</real>
<real>0.76999998092651367</real> <real>0.76999998092651367</real>
<real>1</real> <real>1</real>
</array> </array>
<key>blue_horizon</key> <key>blue_horizon</key>
<array> <array>
<real>0.18999999761581421</real> <real>0.18999999761581421</real>
<real>0.18999999761581421</real> <real>0.18999999761581421</real>
<real>0.18999999761581421</real> <real>0.18999999761581421</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_color</key> <key>cloud_color</key>
<array> <array>
<real>0.22615399956703186</real> <real>0.22615399956703186</real>
<real>0.22615399956703186</real> <real>0.22615399956703186</real>
<real>0.22615399956703186</real> <real>0.22615399956703186</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density1</key> <key>cloud_pos_density1</key>
<array> <array>
<real>5.3780298233032227</real> <real>5.3780298233032227</real>
<real>1.9675600528717041</real> <real>1.9675600528717041</real>
<real>1</real> <real>1</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_pos_density2</key> <key>cloud_pos_density2</key>
<array> <array>
<real>5.3780298233032227</real> <real>5.3780298233032227</real>
<real>1.9675600528717041</real> <real>1.9675600528717041</real>
<real>0.125</real> <real>0.125</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scale</key> <key>cloud_scale</key>
<array> <array>
<real>0.41999998688697815</real> <real>0.41999998688697815</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>cloud_scroll_rate</key> <key>cloud_scroll_rate</key>
<array> <array>
<real>10.739999771118164</real> <real>10.739999771118164</real>
<real>10.600000381469727</real> <real>10.600000381469727</real>
</array> </array>
<key>cloud_shadow</key> <key>cloud_shadow</key>
<array> <array>
<real>0.31000000238418579</real> <real>0.31000000238418579</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>density_multiplier</key> <key>density_multiplier</key>
<array> <array>
<real>0.00052000000141561031</real> <real>0.00052000000141561031</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>distance_multiplier</key> <key>distance_multiplier</key>
<array> <array>
<real>3.4000000953674316</real> <real>3.4000000953674316</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>east_angle</key> <key>east_angle</key>
<real>0</real> <real>0</real>
<key>enable_cloud_scroll</key> <key>enable_cloud_scroll</key>
<array> <array>
<boolean>1</boolean> <boolean>1</boolean>
<boolean>1</boolean> <boolean>1</boolean>
</array> </array>
<key>gamma</key> <key>gamma</key>
<array> <array>
<real>1</real> <real>1</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>glow</key> <key>glow</key>
<array> <array>
<real>5</real> <real>5</real>
<real>0.0010000000474974513</real> <real>0.0010000000474974513</real>
<real>-0.47999998927116394</real> <real>-0.47999998927116394</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_density</key> <key>haze_density</key>
<array> <array>
<real>1.1000000238418579</real> <real>1.1000000238418579</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>haze_horizon</key> <key>haze_horizon</key>
<array> <array>
<real>0.12999999523162842</real> <real>0.12999999523162842</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>0.19915600121021271</real> <real>0.19915600121021271</real>
<real>1</real> <real>1</real>
</array> </array>
<key>lightnorm</key> <key>lightnorm</key>
<array> <array>
<real>0</real> <real>0</real>
<real>0.094108030200004578</real> <real>0.094108030200004578</real>
<real>-0.99556201696395874</real> <real>-0.99556201696395874</real>
<real>0</real> <real>0</real>
</array> </array>
<key>max_y</key> <key>max_y</key>
<array> <array>
<real>656.20001220703125</real> <real>656.20001220703125</real>
<real>0</real> <real>0</real>
<real>0</real> <real>0</real>
<real>1</real> <real>1</real>
</array> </array>
<key>preset_num</key> <key>preset_num</key>
<integer>28</integer> <integer>28</integer>
<key>star_brightness</key> <key>star_brightness</key>
<real>0</real> <real>0</real>
<key>sun_angle</key> <key>sun_angle</key>
<real>3.0473451614379883</real> <real>3.0473451614379883</real>
<key>sunlight_color</key> <key>sunlight_color</key>
<array> <array>
<real>1.5</real> <real>1.5</real>
<real>1.5299999713897705</real> <real>1.5299999713897705</real>
<real>2.8385701179504395</real> <real>2.8385701179504395</real>
<real>1</real> <real>1</real>
</array> </array>
</map> </map>
</llsd> </llsd>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

6
indra/newview/llaudiosourcevo.cpp
View File

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

30
indra/newview/llfloateravatartextures.cpp
View File

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

32
indra/newview/llfloaterproperties.h
View File

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

82
indra/newview/llfloatervfsexplorer.h
View File

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

36
indra/newview/llpreviewanim.h
View File

@@ -46,29 +46,29 @@ public:
static void playAnim( void* userdata ); static void playAnim( void* userdata );
static void auditionAnim( void* userdata ); static void auditionAnim( void* userdata );
// <edit> // <edit>
/* /*
static void copyAnim(void* userdata); static void copyAnim(void* userdata);
static void gotAssetForCopy(LLVFS *vfs, static void gotAssetForCopy(LLVFS *vfs,
const LLUUID& asset_uuid, const LLUUID& asset_uuid,
LLAssetType::EType type, LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status); 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 onSaveCopyComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
*/ */
static void gotAssetForSave(LLVFS *vfs, static void gotAssetForSave(LLVFS *vfs,
const LLUUID& asset_uuid, const LLUUID& asset_uuid,
LLAssetType::EType type, LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status); void* user_data, S32 status, LLExtStat ext_status);
static void copyAnimID(void* userdata); static void copyAnimID(void* userdata);
// </edit> // </edit>
static void endAnimCallback( void *userdata ); static void endAnimCallback( void *userdata );
protected: protected:
virtual void onClose(bool app_quitting); virtual void onClose(bool app_quitting);
// <edit> // <edit>
virtual BOOL canSaveAs() const; virtual BOOL canSaveAs() const;
virtual void saveAs(); virtual void saveAs();
virtual LLUUID getItemID(); virtual LLUUID getItemID();
// </edit> // </edit>
virtual const char *getTitleName() const { return "Animation"; } 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, void uploadAssetLegacy(const std::string& filename,
const LLUUID& item_id, const LLUUID& item_id,
const LLTransactionID& tid); const LLTransactionID& tid);
// <edit> // <edit>
virtual BOOL canSaveAs() const; virtual BOOL canSaveAs() const;
virtual void saveAs(); virtual void saveAs();
// </edit> // </edit>
static void onSearchReplace(void* userdata); static void onSearchReplace(void* userdata);
@@ -258,9 +258,9 @@ protected:
LLViewerObject* object, LLViewerObject* object,
const LLTransactionID& tid, const LLTransactionID& tid,
BOOL is_running); BOOL is_running);
// <edit> // <edit>
virtual BOOL canSaveAs() const; virtual BOOL canSaveAs() const;
virtual void saveAs(); virtual void saveAs();
// </edit> // </edit>
static void onSearchReplace(void* userdata); static void onSearchReplace(void* userdata);

484
indra/newview/llpreviewsound.cpp
View File

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

38
indra/newview/llpreviewsound.h
View File

@@ -44,29 +44,29 @@ public:
static void playSound( void* userdata ); static void playSound( void* userdata );
static void auditionSound( void* userdata ); static void auditionSound( void* userdata );
// <edit> // <edit>
/* /*
static void makeCopy(void* userdata); static void makeCopy(void* userdata);
static void gotAssetForCopy(LLVFS *vfs, static void gotAssetForCopy(LLVFS *vfs,
const LLUUID& asset_uuid, const LLUUID& asset_uuid,
LLAssetType::EType type, LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status); 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 onSaveCopyComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
*/ */
static void playAmbient(void* userdata); static void playAmbient(void* userdata);
static void copyUUID(void* userdata); static void copyUUID(void* userdata);
static void gotAssetForSave(LLVFS *vfs, static void gotAssetForSave(LLVFS *vfs,
const LLUUID& asset_uuid, const LLUUID& asset_uuid,
LLAssetType::EType type, LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status); void* user_data, S32 status, LLExtStat ext_status);
// </edit> // </edit>
protected: protected:
virtual const char *getTitleName() const { return "Sound"; } virtual const char *getTitleName() const { return "Sound"; }
// <edit> // <edit>
virtual BOOL canSaveAs() const; virtual BOOL canSaveAs() const;
virtual void saveAs(); virtual void saveAs();
virtual LLUUID getItemID(); virtual LLUUID getItemID();
// </edit> // </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 // 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 // rather than checking if a re-load is necessary. Phoenix 2007-02-27
bool hasEmbeddedInventory(); bool hasEmbeddedInventory();
// <edit> // <edit>
std::vector<LLPointer<LLInventoryItem> > getEmbeddedItems(); std::vector<LLPointer<LLInventoryItem> > getEmbeddedItems();
// </edit> // </edit>
private: private:

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

@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings version = "101"> <settings version = "101">
</settings> </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 --> <TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- i.e. About Land name that you don't own -->
<TextEmbeddedItemColor value="0, 0, 128, 255" /> <TextEmbeddedItemColor value="0, 0, 128, 255" />
<TextDefaultColor value="0, 20, 0, 255"/> <TextDefaultColor value="0, 20, 0, 255"/>
<TextLinkColor value="144, 165, 208, 255"/> <TextLinkColor value="144, 165, 208, 255"/>
<TextLinkHoverColor value="255, 255, 255, 255"/> <TextLinkHoverColor value="255, 255, 255, 255"/>
<!-- LISTBOXES --> <!-- LISTBOXES -->
<ScrollBgReadOnlyColor value="200, 209, 204, 255" /> <ScrollBgReadOnlyColor value="200, 209, 204, 255" />
<ScrollBgWriteableColor value="200, 209, 204, 255" /> <ScrollBgWriteableColor value="200, 209, 204, 255" />
<ScrollBGStripeColor value="100, 100, 100, 40" /> <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"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings version = "101"> <settings version = "101">
<!-- WINDOWS --> <!-- WINDOWS -->
<TitleBarFocusColor value="255, 255, 255, 30" /> <!-- Focused window title bar highlight, no equivalent for unfocused windows --> <TitleBarFocusColor value="255, 255, 255, 30" /> <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
<FloaterFocusBorderColor value="0, 0, 0, 80"/> <FloaterFocusBorderColor value="0, 0, 0, 80"/>
<FloaterUnfocusBorderColor value="0, 0, 0, 80"/> <FloaterUnfocusBorderColor value="0, 0, 0, 80"/>
<FocusBackgroundColor value="62, 62, 62, 255"/> <!-- Background color of focused floaters --> <FocusBackgroundColor value="62, 62, 62, 255"/> <!-- Background color of focused floaters -->
<DefaultBackgroundColor value="62, 62, 62, 140"/> <!-- Background color for unfocused 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 --> <ColorDropShadow value="0, 0, 0, 200"/> <!-- The drop shadow behind windows and menus -->
<DefaultHighlightDark value="26, 26, 26, 255"/> <DefaultHighlightDark value="26, 26, 26, 255"/>
<DefaultHighlightLight value="132, 132, 132, 255"/> <DefaultHighlightLight value="132, 132, 132, 255"/>
<DefaultShadowDark value="26, 26, 26, 255"/> <DefaultShadowDark value="26, 26, 26, 255"/>
<DefaultShadowLight value="0, 0, 0, 255"/> <DefaultShadowLight value="0, 0, 0, 255"/>
<!-- LABELS --> <!-- LABELS -->
<LabelDisabledColor value="147, 169, 213, 77"/> <LabelDisabledColor value="147, 169, 213, 77"/>
<LabelSelectedColor value="255, 255, 255, 255"/> <LabelSelectedColor value="255, 255, 255, 255"/>
<LabelSelectedDisabledColor value="116, 116, 116, 128"/> <LabelSelectedDisabledColor value="116, 116, 116, 128"/>
<LabelTextColor value="200, 200, 200, 255"/> <LabelTextColor value="200, 200, 200, 255"/>
<!-- LOGIN --> <!-- LOGIN -->
<LoginProgressBarBgColor value="255, 255, 255, 255" /> <LoginProgressBarBgColor value="255, 255, 255, 255" />
<LoginProgressBarFgColor value="255, 255, 255, 255" /> <LoginProgressBarFgColor value="255, 255, 255, 255" />
<LoginProgressBoxBorderColor value="0, 30, 60, 0" /> <LoginProgressBoxBorderColor value="0, 30, 60, 0" />
<LoginProgressBoxCenterColor value="0, 0, 0, 200" /> <LoginProgressBoxCenterColor value="0, 0, 0, 200" />
<LoginProgressBoxShadowColor value="0, 0, 0, 200" /> <LoginProgressBoxShadowColor value="0, 0, 0, 200" />
<LoginProgressBoxTextColor value="255, 255, 255, 255"/> <LoginProgressBoxTextColor value="255, 255, 255, 255"/>
<!-- BUTTONS --> <!-- BUTTONS -->
<ButtonLabelColor value="220, 220, 220, 255"/> <!-- Text labels for buttons, like the "OK" text --> <ButtonLabelColor value="220, 220, 220, 255"/> <!-- Text labels for buttons, like the "OK" text -->
<ButtonLabelSelectedColor value="220, 220, 220, 255"/> <ButtonLabelSelectedColor value="220, 220, 220, 255"/>
<ButtonLabelDisabledColor value="147, 169, 213, 200"/> <ButtonLabelDisabledColor value="147, 169, 213, 200"/>
<ButtonLabelSelectedDisabledColor value="164, 190, 237, 200"/> <ButtonLabelSelectedDisabledColor value="164, 190, 237, 200"/>
<ButtonSelectedBgColor value="62, 62, 62, 255"/> <ButtonSelectedBgColor value="62, 62, 62, 255"/>
<ButtonSelectedColor value="255, 255, 255, 255"/> <ButtonSelectedColor value="255, 255, 255, 255"/>
<ButtonUnselectedBgColor value="62, 62, 62, 255"/> <ButtonUnselectedBgColor value="62, 62, 62, 255"/>
<ButtonUnselectedFgColor value="255, 255, 255, 255"/> <ButtonUnselectedFgColor value="255, 255, 255, 255"/>
<ButtonBorderColor value="238, 156, 0, 255"/> <ButtonBorderColor value="238, 156, 0, 255"/>
<ButtonFlashBgColor value="255, 190, 62, 127" /> <ButtonFlashBgColor value="255, 190, 62, 127" />
<ButtonColor value="255, 255, 255, 255"/> <!-- Blended with button art, usually left as opaque white --> <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 --> <ButtonImageColor value="255, 255, 255, 255"/> <!-- Blended with button art, usually left as opaque white -->
<!-- SLIDERS --> <!-- SLIDERS -->
<SliderDisabledThumbColor value="0, 0, 0, 255" /> <SliderDisabledThumbColor value="0, 0, 0, 255" />
<SliderThumbCenterColor value="200, 200, 200, 255"/> <SliderThumbCenterColor value="200, 200, 200, 255"/>
<SliderThumbOutlineColor value="255, 255, 255, 255"/> <SliderThumbOutlineColor value="255, 255, 255, 255"/>
<SliderTrackColor value="255, 255, 255, 255"/> <SliderTrackColor value="255, 255, 255, 255"/>
<!-- TEXTFIELDS --> <!-- TEXTFIELDS -->
<TextBgFocusColor value="200, 209, 204, 255"/> <!-- Text field background when receiving input (focused) --> <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 --> <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) --> <TextBgWriteableColor value="200, 209, 204, 230"/> <!-- Text field background when not receiving input (unfocused) -->
<TextCursorColor value="0, 0, 0, 255"/> <TextCursorColor value="0, 0, 0, 255"/>
<TextFgColor value="0, 0, 0, 255"/> <TextFgColor value="0, 0, 0, 255"/>
<TextFgReadOnlyColor value="255, 255, 255, 200"/> <TextFgReadOnlyColor value="255, 255, 255, 200"/>
<TextFgTentativeColor value="0, 0, 0, 128"/> <TextFgTentativeColor value="0, 0, 0, 128"/>
<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255"/> <!-- i.e. About Land name that you don't own --> <TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255"/> <!-- i.e. About Land name that you don't own -->
<TextEmbeddedItemColor value="0, 0, 128, 255"/> <TextEmbeddedItemColor value="0, 0, 128, 255"/>
<TextDefaultColor value="0, 20, 0, 255"/> <TextDefaultColor value="0, 20, 0, 255"/>
<!-- LISTBOXES --> <!-- LISTBOXES -->
<ScrollBgReadOnlyColor value="200, 209, 204, 255"/> <ScrollBgReadOnlyColor value="200, 209, 204, 255"/>
<ScrollBgWriteableColor value="200, 209, 204, 255"/> <ScrollBgWriteableColor value="200, 209, 204, 255"/>
<ScrollBGStripeColor value="100, 100, 100, 40"/> <ScrollBGStripeColor value="100, 100, 100, 40"/>
<ScrollDisabledColor value="128, 128, 128, 204"/> <ScrollDisabledColor value="128, 128, 128, 204"/>
<ScrollSelectedBGColor value="100, 100, 100, 150"/> <ScrollSelectedBGColor value="100, 100, 100, 150"/>
<ScrollSelectedFGColor value="0, 0, 0, 204"/> <!-- Text color --> <ScrollSelectedFGColor value="0, 0, 0, 204"/> <!-- Text color -->
<ScrollUnselectedColor value="0, 0, 0, 204"/> <!-- Text color --> <ScrollUnselectedColor value="0, 0, 0, 204"/> <!-- Text color -->
<ScrollHighlightedColor value="183, 184, 188, 128"/> <!-- Hover color --> <ScrollHighlightedColor value="183, 184, 188, 128"/> <!-- Hover color -->
<ScrollbarThumbColor value="100, 100, 100, 255"/> <ScrollbarThumbColor value="100, 100, 100, 255"/>
<ScrollbarTrackColor value="153, 154, 158, 255"/> <ScrollbarTrackColor value="153, 154, 158, 255"/>
<!-- MENUS --> <!-- MENUS -->
<MenuBarBgColor value="62, 62, 62, 255"/> <MenuBarBgColor value="62, 62, 62, 255"/>
<MenuBarGodBgColor value="62, 128, 62, 255"/> <MenuBarGodBgColor value="62, 128, 62, 255"/>
<MenuNonProductionBgColor value="128, 0, 0, 255"/> <MenuNonProductionBgColor value="128, 0, 0, 255"/>
<MenuNonProductionGodBgColor value="0,128,0,255"/> <MenuNonProductionGodBgColor value="0,128,0,255"/>
<MenuDefaultBgColor value="0, 0, 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) --> <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) --> <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"/> <MenuItemHighlightBgColor value="183, 184, 188, 100"/>
<MenuItemHighlightFgColor value="255, 255, 255, 255"/> <!-- Highlighted menu text color; also treeview node selection highlight --> <MenuItemHighlightFgColor value="255, 255, 255, 255"/> <!-- Highlighted menu text color; also treeview node selection highlight -->
<MenuPopupBgColor value="0, 0, 0, 255"/> <MenuPopupBgColor value="0, 0, 0, 255"/>
<!-- PIE MENUS --> <!-- PIE MENUS -->
<PieMenuBgColor value="62, 62, 62, 150"/> <PieMenuBgColor value="62, 62, 62, 150"/>
<PieMenuLineColor value="0, 0, 0, 128"/> <PieMenuLineColor value="0, 0, 0, 128"/>
<PieMenuSelectedColor value="183, 184, 188, 77"/> <PieMenuSelectedColor value="183, 184, 188, 77"/>
<!-- TOOLTIPS --> <!-- TOOLTIPS -->
<ToolTipBgColor value="183, 184, 188, 200"/> <ToolTipBgColor value="183, 184, 188, 200"/>
<ToolTipBorderColor value="171, 212, 245, 255"/> <ToolTipBorderColor value="171, 212, 245, 255"/>
<ToolTipTextColor value="0, 0, 0, 255"/> <ToolTipTextColor value="0, 0, 0, 255"/>
<!-- NOTIFICATION POP-UPS --> <!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="66, 66, 66, 255"/> <NotifyBoxColor value="66, 66, 66, 255"/>
<NotifyTextColor value="200, 200, 200, 255"/> <NotifyTextColor value="200, 200, 200, 255"/>
<NotifyCautionBoxColor value="254, 209, 118, 255"/> <!-- the background color of caution permissions prompts --> <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 --> <NotifyCautionWarnColor value="0, 0, 0, 255"/> <!-- the foreground color of the special title text in caution permissions prompts -->
<GroupNotifyBoxColor value="70, 170, 255, 255"/> <GroupNotifyBoxColor value="70, 170, 255, 255"/>
<GroupNotifyTextColor value="0, 0, 0 255" /> <GroupNotifyTextColor value="0, 0, 0 255" />
<!-- CHAT AND IM HISTORY TEXTBOX COLORS --> <!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
<ChatHistoryBgColor value="30, 30, 30, 200" /> <ChatHistoryBgColor value="30, 30, 30, 200" />
<ChatHistoryTextColor value="255, 255, 255, 255" /> <ChatHistoryTextColor value="255, 255, 255, 255" />
<IMHistoryBgColor value="30, 30, 30, 200" /> <IMHistoryBgColor value="30, 30, 30, 200" />
<IMHistoryTextColor value="255, 255, 255, 255" /> <IMHistoryTextColor value="255, 255, 255, 255" />
<!-- IN-WORLD SELECTION --> <!-- IN-WORLD SELECTION -->
<SilhouetteParentColor value="255, 255, 0, 255"/> <SilhouetteParentColor value="255, 255, 0, 255"/>
<SilhouetteChildColor value="32, 106, 196, 255"/> <SilhouetteChildColor value="32, 106, 196, 255"/>
<HighlightParentColor value="171, 212, 245, 255"/> <HighlightParentColor value="171, 212, 245, 255"/>
<HighlightChildColor value="171, 212, 245, 255"/> <HighlightChildColor value="171, 212, 245, 255"/>
<HighlightInspectColor value="255, 0, 255, 255"/> <HighlightInspectColor value="255, 0, 255, 255"/>
<!-- EDIT MODE GRID --> <!-- EDIT MODE GRID -->
<GridFocusPointColor value="255, 255, 255, 128"/> <GridFocusPointColor value="255, 255, 255, 128"/>
<GridlineColor value="255, 255, 255, 255"/> <GridlineColor value="255, 255, 255, 255"/>
<GridlineBGColor value="235, 235, 255, 200"/> <GridlineBGColor value="235, 235, 255, 200"/>
<GridlineShadowColor value="0, 0, 0, 80"/> <GridlineShadowColor value="0, 0, 0, 80"/>
<!-- PROPERTY LINES --> <!-- PROPERTY LINES -->
<PropertyColorAvail value="0, 0, 0, 0"/> <PropertyColorAvail value="0, 0, 0, 0"/>
<PropertyColorGroup value="0, 184, 184, 102"/> <PropertyColorGroup value="0, 184, 184, 102"/>
<PropertyColorOther value="255, 0, 0, 102"/> <PropertyColorOther value="255, 0, 0, 102"/>
<PropertyColorSelf value="0, 255, 0, 102"/> <PropertyColorSelf value="0, 255, 0, 102"/>
<PropertyColorForSale value="255, 128, 0, 102"/> <PropertyColorForSale value="255, 128, 0, 102"/>
<PropertyColorAuction value="128, 0, 255, 102"/> <!-- Match the color on the world map --> <PropertyColorAuction value="128, 0, 255, 102"/> <!-- Match the color on the world map -->
<!-- Icon Enable/Disable --> <!-- Icon Enable/Disable -->
<IconEnabledColor value="255, 255, 255, 255"/> <IconEnabledColor value="255, 255, 255, 255"/>
<IconDisabledColor value="147, 169, 213, 200"/> <IconDisabledColor value="147, 169, 213, 200"/>
<!-- MAP --> <!-- MAP -->
<MapAvatar value="0, 255, 0, 255" /> <MapAvatar value="0, 255, 0, 255" />
<MapFriend value="255, 255, 0, 255" /> <MapFriend value="255, 255, 0, 255" />
<MapLinden value="0, 0, 255, 255" /> <MapLinden value="0, 0, 255, 255" />
<MapMuted value="110, 110, 110, 255" /> <MapMuted value="110, 110, 110, 255" />
<!-- MINI-MAP --> <!-- MINI-MAP -->
<NetMapBackgroundColor value="0, 0, 0, 77" /> <NetMapBackgroundColor value="0, 0, 0, 77" />
<NetMapYouOwnAboveWater value="0, 255, 255, 255" /> <NetMapYouOwnAboveWater value="0, 255, 255, 255" />
<NetMapYouOwnBelowWater value="0, 200, 200, 255" /> <NetMapYouOwnBelowWater value="0, 200, 200, 255" />
<NetMapGroupOwnAboveWater value="255, 0, 255, 255" /> <NetMapGroupOwnAboveWater value="255, 0, 255, 255" />
<NetMapGroupOwnBelowWater value="200, 0, 200, 255" /> <NetMapGroupOwnBelowWater value="200, 0, 200, 255" />
<NetMapOtherOwnAboveWater value="60, 60, 60, 255" /> <NetMapOtherOwnAboveWater value="60, 60, 60, 255" />
<NetMapOtherOwnBelowWater value="30, 30, 30, 255" /> <NetMapOtherOwnBelowWater value="30, 30, 30, 255" />
<NetMapThisRegion value="255, 255, 255, 255" /> <NetMapThisRegion value="255, 255, 255, 255" />
<NetMapLiveRegion value="204, 204, 204, 255" /> <NetMapLiveRegion value="204, 204, 204, 255" />
<NetMapDeadRegion value="255, 128, 128, 255" /> <NetMapDeadRegion value="255, 128, 128, 255" />
<NetMapFrustum value="255, 255, 255, 20" /> <NetMapFrustum value="255, 255, 255, 20" />
<NetMapFrustumRotating value="255, 255, 255, 51" /> <NetMapFrustumRotating value="255, 255, 255, 51" />
<!-- HELP WINDOW --> <!-- HELP WINDOW -->
<HelpBgColor value="200, 209, 204, 255"/> <HelpBgColor value="200, 209, 204, 255"/>
<HelpFgColor value="0, 0, 0, 255"/> <HelpFgColor value="0, 0, 0, 255"/>
<HelpScrollTrackColor value="183, 184, 188, 255"/> <HelpScrollTrackColor value="183, 184, 188, 255"/>
<HelpScrollThumbColor value="80, 96, 124, 255"/> <HelpScrollThumbColor value="80, 96, 124, 255"/>
<HelpScrollHighlightColor value="115, 132, 155, 255"/> <HelpScrollHighlightColor value="115, 132, 155, 255"/>
<HelpScrollShadowColor value="0, 0, 0, 255"/> <HelpScrollShadowColor value="0, 0, 0, 255"/>
<!-- MISC --> <!-- MISC -->
<AvatarNameColor value="251, 175, 93, 255"/> <!-- Text color of avatar nametags --> <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 --> <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. --> <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 --> <ButtonCautionImageColor value="255, 255, 255, 255"/> <!-- Match the caution dialog buttons to the default -->
<MapAutopilotColor value="255, 128, 0, 255"/> <MapAutopilotColor value="255, 128, 0, 255"/>
<ContextSilhouetteColor value="239, 156, 0, 255"/> <!-- For "context" highlighting, i.e. pie menu --> <ContextSilhouetteColor value="239, 156, 0, 255"/> <!-- For "context" highlighting, i.e. pie menu -->
<ScriptBgReadOnlyColor value="100, 100, 100, 255"/> <ScriptBgReadOnlyColor value="100, 100, 100, 255"/>
<ParcelTextColor value="0, 200, 100, 200" /> <!-- Parcel name on menu bar, normal state --> <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 --> <ParcelHoverColor value="0, 200, 100, 255" /> <!-- Parcel name on menu bar, hover state -->
<TimeTextColor value="255, 255, 255, 255" /> <!-- SL Time on menu bar --> <TimeTextColor value="255, 255, 255, 255" /> <!-- SL Time on menu bar -->
<BalanceTextColor value="0, 255, 0, 255"/> <!-- Linden dollar balance 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 --> <HealthTextColor value="255, 255, 255, 255"/> <!-- Damage meter text on menu bar -->
<GroupOverTierColor value="110, 15, 15, 255" /> <!-- Warning text in Group Info window --> <GroupOverTierColor value="110, 15, 15, 255" /> <!-- Warning text in Group Info window -->
<FilterBackgroundColor value="0, 0, 20, 255"/> <!-- Matching region of Inventory search text --> <FilterBackgroundColor value="0, 0, 20, 255"/> <!-- Matching region of Inventory search text -->
<FilterTextColor value="255, 200, 70, 255"/> <FilterTextColor value="255, 200, 70, 255"/>
<InventoryItemSuffixColor value="200, 200, 200, 255"/> <InventoryItemSuffixColor value="200, 200, 200, 255"/>
<InventorySearchStatusColor value="0, 0, 0, 255" /> <InventorySearchStatusColor value="0, 0, 0, 255" />
<ConsoleBackground value="0, 0, 0, 255" /> <ConsoleBackground value="0, 0, 0, 255" />
<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/> <FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>
<InventoryBackgroundColor value="62, 62, 62, 80"/> <InventoryBackgroundColor value="62, 62, 62, 80"/>
<ComboBoxBg value="255, 255, 255, 255"/> <ComboBoxBg value="255, 255, 255, 255"/>
<AvatarListTextDistNormalRange value="0, 0, 0, 255"/> <AvatarListTextDistNormalRange value="0, 0, 0, 255"/>
<AvatarListTextDistShoutRange value="0, 0, 0, 128"/> <AvatarListTextDistShoutRange value="0, 0, 0, 128"/>
<AvatarListTextDistOver value="128, 0, 0, 128"/> <AvatarListTextDistOver value="128, 0, 0, 128"/>
<AvatarListTextAgeYoung value="255, 0, 0, 255"/> <AvatarListTextAgeYoung value="255, 0, 0, 255"/>
<AvatarListTextAgeNormal value="0, 0, 0, 255"/> <AvatarListTextAgeNormal value="0, 0, 0, 255"/>
<!-- Alert box colors --> <!-- Alert box colors -->
<AlertBoxColor value="62, 62, 62, 255"/> <AlertBoxColor value="62, 62, 62, 255"/>
<AlertTextColor value="147, 169, 213, 255"/> <AlertTextColor value="147, 169, 213, 255"/>
<AlertCautionBoxColor value="96, 96, 0, 255"/> <!-- Background color of caution alerts --> <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 --> <AlertCautionTextColor value="0, 0, 0, 255"/> <!-- Foreground color of the special title text in caution alerts -->
<!-- Multi sliders, as in the sky animation setting --> <!-- Multi sliders, as in the sky animation setting -->
<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/> <MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>
<MultiSliderThumbCenterColor value="183, 184, 188, 255"/> <MultiSliderThumbCenterColor value="183, 184, 188, 255"/>
<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/> <MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>
<MultiSliderTrackColor value="30, 30, 30, 255"/> <MultiSliderTrackColor value="30, 30, 30, 255"/>
<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/> <MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/>
<MultiSliderTriangleColor value="255, 255, 50, 255"/> <MultiSliderTriangleColor value="255, 255, 50, 255"/>
</settings> </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" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" <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" height="435" min_height="200" min_width="325" name="clothing"
rect_control="FloaterClothingRect" title="Clothing" width="325"> rect_control="FloaterClothingRect" title="Clothing" width="325">
<scroll_list bottom="-395" draw_border="true" draw_heading="true" <scroll_list bottom="-395" draw_border="true" draw_heading="true"
follows="top|left|bottom|right" height="370" left="15" multi_select="false" follows="top|left|bottom|right" height="370" left="15" multi_select="false"
name="clothing_list" width="295"> name="clothing_list" width="295">
<column label="" name="icon" width="16" /> <column label="" name="icon" width="16" />
<column label="Name" name="name" width="250" /> <column label="Name" name="name" width="250" />
<column name="sort" width="-1" /> <column name="sort" width="-1" />
</scroll_list> </scroll_list>
<button bottom_delta="-30" follows="bottom|right" height="20" label="Take Off" <button bottom_delta="-30" follows="bottom|right" height="20" label="Take Off"
left="-200" name="take_off_btn" width="80" /> left="-200" name="take_off_btn" width="80" />
<button bottom_delta="0" follows="bottom|right" height="20" label="Wear" left="-100" <button bottom_delta="0" follows="bottom|right" height="20" label="Wear" left="-100"
name="wear_btn" width="80" /> name="wear_btn" width="80" />
</floater> </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" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="false" <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"> 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="-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_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_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_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_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_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_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_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_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_gestures" label="Gestures" />
<!--<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_others" label="Others" />--> <!--<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 >>" <button bottom="10" follows="bottom|left" height="20" label="Next >>"
left="110" width="80" name="next_btn" /> left="110" width="80" name="next_btn" />
</floater> </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" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-338" can_close="true" can_drag_on_left="false" can_minimize="true" <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" can_resize="true" enabled="true" height="331" left="201" min_height="120"
min_width="300" mouse_opaque="true" name="preview_texture" width="300"> min_width="300" mouse_opaque="true" name="preview_texture" width="300">
<button bottom="-325" enabled="true" follows="right|bottom" font="SansSerif" <button bottom="-325" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="Copy To Inventory" left="105" halign="center" height="20" label="Copy To Inventory" left="105"
mouse_opaque="true" name="Copy To Inventory" scale_image="true" width="170" /> 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" <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" bottom="30" drop_shadow_visible="true" enabled="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13" font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
mouse_opaque="true" name="dimensions" v_pad="0" width="163"> mouse_opaque="true" name="dimensions" v_pad="0" width="163">
Dimensions: [WIDTH] x [HEIGHT] Dimensions: [WIDTH] x [HEIGHT]
</text> </text>
</floater> </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" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-331" can_close="true" can_drag_on_left="false" can_minimize="true" <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" can_resize="true" enabled="true" height="331" left="176" min_height="120"
min_width="300" mouse_opaque="true" name="preview_texture" width="300"> 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" <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" bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerif" h_pad="0" halign="left" height="19" left="13" font="SansSerif" h_pad="0" halign="left" height="19" left="13"
mouse_opaque="true" name="desc txt" v_pad="0" width="80"> mouse_opaque="true" name="desc txt" v_pad="0" width="80">
Description: Description:
</text> </text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38" <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
enabled="true" follows="left|top|right" font="SansSerif" enabled="true" follows="left|top|right" font="SansSerif"
handle_edit_keys_directly="false" height="19" left="93" max_length="127" handle_edit_keys_directly="false" height="19" left="93" max_length="127"
mouse_opaque="true" name="desc" select_all_on_focus_received="false" mouse_opaque="true" name="desc" select_all_on_focus_received="false"
select_on_focus="false" width="194" spell_check="true" /> select_on_focus="false" width="194" spell_check="true" />
<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif" <button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="Keep" label_selected="Keep" left="9" halign="center" height="20" label="Keep" label_selected="Keep" left="9"
mouse_opaque="true" name="Keep" scale_image="true" width="100" /> mouse_opaque="true" name="Keep" scale_image="true" width="100" />
<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif" <button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="Discard" label_selected="Discard" halign="center" height="20" label="Discard" label_selected="Discard"
left="114" mouse_opaque="true" name="Discard" scale_image="true" left="114" mouse_opaque="true" name="Discard" scale_image="true"
width="100" /> width="100" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" <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" bottom="30" drop_shadow_visible="true" enabled="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13" font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
mouse_opaque="true" name="dimensions" v_pad="0" width="163"> mouse_opaque="true" name="dimensions" v_pad="0" width="163">
Dimensions: [WIDTH] x [HEIGHT] Dimensions: [WIDTH] x [HEIGHT]
</text> </text>
</floater> </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" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="0" follows="top|left" height="220" left="0" <panel border="true" bottom="0" follows="top|left" height="220" left="0"
name="Covenant" title="Covenant" width="480"> name="Covenant" title="Covenant" width="480">
<text bottom_delta="-5" follows="left|top" <text bottom_delta="-5" follows="left|top"
font="SansSerifSmall" height="20" left="180" name="covenant_timestamp_text" font="SansSerifSmall" height="20" left="180" name="covenant_timestamp_text"
width="250" /> width="250" />
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
left="10" name="region_name_lbl" width="100"> left="10" name="region_name_lbl" width="100">
Region: Region:
</text> </text>
<text bottom_delta="0" follows="left|top" <text bottom_delta="0" follows="left|top"
font="SansSerifSmall" height="20" left="120" name="region_name_text" font="SansSerifSmall" height="20" left="120" name="region_name_text"
width="150"> width="150">
(unknown) (unknown)
</text> </text>
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
left="10" name="estate_name_lbl" width="100"> left="10" name="estate_name_lbl" width="100">
Estate: Estate:
</text> </text>
<text bottom_delta="0" follows="left|top" <text bottom_delta="0" follows="left|top"
font="SansSerifSmall" height="20" left="120" name="estate_name_text" font="SansSerifSmall" height="20" left="120" name="estate_name_text"
width="150"> width="150">
(unknown) (unknown)
</text> </text>
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
left="10" name="estate_owner_lbl" width="100"> left="10" name="estate_owner_lbl" width="100">
Estate Owner: Estate Owner:
</text> </text>
<text bottom_delta="0" follows="left|top" <text bottom_delta="0" follows="left|top"
font="SansSerifSmall" height="20" left="120" name="estate_owner_text" font="SansSerifSmall" height="20" left="120" name="estate_owner_text"
width="150"> width="150">
(unknown) (unknown)
</text> </text>
<text bottom_delta="-20" follows="left|top" <text bottom_delta="-20" follows="left|top"
font="SansSerif" height="20" left="60" name="resellable_clause" font="SansSerif" height="20" left="60" name="resellable_clause"
width="300"> width="300">
Purchased land in this region may or may not be resold. Purchased land in this region may or may not be resold.
</text> </text>
<text bottom_delta="-20" follows="left|top" <text bottom_delta="-20" follows="left|top"
font="SansSerif" height="20" left="60" name="changeable_clause" font="SansSerif" height="20" left="60" name="changeable_clause"
width="375"> width="375">
Purchased land in this region may or may not be joined or subdivided. Purchased land in this region may or may not be joined or subdivided.
</text> </text>
<text_editor bottom_delta="-200" enabled="false" <text_editor bottom_delta="-200" enabled="false"
follows="left|top" font="SansSerifSmall" height="200" left="15" follows="left|top" font="SansSerifSmall" height="200" left="15"
max_length="65535" name="covenant_editor" max_length="65535" name="covenant_editor"
width="425" word_wrap="true" /> width="425" word_wrap="true" />
<string name="can_resell"> <string name="can_resell">
Purchased land in this region may be resold. Purchased land in this region may be resold.
</string> </string>
<string name="can_not_resell"> <string name="can_not_resell">
Purchased land in this region may not be resold. Purchased land in this region may not be resold.
</string> </string>
<string name="can_change"> <string name="can_change">
Purchased land in this region may be joined or subdivided. Purchased land in this region may be joined or subdivided.
</string> </string>
<string name="can_not_change"> <string name="can_not_change">
Purchased land in this region may not be joined or subdivided. Purchased land in this region may not be joined or subdivided.
</string> </string>
</panel> </panel>