diff --git a/LICENSES/elfio.txt b/LICENSES/elfio.txt deleted file mode 100644 index 0f25e4bae..000000000 --- a/LICENSES/elfio.txt +++ /dev/null @@ -1,19 +0,0 @@ -ELFIO.h - ELF reader and producer. -Copyright (C) 2001 Serge Lamikhov-Center - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -The GNU Library GPL is available at http://www.gnu.org/copyleft/lesser.html - diff --git a/LICENSES/fontconfig.txt b/LICENSES/fontconfig.txt deleted file mode 100644 index eb766faed..000000000 --- a/LICENSES/fontconfig.txt +++ /dev/null @@ -1,23 +0,0 @@ -http://www.jclark.com/xml/copying.txt - -Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - diff --git a/LICENSES/libxml.txt b/LICENSES/libxml.txt deleted file mode 100644 index a5c4e6689..000000000 --- a/LICENSES/libxml.txt +++ /dev/null @@ -1,29 +0,0 @@ -http://xmlsoft.org/ -http://www.opensource.org/licenses/mit-license.html - -Open Source Initiative OSI - The MIT License:Licensing -Tue, 2006-10-31 04:56 . nelson - -The MIT License - -Copyright (c) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - diff --git a/LICENSES/openal.txt b/LICENSES/openal.txt deleted file mode 100644 index d0c897869..000000000 --- a/LICENSES/openal.txt +++ /dev/null @@ -1,484 +0,0 @@ - - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 - - - Copyright (C) 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if -you distribute copies of the library, or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal -permission to copy, distribute and/or modify the library. - - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. - - GNU LIBRARY GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also compile or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - c) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - d) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the source code distributed need not include anything that is normally -distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Library General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - diff --git a/LICENSES/qt-4.5-linden-changes.txt b/LICENSES/qt-4.5-linden-changes.txt deleted file mode 100644 index d424824cb..000000000 --- a/LICENSES/qt-4.5-linden-changes.txt +++ /dev/null @@ -1,5 +0,0 @@ -The pristine version of Qt corresponding to this build is available at: -http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/qt-all-opensource-src-4.5.2.tar.bz2 - -The patches we applied to the above package to get this build are available at: -http://hg.secondlife.com/llqtwebkit/src/tip/qt_patches/ diff --git a/etc/message.xml b/etc/message.xml index 1665b0017..330ecee48 100644 --- a/etc/message.xml +++ b/etc/message.xml @@ -565,6 +565,14 @@ false + ObjectPhysicsProperties + + flavor + llsd + trusted-sender + true + + DisplayNameUpdate diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index e16652a6c..e81965cc6 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -33,8 +33,8 @@ include(UnixInstall) set (DISABLE_FATAL_WARNINGS TRUE) if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE ReleaseSSE2 CACHE STRING - "Build type. One of: Debug Release ReleaseSSE2 RelWithDebInfo" FORCE) + set(CMAKE_BUILD_TYPE Release CACHE STRING + "Build type. One of: Debug Release RelWithDebInfo" FORCE) endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) # Create a 'prepare' target in which to perform setup actions. This diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 58f8acf90..d7a2ec8c9 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -12,17 +12,12 @@ set(CMAKE_CXX_FLAGS_RELEASE "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") -set(CMAKE_CXX_FLAGS_RELEASESSE2 - "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG") -#llimage now requires this (?) -set(CMAKE_C_FLAGS_RELEASESSE2 - "${CMAKE_CXX_FLAGS_RELEASESSE2}") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DLL_RELEASE=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1") # Don't bother with a MinSizeRel build. -set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;ReleaseSSE2;Debug" CACHE STRING +set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING "Supported build types." FORCE) # Platform-specific compilation flags. @@ -40,23 +35,17 @@ if (WINDOWS) "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /arch:SSE2" CACHE STRING "C++ compiler release-with-debug options" FORCE) set(CMAKE_CXX_FLAGS_RELEASE - "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /arch:SSE /fp:fast" + "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /arch:SSE2 /fp:fast" CACHE STRING "C++ compiler release options" FORCE) set(CMAKE_C_FLAGS_RELEASE - "${CMAKE_C_FLAGS_RELEASE} ${LL_C_FLAGS} /O2 /Zi /MD /MP /arch:SSE /fp:fast" + "${CMAKE_C_FLAGS_RELEASE} ${LL_C_FLAGS} /O2 /Zi /MD /MP /arch:SSE2 /fp:fast" CACHE STRING "C compiler release options" FORCE) - set(CMAKE_CXX_FLAGS_RELEASESSE2 - "${CMAKE_CXX_FLAGS_RELEASESSE2} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /arch:SSE2 /fp:fast" - CACHE STRING "C++ compiler release-SSE2 options" FORCE) - set(CMAKE_C_FLAGS_RELEASESSE2 - "${CMAKE_C_FLAGS_RELEASESSE2} ${LL_C_FLAGS} /O2 /Zi /MD /MP /arch:SSE2 /fp:fast" - CACHE STRING "C compiler release-SSE2 options" FORCE) set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LARGEADDRESSAWARE") set(CMAKE_CXX_STANDARD_LIBRARIES "") set(CMAKE_C_STANDARD_LIBRARIES "") - + add_definitions( /DLL_WINDOWS=1 /DUNICODE @@ -78,12 +67,9 @@ if (WINDOWS) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" CACHE STRING "C++ compiler release options" FORCE) - set(CMAKE_CXX_FLAGS_RELEASESSE2 - "${CMAKE_CXX_FLAGS_RELEASESSE2} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" - CACHE STRING "C++ compiler release-SSE2 options" FORCE) - set(CMAKE_C_FLAGS_RELEASESSE2 - "${CMAKE_CXX_FLAGS_RELEASESSE2} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" - CACHE STRING "C compiler release-SSE2 options" FORCE) + set(CMAKE_C_FLAGS_RELEASE + "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" + CACHE STRING "C compiler release options" FORCE) add_definitions( /Zc:wchar_t- ) @@ -144,7 +130,6 @@ if (LINUX) add_definitions(-DLL_IGNORE_SIGCHLD) if(${CMAKE_C_COMPILER} MATCHES "gcc*") - find_program(GXX g++) mark_as_advanced(GXX) @@ -197,9 +182,6 @@ if (LINUX) # End of hacks. - #GCC Specific - add_definitions(-DCC_GCC) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") if (NOT STANDALONE) @@ -208,8 +190,8 @@ if (LINUX) endif (NOT STANDALONE) if (${ARCH} STREQUAL "x86_64") add_definitions(-DLINUX64=1 -pipe) - set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers") - set(CMAKE_C_FLAGS_RELEASESSE2 "${CMAKE_C_FLAGS_RELEASESSE2} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers") else (${ARCH} STREQUAL "x86_64") @@ -218,18 +200,19 @@ if (LINUX) endif (NOT STANDALONE) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2") - set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}") - set(CMAKE_C_FLAGS_RELEASESSE2 "${CMAKE_C_FLAGS_RELEASESSE2}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}") endif (${ARCH} STREQUAL "x86_64") elseif(${CMAKE_C_COMPILER} MATCHES "clang*") - - find_program(CLANG clang++) + find_program(CLANG clang) mark_as_advanced(CLANG) + + find_program(CLANGXX clang++) + mark_as_advanced(CLANGXX) add_definitions( - -DCC_CLANG -D_FORTIFY_SOURCE=2 ) @@ -244,18 +227,39 @@ if (LINUX) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2") - set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2}${MARCH_FLAG} -msse2") - set(CMAKE_C_FLAGS_RELEASESSE2 "${CMAKE_C_FLAGS_RELEASESSE2}${MARCH_FLAG} -msse2") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}${MARCH_FLAG} -msse2") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}${MARCH_FLAG} -msse2") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse2") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse2") + elseif(${CMAKE_C_COMPILER} MATCHES "icc*" AND ${CMAKE_CXX_COMPILER} MATCHES "icpc*") + find_program(ICC icc) + mark_as_advanced(ICC) + + add_definitions( + -D_FORTIFY_SOURCE=2 + ) + + if (NOT STANDALONE) + # this stops us requiring a really recent glibc at runtime + add_definitions(-fno-stack-protector) + endif (NOT STANDALONE) + + if (NOT STANDALONE) + set(MARCH_FLAG " -axsse4.1 -msse2") + endif (NOT STANDALONE) + + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline-functions") + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline-functions") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}${MARCH_FLAG} -parallel -fp-model fast=1") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}${MARCH_FLAG} -parallel -fp-model fast=1") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -parallel -fp-model fast=1") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -parallel -fp-model fast=1") endif() set(CMAKE_CXX_FLAGS_DEBUG "-O0 ${CMAKE_CXX_FLAGS_DEBUG}") set(CMAKE_C_FLAGS_DEBUG "-O0 ${CMAKE_CXX_FLAGS_DEBUG}") set(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS_RELEASE}") set(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS_RELEASE}") - set(CMAKE_CXX_FLAGS_RELEASESSE2 "-O3 ${CMAKE_CXX_FLAGS_RELEASESSE2}") - set(CMAKE_C_FLAGS_RELEASESSE2 "-O3 ${CMAKE_C_FLAGS_RELEASESSE2}") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO}") endif (LINUX) @@ -269,12 +273,10 @@ if (DARWIN) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch") # NOTE: it's critical that the optimization flag is put in front. # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered. - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}") 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} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}") - set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2} -O3 -msse2 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}") - set(CMAKE_C_FLAGS_RELEASESSE2 "${CMAKE_C_FLAGS_RELEASESSE2} -O3 -msse2 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}") endif (DARWIN) @@ -283,8 +285,11 @@ if (LINUX OR DARWIN) set(UNIX_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs") set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor -Woverloaded-virtual") elseif(${CMAKE_C_COMPILER} MATCHES "clang*") - set(UNIX_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-tautological-compare -Wno-char-subscripts -Wno-gnu -Wno-logical-op-parentheses - -Wno-non-virtual-dtor -Woverloaded-virtual -Wno-parentheses-equality -Wno-reorder -Wno-unused-function -Wno-unused-value -Wno-unused-variable") + set(UNIX_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-tautological-compare -Wno-char-subscripts -Wno-gnu -Wno-logical-op-parentheses -Wno-non-virtual-dtor ") + set(UNIX_WARNINGS "${UNIX_WARNINGS} -Woverloaded-virtual -Wno-parentheses-equality -Wno-reorder -Wno-unused-function -Wno-unused-value -Wno-unused-variable") + set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS}") + elseif(${CMAKE_C_COMPILER} MATCHES "icc") + set(UNIX_WARNINGS "-wd327 -wd597 -wd858") set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS}") endif() @@ -327,16 +332,17 @@ if(1 EQUAL 1) endif (NOT "$ENV{SHY_MOD}" STREQUAL "") endif(1 EQUAL 1) -SET( CMAKE_EXE_LINKER_FLAGS_RELEASESSE2 +SET( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}" CACHE STRING - "Flags used for linking binaries under SSE2 build." + "Flags used for linking binaries under build." FORCE ) -SET( CMAKE_SHARED_LINKER_FLAGS_RELEASESSE2 +SET( CMAKE_SHARED_LINKER_FLAGS_RELEASE "${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 build." FORCE ) MARK_AS_ADVANCED( - CMAKE_CXX_FLAGS_RELEASESSE2 - CMAKE_C_FLAGS_RELEASESSE2 - CMAKE_EXE_LINKER_FLAGS_RELEASESSE2 - CMAKE_SHARED_LINKER_FLAGS_RELEASESSE2 ) + CMAKE_CXX_FLAGS_RELEASE + CMAKE_C_FLAGS_RELEASE + CMAKE_EXE_LINKER_FLAGS_RELEASE + CMAKE_SHARED_LINKER_FLAGS_RELEASE + ) diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake index d23bc2f9c..6bad4a726 100644 --- a/indra/cmake/Audio.cmake +++ b/indra/cmake/Audio.cmake @@ -9,7 +9,7 @@ if (STANDALONE) pkg_check_modules(VORBISFILE REQUIRED vorbisfile) else (STANDALONE) use_prebuilt_binary(ogg-vorbis) - set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) set(VORBISENC_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS}) set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS}) diff --git a/indra/cmake/BerkeleyDB.cmake b/indra/cmake/BerkeleyDB.cmake index e3ca0fd77..032dd510e 100644 --- a/indra/cmake/BerkeleyDB.cmake +++ b/indra/cmake/BerkeleyDB.cmake @@ -1,4 +1,4 @@ -# -*- cmake -*- +include(Prebuilt) set(DB_FIND_QUIETLY ON) set(DB_FIND_REQUIRED ON) @@ -8,9 +8,10 @@ if (STANDALONE) else (STANDALONE) if (LINUX) # Need to add dependency pthread explicitely to support ld.gold. - set(DB_LIBRARIES db-4.2 pthread) + use_prebuilt_binary(db) + set(DB_LIBRARIES db-5.1 pthread) else (LINUX) set(DB_LIBRARIES db-4.2) endif (LINUX) - set(DB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + set(DB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) endif (STANDALONE) diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 1275d0547..6babb05fd 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -13,7 +13,7 @@ if (STANDALONE) set(BOOST_SYSTEM_LIBRARY boost_system-mt) else (STANDALONE) use_prebuilt_binary(boost) - set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) if (WINDOWS) set(BOOST_VERSION 1_45) diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 28a3d5e4f..21eee45ac 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -29,17 +29,16 @@ set(cmake_SOURCE_FILES FindELFIO.cmake FindGooglePerfTools.cmake FindHunSpell.cmake - FindMono.cmake FindMT.cmake - FindMySQL.cmake FindNDOF.cmake FindOpenJPEG.cmake FindXmlRpcEpi.cmake - FMOD.cmake + FMOD.cmake + FMODEX.cmake FreeType.cmake GStreamer010Plugin.cmake GooglePerfTools.cmake - HUNSPELL.cmake + Hunspell.cmake JPEG.cmake LLAddBuildTest.cmake LLAudio.cmake @@ -63,8 +62,6 @@ set(cmake_SOURCE_FILES LLXML.cmake LScript.cmake Linking.cmake - MonoEmbed.cmake - MySQL.cmake NDOF.cmake OPENAL.cmake OpenGL.cmake @@ -83,10 +80,6 @@ set(cmake_SOURCE_FILES ZLIB.cmake ) -if(FMODEX) - list(APPEND cmake_SOURCE_FILES FMODEX.cmake) -endif(FMODEX) - source_group("Shared Rules" FILES ${cmake_SOURCE_FILES}) set(master_SOURCE_FILES diff --git a/indra/cmake/CopyWinLibs.cmake b/indra/cmake/CopyWinLibs.cmake index 21fe3f246..aa345e9cc 100644 --- a/indra/cmake/CopyWinLibs.cmake +++ b/indra/cmake/CopyWinLibs.cmake @@ -29,6 +29,8 @@ set(debug_files libapr-1.dll libaprutil-1.dll libapriconv-1.dll + libeay32.dll + ssleay32.dll ) copy_if_different( @@ -43,10 +45,6 @@ set(all_targets ${all_targets} ${out_targets}) set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug") set(plugintest_debug_files libeay32.dll - libglib-2.0-0.dll - libgmodule-2.0-0.dll - libgobject-2.0-0.dll - libgthread-2.0-0.dll qtcored4.dll qtguid4.dll qtnetworkd4.dll @@ -92,11 +90,6 @@ set(all_targets ${all_targets} ${out_targets}) set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release") set(plugintest_release_files libeay32.dll - libglib-2.0-0.dll - libgmodule-2.0-0.dll - libgobject-2.0-0.dll - libgthread-2.0-0.dll -# llkdu.dll (not required for plugin test) qtcore4.dll qtgui4.dll qtnetwork4.dll @@ -112,14 +105,6 @@ copy_if_different( ) set(all_targets ${all_targets} ${out_targets}) -copy_if_different( - ${plugintest_release_src_dir} - "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/ReleaseSSE2" - out_targets - ${plugintest_release_files} - ) -set(all_targets ${all_targets} ${out_targets}) - copy_if_different( ${plugintest_release_src_dir} "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo" @@ -146,14 +131,6 @@ copy_if_different( ) set(all_targets ${all_targets} ${out_targets}) -copy_if_different( - ${plugintest_release_src_dir} - "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/ReleaseSSE2/imageformats" - out_targets - ${plugintest_release_files} - ) -set(all_targets ${all_targets} ${out_targets}) - copy_if_different( ${plugintest_release_src_dir} "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo/imageformats" @@ -170,14 +147,6 @@ copy_if_different( ) set(all_targets ${all_targets} ${out_targets}) -copy_if_different( - ${plugintest_release_src_dir} - "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/llplugin/imageformats" - out_targets - ${plugintest_release_files} - ) -set(all_targets ${all_targets} ${out_targets}) - copy_if_different( ${plugintest_release_src_dir} "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin/imageformats" @@ -224,14 +193,6 @@ copy_if_different( ) set(all_targets ${all_targets} ${out_targets}) -copy_if_different( - ${plugins_release_src_dir} - "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/llplugin" - out_targets - ${plugins_release_files} - ) -set(all_targets ${all_targets} ${out_targets}) - copy_if_different( ${plugins_release_src_dir} "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin" @@ -247,46 +208,44 @@ set(release_files libapr-1.dll libaprutil-1.dll libapriconv-1.dll + libeay32.dll + ssleay32.dll ) if(FMODEX) - find_path(FMODEX_BINARY_DIR fmodex.dll + find_path(FMODEX_BINARY_DIR fmodex.dll ${release_src_dir} ${FMODEX_SDK_DIR}/api ${FMODEX_SDK_DIR} ) - if(FMODEX_BINARY_DIR) - copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets fmodex.dll) - set(all_targets ${all_targets} ${out_targets}) - copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2" out_targets fmodex.dll) - set(all_targets ${all_targets} ${out_targets}) - copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets fmodex.dll) - set(all_targets ${all_targets} ${out_targets}) - copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets fmodex.dll) - set(all_targets ${all_targets} ${out_targets}) - endif(FMODEX_BINARY_DIR) + if(FMODEX_BINARY_DIR) + copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets fmodex.dll) + set(all_targets ${all_targets} ${out_targets}) + copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets fmodex.dll) + set(all_targets ${all_targets} ${out_targets}) + copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets fmodex.dll) + set(all_targets ${all_targets} ${out_targets}) + endif(FMODEX_BINARY_DIR) endif(FMODEX) if(FMOD) - find_path(FMOD_BINARY_DIR fmod.dll + find_path(FMOD_BINARY_DIR fmod.dll ${release_src_dir} ${FMOD_SDK_DIR}/api ${FMOD_SDK_DIR} ) - if(FMOD_BINARY_DIR) - copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets fmod.dll) - set(all_targets ${all_targets} ${out_targets}) - copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2" out_targets fmod.dll) - set(all_targets ${all_targets} ${out_targets}) - copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets fmod.dll) - set(all_targets ${all_targets} ${out_targets}) - copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets fmod.dll) - set(all_targets ${all_targets} ${out_targets}) - else(FMOD_BINARY_DIR) - list(APPEND release_files fmod.dll) #Required for compile. This will cause an error in copying binaries. - endif(FMOD_BINARY_DIR) +if(FMOD_BINARY_DIR) + copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets fmod.dll) + set(all_targets ${all_targets} ${out_targets}) + copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets fmod.dll) + set(all_targets ${all_targets} ${out_targets}) + copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets fmod.dll) + set(all_targets ${all_targets} ${out_targets}) + else(FMOD_BINARY_DIR) + list(APPEND release_files fmod.dll) #Required for compile. This will cause an error in copying binaries. + endif(FMOD_BINARY_DIR) endif(FMOD) copy_if_different( @@ -305,22 +264,6 @@ copy_if_different( ) set(all_targets ${all_targets} ${out_targets}) -copy_if_different( - ${release_src_dir} - "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2" - out_targets - ${release_files} - ) -set(all_targets ${all_targets} ${out_targets}) - -copy_if_different( - ${vivox_src_dir} - "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2" - out_targets - ${vivox_files} - ) -set(all_targets ${all_targets} ${out_targets}) - copy_if_different( ${release_src_dir} "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" @@ -371,15 +314,6 @@ else(EXISTS ${internal_llkdu_path}) COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Release" ) set(all_targets ${all_targets} ${release_llkdu_dst}) - - set(releasesse2_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/llkdu.dll") - ADD_CUSTOM_COMMAND( - OUTPUT ${releasesse2_llkdu_dst} - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${releasesse2_llkdu_dst} - DEPENDS ${release_llkdu_src} - COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2" - ) - set(all_targets ${all_targets} ${releasesse2_llkdu_dst}) set(relwithdebinfo_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llkdu.dll") ADD_CUSTOM_COMMAND( @@ -455,14 +389,6 @@ if (MSVC80) ) set(all_targets ${all_targets} ${out_targets}) - copy_if_different( - ${release_msvc8_redist_path} - "${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2" - out_targets - ${release_msvc8_files} - ) - set(all_targets ${all_targets} ${out_targets}) - copy_if_different( ${release_msvc8_redist_path} "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" @@ -483,19 +409,6 @@ if (MSVC80) DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest COMMENT "Creating release app config file" ) - - set(releasesse2_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/${VIEWER_BINARY_NAME}.exe.config) - add_custom_command( - OUTPUT ${releasesse2_appconfig_file} - COMMAND ${PYTHON_EXECUTABLE} - ARGS - ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py - ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest - ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config - ${releasesse2_appconfig_file} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/Microsoft.VC80.CRT.manifest - COMMENT "Creating release-sse2 app config file" - ) set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config) add_custom_command( @@ -517,7 +430,6 @@ add_custom_target(copy_win_libs ALL DEPENDS ${all_targets} ${release_appconfig_file} - ${releasesse2_appconfig_file} ${relwithdebinfo_appconfig_file} ${debug_appconfig_file} ) diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake index b78a0b1e7..05266eb9c 100644 --- a/indra/cmake/DBusGlib.cmake +++ b/indra/cmake/DBusGlib.cmake @@ -7,15 +7,14 @@ if (STANDALONE) pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1) elseif (LINUX) - use_prebuilt_binary(glib) # dbusglib needs glib use_prebuilt_binary(dbusglib) set(DBUSGLIB_FOUND ON FORCE BOOL) set(DBUSGLIB_INCLUDE_DIRS - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0 + ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/dbus ) - + # We don't need to explicitly link against dbus-glib itself, because + # the viewer probes for the system's copy at runtime. set(DBUSGLIB_LIBRARIES - dbus-glib-1 gobject-2.0 glib-2.0 ) diff --git a/indra/cmake/ELFIO.cmake b/indra/cmake/ELFIO.cmake index e51993b0f..fbde78311 100644 --- a/indra/cmake/ELFIO.cmake +++ b/indra/cmake/ELFIO.cmake @@ -8,7 +8,7 @@ if (STANDALONE) elseif (LINUX) use_prebuilt_binary(elfio) set(ELFIO_LIBRARIES ELFIO) - set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) + set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) set(ELFIO_FOUND "YES") endif (STANDALONE) diff --git a/indra/cmake/EXPAT.cmake b/indra/cmake/EXPAT.cmake index acb15dc62..8a8f84526 100644 --- a/indra/cmake/EXPAT.cmake +++ b/indra/cmake/EXPAT.cmake @@ -13,5 +13,5 @@ else (STANDALONE) else (WINDOWS) set(EXPAT_LIBRARIES expat) endif (WINDOWS) - set(EXPAT_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + set(EXPAT_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) endif (STANDALONE) diff --git a/indra/cmake/FindJsonCpp.cmake b/indra/cmake/FindJsonCpp.cmake index 7dfc2b097..44ab0e769 100644 --- a/indra/cmake/FindJsonCpp.cmake +++ b/indra/cmake/FindJsonCpp.cmake @@ -24,8 +24,8 @@ EXEC_PROGRAM(${CMAKE_CXX_COMPILER} # Try to find a library that was compiled with the same compiler version as we currently use. SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so) IF (STANDALONE) - # On standalone, assume that the system installed library was compiled with the used compiler. - SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so) + # On standalone, assume that the system installed library was compiled with the used compiler. + SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so) ENDIF (STANDALONE) FIND_LIBRARY(JSONCPP_LIBRARY NAMES ${JSONCPP_NAMES} diff --git a/indra/cmake/FindLLQtWebkit.cmake b/indra/cmake/FindLLQtWebkit.cmake index c747ec32a..731ae67d7 100644 --- a/indra/cmake/FindLLQtWebkit.cmake +++ b/indra/cmake/FindLLQtWebkit.cmake @@ -35,7 +35,7 @@ find_path(LLQTWEBKIT_INCLUDE_DIR llqtwebkit.h NO_SYSTEM_ENVIRONMENT_PATH HINTS $ find_library(LLQTWEBKIT_LIBRARY NAMES llqtwebkit NO_SYSTEM_ENVIRONMENT_PATH HINTS ${LLQTWEBKIT_LIBRARY_DIRS}) -if (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND) # If pkg-config couldn't find it, pretend we don't have pkg-config. +if (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND) # If pkg-config couldn't find it, pretend we don't have pkg-config. set(LLQTWEBKIT_LIBRARIES llqtwebkit) get_filename_component(LLQTWEBKIT_LIBRARY_DIRS ${LLQTWEBKIT_LIBRARY} PATH) endif (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND) diff --git a/indra/cmake/FindMT.cmake b/indra/cmake/FindMT.cmake index 71b5a43e5..babc68db5 100644 --- a/indra/cmake/FindMT.cmake +++ b/indra/cmake/FindMT.cmake @@ -1,17 +1,17 @@ -#Find the windows manifest tool. -if (MSVC80) - FIND_PROGRAM(HAVE_MANIFEST_TOOL NAMES mt - PATHS - "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/VC/bin" - "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin" - "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin") - IF(HAVE_MANIFEST_TOOL) - MESSAGE(STATUS "Found Mainfest Tool. Embedding custom manifests.") - ELSE(HAVE_MANIFEST_TOOL) - MESSAGE(FATAL_ERROR "Manifest tool, mt.exe, can't be found.") - ENDIF(HAVE_MANIFEST_TOOL) - - STRING(REPLACE "/MANIFEST " "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS - ${CMAKE_EXE_LINKER_FLAGS}) - -endif (MSVC80) +#Find the windows manifest tool. +if (MSVC80) + FIND_PROGRAM(HAVE_MANIFEST_TOOL NAMES mt + PATHS + "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/VC/bin" + "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin" + "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin") + IF(HAVE_MANIFEST_TOOL) + MESSAGE(STATUS "Found Mainfest Tool. Embedding custom manifests.") + ELSE(HAVE_MANIFEST_TOOL) + MESSAGE(FATAL_ERROR "Manifest tool, mt.exe, can't be found.") + ENDIF(HAVE_MANIFEST_TOOL) + + STRING(REPLACE "/MANIFEST " "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS + ${CMAKE_EXE_LINKER_FLAGS}) + +endif (MSVC80) diff --git a/indra/cmake/FindMono.cmake b/indra/cmake/FindMono.cmake deleted file mode 100644 index c36d7259e..000000000 --- a/indra/cmake/FindMono.cmake +++ /dev/null @@ -1,68 +0,0 @@ -# - Try to find the mono, mcs, gmcs and gacutil -# -# defines -# -# MONO_FOUND - system has mono, mcs, gmcs and gacutil -# MONO_PATH - where to find 'mono' -# MCS_PATH - where to find 'mcs' -# GMCS_PATH - where to find 'gmcs' -# GACUTIL_PATH - where to find 'gacutil' -# -# copyright (c) 2007 Arno Rehn arno@arnorehn.de -# -# Redistribution and use is allowed according to the terms of the GPL license. -# Removed the check for gmcs - -FIND_PROGRAM (MONO_EXECUTABLE mono - "$ENV{PROGRAMFILES}/Mono-1.9.1/bin" - "$ENV{PROGRAMFILES}/Mono-1.2.6/bin" - /bin - /usr/bin - /usr/local/bin -) -FIND_PROGRAM (MCS_EXECUTABLE mcs - "$ENV{PROGRAMFILES}/Mono-1.9.1/bin" - "$ENV{PROGRAMFILES}/Mono-1.2.6/bin" - /bin - /usr/bin - /usr/local/bin -) -FIND_PROGRAM (GMCS_EXECUTABLE gmcs - "$ENV{PROGRAMFILES}/Mono-1.9.1/bin" - "$ENV{PROGRAMFILES}/Mono-1.2.6/bin" - /bin - /usr/bin - /usr/local/bin -) -FIND_PROGRAM (GACUTIL_EXECUTABLE gacutil - "$ENV{PROGRAMFILES}/Mono-1.9.1/bin" - "$ENV{PROGRAMFILES}/Mono-1.2.6/bin" - /bin - /usr/bin - /usr/local/bin -) -FIND_PROGRAM (ILASM_EXECUTABLE - ilasm - NO_DEFAULT_PATH - PATHS "$ENV{PROGRAMFILES}/Mono-1.9.1/bin" "$ENV{PROGRAMFILES}/Mono-1.2.6/bin" /bin /usr/bin /usr/local/bin -) - -SET (MONO_FOUND FALSE) - -IF (MONO_EXECUTABLE AND MCS_EXECUTABLE AND GACUTIL_EXECUTABLE) - SET (MONO_FOUND TRUE) -ENDIF (MONO_EXECUTABLE AND MCS_EXECUTABLE AND GACUTIL_EXECUTABLE) - -IF (MONO_FOUND) - IF (NOT Mono_FIND_QUIETLY) - MESSAGE(STATUS "Found mono: ${MONO_EXECUTABLE}") - MESSAGE(STATUS "Found mcs: ${MCS_EXECUTABLE}") - MESSAGE(STATUS "Found gacutil: ${GACUTIL_EXECUTABLE}") - ENDIF (NOT Mono_FIND_QUIETLY) -ELSE (MONO_FOUND) - IF (Mono_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find one or more of the following programs: mono, mcs, gacutil") - ENDIF (Mono_FIND_REQUIRED) -ENDIF (MONO_FOUND) - -MARK_AS_ADVANCED(MONO_EXECUTABLE MCS_EXECUTABLE GACUTIL_EXECUTABLE) diff --git a/indra/cmake/FindMySQL.cmake b/indra/cmake/FindMySQL.cmake deleted file mode 100644 index 431940328..000000000 --- a/indra/cmake/FindMySQL.cmake +++ /dev/null @@ -1,48 +0,0 @@ -# -*- cmake -*- - -# - Find MySQL -# Find the MySQL includes and library -# This module defines -# MYSQL_INCLUDE_DIR, where to find mysql.h, etc. -# MYSQL_LIBRARIES, the libraries needed to use Mysql. -# MYSQL_FOUND, If false, do not try to use Mysql. -# also defined, but not for general use are -# MYSQL_LIBRARY, where to find the Mysql library. - -FIND_PATH(MYSQL_INCLUDE_DIR mysql/mysql.h -/usr/local/include -/usr/include -) - -SET(MYSQL_NAMES ${MYSQL_NAMES} mysqlclient) -FIND_LIBRARY(MYSQL_LIBRARY - NAMES ${MYSQL_NAMES} - PATHS /usr/lib/mysql /usr/lib /usr/local/lib/mysql /usr/local/lib - ) - -IF (MYSQL_LIBRARY AND MYSQL_INCLUDE_DIR) - SET(MYSQL_LIBRARIES ${MYSQL_LIBRARY}) - SET(MYSQL_FOUND "YES") -ELSE (MYSQL_LIBRARY AND MYSQL_INCLUDE_DIR) - SET(MYSQL_FOUND "NO") -ENDIF (MYSQL_LIBRARY AND MYSQL_INCLUDE_DIR) - - -IF (MYSQL_FOUND) - IF (NOT MYSQL_FIND_QUIETLY) - MESSAGE(STATUS "Found MySQL: ${MYSQL_LIBRARIES}") - ENDIF (NOT MYSQL_FIND_QUIETLY) -ELSE (MYSQL_FOUND) - IF (MYSQL_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find MySQL library") - ENDIF (MYSQL_FIND_REQUIRED) -ENDIF (MYSQL_FOUND) - -# Deprecated declarations. -SET (NATIVE_MYSQL_INCLUDE_PATH ${MYSQL_INCLUDE_DIR} ) -GET_FILENAME_COMPONENT (NATIVE_MYSQL_LIB_PATH ${MYSQL_LIBRARY} PATH) - -MARK_AS_ADVANCED( - MYSQL_LIBRARY - MYSQL_INCLUDE_DIR - ) diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake index 5f1aa26e8..e9d4d8093 100644 --- a/indra/cmake/FreeType.cmake +++ b/indra/cmake/FreeType.cmake @@ -11,7 +11,7 @@ else (STANDALONE) set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) else (LINUX) - set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) endif (LINUX) set(FREETYPE_LIBRARIES freetype) diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index fc5b40d42..8fbe08dc2 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -5,7 +5,7 @@ if (STANDALONE) include(FindGooglePerfTools) else (STANDALONE) if (LINUX OR WINDOWS) - use_prebuilt_binary(google) + use_prebuilt_binary(gperftools) endif (LINUX OR WINDOWS) if (WINDOWS) set(TCMALLOC_LIBRARIES libtcmalloc_minimal.lib) diff --git a/indra/cmake/HUNSPELL.cmake b/indra/cmake/Hunspell.cmake similarity index 88% rename from indra/cmake/HUNSPELL.cmake rename to indra/cmake/Hunspell.cmake index cd5d7e00b..365df6783 100644 --- a/indra/cmake/HUNSPELL.cmake +++ b/indra/cmake/Hunspell.cmake @@ -9,7 +9,7 @@ else (STANDALONE) set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/hunspell) if (LINUX OR DARWIN) - set(HUNSPELL_LIBRARY hunspell-1.2) + set(HUNSPELL_LIBRARY hunspell-1.3) else (LINUX OR DARWIN) set(HUNSPELL_LIBRARY libhunspell) endif (LINUX OR DARWIN) diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake index 9514d59f6..f3e5753a6 100644 --- a/indra/cmake/JPEG.cmake +++ b/indra/cmake/JPEG.cmake @@ -19,5 +19,5 @@ else (STANDALONE) elseif (WINDOWS) set(JPEG_LIBRARIES jpeglib) endif (LINUX) - set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) endif (STANDALONE) diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 552fc19fc..856034955 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -18,5 +18,5 @@ else (STANDALONE) elseif (LINUX) set(JSONCPP_LIBRARIES jsoncpp) endif (WINDOWS) - set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp) + set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/jsoncpp) endif (STANDALONE) diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake index 5cf92335e..f8d2a2902 100644 --- a/indra/cmake/LLWindow.cmake +++ b/indra/cmake/LLWindow.cmake @@ -13,15 +13,13 @@ if (STANDALONE) SDL_LIBRARY ) else (STANDALONE) - if (NOT DARWIN) + if (LINUX) use_prebuilt_binary(mesa) - endif (NOT DARWIN) - if (LINUX AND VIEWER) use_prebuilt_binary(SDL) set (SDL_FOUND TRUE) - set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux) - set (SDL_LIBRARY SDL) - endif (LINUX AND VIEWER) + set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}) + set (SDL_LIBRARY SDL directfb fusion direct) + endif (LINUX) endif (STANDALONE) if (SDL_FOUND) diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index eaa8a6dc2..70d005d33 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -6,11 +6,7 @@ if (NOT STANDALONE) set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release) set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug) elseif (LINUX) - if (VIEWER) - set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client) - else (VIEWER) - set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release) - endif (VIEWER) + set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release) set(ARCH_PREBUILT_DIRS_RELEASE ${ARCH_PREBUILT_DIRS}) set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS}) elseif (DARWIN) diff --git a/indra/cmake/MonoDeps.cmake b/indra/cmake/MonoDeps.cmake deleted file mode 100644 index 52d549156..000000000 --- a/indra/cmake/MonoDeps.cmake +++ /dev/null @@ -1,48 +0,0 @@ -# -*- cmake -*- - -set(MONO_PREBUILT_LIBRARIES_DIR ${LIBS_PREBUILT_DIR}/mono/1.0) - -set(MONO_PREBUILT_LIBRARIES - Iesi.Collections.dll - Iesi.Collections.pdb - Mono.CompilerServices.SymbolWriter.dll - Mono.PEToolkit.dll - Mono.PEToolkit.pdb - Mono.Security.dll - PEAPI.dll - RAIL.dll - RAIL.pdb - ) - - set(MONO_CORE_LIBRARIES - System.dll - System.Xml.dll - mscorlib.dll) - -if(WINDOWS) - set(MONO_DEPENDENCIES - DomainCreator - DomainRegister - LslLibrary - LslUserScript - Script - ScriptTypes - TestFormat - UserScript - UThread - UThreadInjector - ) -else(WINDOWS) - set(MONO_DEPENDENCIES - DomainCreator_POST_BUILD - DomainRegister_POST_BUILD - LslLibrary_POST_BUILD - LslUserScript_POST_BUILD - Script_POST_BUILD - ScriptTypes_POST_BUILD - TestFormat_POST_BUILD - UserScript_POST_BUILD - UThread_POST_BUILD - UThreadInjector_POST_BUILD - ) -endif(WINDOWS) diff --git a/indra/cmake/MonoEmbed.cmake b/indra/cmake/MonoEmbed.cmake deleted file mode 100644 index 0f1f23309..000000000 --- a/indra/cmake/MonoEmbed.cmake +++ /dev/null @@ -1,57 +0,0 @@ -# -*- cmake -*- - -include(Prebuilt) -use_prebuilt_binary(libmono) - -SET(GLIB_2_0 glib-2.0) - -if (WINDOWS) - SET(MONO_LIB mono) -else (WINDOWS) - SET(MONO_LIB mono) - SET(M_LIBRARIES m) - SET(GTHREAD_2_0 gthread-2.0) -endif(WINDOWS) - - -IF (DARWIN) - - FIND_LIBRARY(MONO_LIBRARY NAMES Mono) - # Find_file doesnt work as expected. Hardcode relative to Mono.framework. - #FIND_FILE(GLIB_CONFIG glibconfig.h ${MONO_LIBRARY}) - #FIND_FILE(MONO_GLIB_LIBRARY glib.h ${MONO_LIBRARY}) - SET(MONO_GLIB_LIBRARY ${MONO_LIBRARY}/Headers/glib-2.0/) - SET(GLIB_CONFIG ${MONO_LIBRARY}/Libraries/glib-2.0/include/) - SET(MONO_LIB_DIRECTORY ${MONO_LIBRARY}/Libraries) - - IF (MONO_LIBRARY AND MONO_GLIB_LIBRARY AND GLIB_CONFIG) - MESSAGE(STATUS "Found Mono for embedding") - INCLUDE_DIRECTORIES(${MONO_GLIB_LIBRARY} ${GLIB_CONFIG}) - LINK_DIRECTORIES(${MONO_LIB_DIRECTORY}) - ELSE (MONO_LIBRARY AND MONO_GLIB_LIBRARY AND GLIB_CONFIG) - MESSAGE(FATAL_ERROR "Mono not found for embedding") - MESSAGE(${MONO_LIBRARY}) - MESSAGE(${MONO_GLIB_LIBRARY}) - MESSAGE(${GLIB_CONFIG}) - ENDIF (MONO_LIBRARY AND MONO_GLIB_LIBRARY AND GLIB_CONFIG) - -ELSE (DARWIN) - - SET(MONO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) - SET(GLIB_2_0_PLATFORM_INCLUDE_DIR - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0) - SET(GLIB_2_0_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/glib-2.0) - - INCLUDE_DIRECTORIES( - ${MONO_INCLUDE_DIR} - ${GLIB_2_0_PLATFORM_INCLUDE_DIR} - ${GLIB_2_0_INCLUDE_DIR}) - -ENDIF (DARWIN) - -SET(MONO_LIBRARIES - ${MONO_LIB} - ${M_LIBRARIES} - ${GLIB_2_0} - ${GTHREAD_2_0} -) diff --git a/indra/cmake/MySQL.cmake b/indra/cmake/MySQL.cmake deleted file mode 100644 index e591fbc3d..000000000 --- a/indra/cmake/MySQL.cmake +++ /dev/null @@ -1,26 +0,0 @@ -# -*- cmake -*- -include(Linking) -include(Prebuilt) - -use_prebuilt_binary(mysql) - -if (LINUX) - if (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1") - set(MYSQL_LIBRARIES mysqlclient) - set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) - else (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1") - # Use the native MySQL library on a 64-bit system. - set(MYSQL_FIND_QUIETLY ON) - set(MYSQL_FIND_REQUIRED ON) - include(FindMySQL) - endif (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1") -elseif (WINDOWS) - set(MYSQL_LIBRARIES mysqlclient) - set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) -elseif (DARWIN) - set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) - set(MYSQL_LIBRARIES - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libmysqlclient.a - debug ${ARCH_PREBUILT_DIRS_DEBUG}/libmysqlclient.a - ) -endif (LINUX) diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake index bdf5db130..a4e210405 100644 --- a/indra/cmake/NDOF.cmake +++ b/indra/cmake/NDOF.cmake @@ -15,7 +15,7 @@ else (STANDALONE) set(NDOF_LIBRARY ndofdev) endif (WINDOWS) - set(NDOF_INCLUDE_DIR ${ARCH_PREBUILT_DIRS}/include/ndofdev) + set(NDOF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/ndofdev) set(NDOF_FOUND 1) endif (STANDALONE) diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake index d01c680ed..d5ab802d9 100644 --- a/indra/cmake/OPENAL.cmake +++ b/indra/cmake/OPENAL.cmake @@ -21,6 +21,7 @@ if (OPENAL) openal alut ) + set(OPENAL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) endif (OPENAL) if (OPENAL) diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake index 5ba730c4a..91d949409 100644 --- a/indra/cmake/OpenGL.cmake +++ b/indra/cmake/OpenGL.cmake @@ -6,5 +6,5 @@ if (NOT (STANDALONE OR DARWIN)) # possible glh_linear should have its own .cmake file instead #use_prebuilt_binary(glh_linear) # actually... not any longer, it's now in git -SG - set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) + set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) endif () diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake index f075adaa0..269b54de7 100644 --- a/indra/cmake/PNG.cmake +++ b/indra/cmake/PNG.cmake @@ -10,8 +10,10 @@ else (STANDALONE) use_prebuilt_binary(libpng) if (WINDOWS) set(PNG_LIBRARIES libpng15) - else (WINDOWS) - set(PNG_LIBRARIES png12) - endif (WINDOWS) - set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + elseif(DARWIN) + set(PNG_LIBRARIES png15) + else(LINUX) + set(PNG_LIBRARIES png15) + endif() + set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libpng15) endif (STANDALONE) diff --git a/indra/cmake/PulseAudio.cmake b/indra/cmake/PulseAudio.cmake old mode 100755 new mode 100644 index e918de019..dafdd4163 --- a/indra/cmake/PulseAudio.cmake +++ b/indra/cmake/PulseAudio.cmake @@ -13,7 +13,7 @@ if (PULSEAUDIO) use_prebuilt_binary(pulseaudio) set(PULSEAUDIO_FOUND ON FORCE BOOL) set(PULSEAUDIO_INCLUDE_DIRS - ${LIBS_PREBUILT_DIR}/include + ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include ) # We don't need to explicitly link against pulseaudio itself, because # the viewer probes for the system's copy at runtime. diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index 6cf3a43d2..679b5bf3a 100644 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -31,11 +31,9 @@ if (STANDALONE) add_definitions(${${pkg}_CFLAGS_OTHERS}) endforeach(pkg) else (STANDALONE) - if (NOT DARWIN) + if (LINUX) use_prebuilt_binary(glib) # gtk-etc needs glib use_prebuilt_binary(gtk-atk-pango-glib) - endif (NOT DARWIN) - if (LINUX) set(UI_LIBRARIES atk-1.0 X11 @@ -60,7 +58,6 @@ else (STANDALONE) ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/cairo ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/pixman-1 - ${LIBS_PREBUILT_DIR}/include ) foreach(include ${${LL_ARCH}_INCLUDES}) include_directories(${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/${include}) diff --git a/indra/cmake/XmlRpcEpi.cmake b/indra/cmake/XmlRpcEpi.cmake index 56eb7e250..cbfe1e16f 100644 --- a/indra/cmake/XmlRpcEpi.cmake +++ b/indra/cmake/XmlRpcEpi.cmake @@ -9,5 +9,5 @@ if (STANDALONE) else (STANDALONE) use_prebuilt_binary(xmlrpc-epi) set(XMLRPCEPI_LIBRARIES xmlrpc-epi) - set(XMLRPCEPI_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + set(XMLRPCEPI_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) endif (STANDALONE) diff --git a/indra/cmake/ZLIB.cmake b/indra/cmake/ZLIB.cmake index 48e5130ad..c133248be 100644 --- a/indra/cmake/ZLIB.cmake +++ b/indra/cmake/ZLIB.cmake @@ -17,6 +17,6 @@ else (STANDALONE) set(ZLIB_LIBRARIES z) endif (WINDOWS) if (WINDOWS OR LINUX) - set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib) + set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/zlib) endif (WINDOWS OR LINUX) endif (STANDALONE) diff --git a/indra/develop.py b/indra/develop.py index d44db29c7..5e94ca125 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -70,7 +70,7 @@ def quote(opts): class PlatformSetup(object): generator = None build_types = {} - for t in ('Debug', 'Release', 'ReleaseSSE2', 'RelWithDebInfo'): + for t in ('Debug', 'Release', 'RelWithDebInfo'): build_types[t.lower()] = t build_type = build_types['relwithdebinfo'] @@ -764,7 +764,7 @@ Options: --unattended build unattended, do not invoke any tools requiring a human response --universal build a universal binary on Mac OS X (unsupported) - -t | --type=NAME build type ("Debug", "Release", "ReleaseSSE2", or "RelWithDebInfo") + -t | --type=NAME build type ("Debug", "Release", or "RelWithDebInfo") -m32 | -m64 build architecture (32-bit or 64-bit) -N | --no-distcc disable use of distcc -G | --generator=NAME generator name diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py index 3e5e39efa..11945a239 100644 --- a/indra/lib/python/indra/util/llmanifest.py +++ b/indra/lib/python/indra/util/llmanifest.py @@ -120,7 +120,7 @@ ARGUMENTS=[ On Linux this would try to use Linux_i686Manifest.""", default=""), dict(name='build', description='Build directory.', default=DEFAULT_SRCTREE), - dict(name='buildtype', description="""The build type used. ('Debug', 'Release', 'ReleaseSSE2' or 'RelWithDebInfo') + dict(name='buildtype', description="""The build type used. ('Debug', 'Release', or 'RelWithDebInfo') Default is Release """, default="Release"), dict(name='branding_id', description="""Identifier for the branding set to diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index 13cb932b6..61c383c0d 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -35,7 +35,7 @@ include_directories( ${VORBISENC_INCLUDE_DIRS} ${VORBISFILE_INCLUDE_DIRS} ${VORBIS_INCLUDE_DIRS} - ${OPENAL_LIB_INCLUDE_DIRS} + ${OPENAL_INCLUDE_DIRS} ${FREEAULT_LIB_INCLUDE_DIRS} ) diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp index ee91d7496..2b2bd19d5 100644 --- a/indra/llaudio/llaudioengine_fmodex.cpp +++ b/indra/llaudio/llaudioengine_fmodex.cpp @@ -365,6 +365,7 @@ bool LLAudioEngine_FMODEX::initWind() FMOD_DSP_DESCRIPTION dspdesc; memset(&dspdesc, 0, sizeof(FMOD_DSP_DESCRIPTION)); //Set everything to zero strncpy(dspdesc.name,"Wind Unit", sizeof(dspdesc.name)); //Set name to "Wind Unit" + dspdesc.channels=2; dspdesc.read = &windCallback; //Assign callback. if(Check_FMOD_Error(mSystem->createDSP(&dspdesc, &mWindDSP), "FMOD::createDSP")) return false; diff --git a/indra/llcommon/llhash.h b/indra/llcommon/llhash.h index 5451c11c1..c0a8bff66 100644 --- a/indra/llcommon/llhash.h +++ b/indra/llcommon/llhash.h @@ -39,17 +39,13 @@ #include #include #elif LL_DARWIN || LL_LINUX -#if CC_GCC -# if GCC_VERSION >= 40300 // gcc 4.3 and up -# include -# elif GCC_VERSION >= 30400 // gcc 3.4 and up -# include -# elif __GNUC__ >= 3 -# include -# else -# include -# endif -#elif CC_CLANG +#if GCC_VERSION >= 40300 || LL_ICC// gcc 4.3 or icc 11 and up +# include +#elif GCC_VERSION >= 30400 // gcc 3.4 and up +# include +#elif __GNUC__ >= 3 +# include +#else # include #endif #elif LL_SOLARIS diff --git a/indra/llcommon/llheartbeat.cpp b/indra/llcommon/llheartbeat.cpp index 49c0ad508..83cf3e50c 100644 --- a/indra/llcommon/llheartbeat.cpp +++ b/indra/llcommon/llheartbeat.cpp @@ -75,7 +75,7 @@ LLHeartbeat::rawSend() int result; #ifndef LL_DARWIN - union sigval dummy; + static union sigval dummy; result = sigqueue(getppid(), LL_HEARTBEAT_SIGNAL, dummy); #else result = kill(getppid(), LL_HEARTBEAT_SIGNAL); diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index a956718e6..009871908 100644 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -78,7 +78,18 @@ // Figure out differences between compilers -#if defined(__GNUC__) +#if defined(__clang__) && defined(__GNUC__) + #define CLANG_VERSION (__clang_major__ * 10000 \ + + __clang_minor__ * 100 \ + + __clang_patchlevel__) + #ifndef LL_CLANG + #define LL_CLANG 1 + #endif +#elif defined (__ICC) && defined(__GNUC__) + #ifndef LL_ICC + #define LL_ICC 1 + #endif +#elif defined(__GNUC__) #define GCC_VERSION (__GNUC__ * 10000 \ + __GNUC_MINOR__ * 100 \ + __GNUC_PATCHLEVEL__) diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp index f255e5a8b..dee0d50e1 100644 --- a/indra/llcommon/llprocessor.cpp +++ b/indra/llcommon/llprocessor.cpp @@ -55,10 +55,10 @@ # define LL_X86 1 #elif LL_MSVC && _M_IX86 # define LL_X86 1 -#elif LL_GNUC && ( defined(__amd64__) || defined(__x86_64__) ) +#elif LL_GNUC || LL_ICC || LL_CLANG && ( defined(__amd64__) || defined(__x86_64__) ) # define LL_X86_64 1 # define LL_X86 1 -#elif LL_GNUC && ( defined(__i386__) ) +#elif LL_GNUC || LL_ICC || LL_CLANG && ( defined(__i386__) ) # define LL_X86 1 #elif LL_GNUC && ( defined(__powerpc__) || defined(__ppc__) ) # define LL_PPC 1 diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index d1c02237f..43fe7596e 100644 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -310,11 +310,13 @@ void LLThread::wakeLocked() } } -#ifdef SHOW_ASSERT -// This allows the use of llassert(is_main_thread()) to assure the current thread is the main thread. -static apr_os_thread_t main_thread_id; -LL_COMMON_API bool is_main_thread(void) { return apr_os_thread_equal(main_thread_id, apr_os_thread_current()); } -#endif +//static +apr_os_thread_t LLThread::sMainThreadID; + +void LLThread::set_main_thread_id(void) +{ + sMainThreadID = apr_os_thread_current(); +} // The thread private handle to access the LLThreadLocalData instance. apr_threadkey_t* LLThreadLocalData::sThreadLocalDataKey; @@ -346,10 +348,8 @@ void LLThreadLocalData::init(void) // Create the thread-local data for the main thread (this function is called by the main thread). LLThreadLocalData::create(NULL); -#ifdef SHOW_ASSERT // This function is called by the main thread. - main_thread_id = apr_os_thread_current(); -#endif + LLThread::set_main_thread_id(); } // This is called once for every thread when the thread is destructed. diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h index b6287bb29..cea8c32c2 100644 --- a/indra/llcommon/llthread.h +++ b/indra/llcommon/llthread.h @@ -40,13 +40,6 @@ #include "llaprpool.h" #include "llatomic.h" -#ifdef SHOW_ASSERT -extern LL_COMMON_API bool is_main_thread(void); -#define ASSERT_SINGLE_THREAD do { static apr_os_thread_t first_thread_id = apr_os_thread_current(); llassert(apr_os_thread_equal(first_thread_id, apr_os_thread_current())); } while(0) -#else -#define ASSERT_SINGLE_THREAD do { } while(0) -#endif - class LLThread; class LLMutex; class LLCondition; @@ -89,6 +82,7 @@ private: class LL_COMMON_API LLThread { private: + static apr_os_thread_t sMainThreadID; static U32 sIDIter; static LLAtomicS32 sCount; static LLAtomicS32 sRunning; @@ -112,6 +106,7 @@ public: static S32 getCount() { return sCount; } static S32 getRunning() { return sRunning; } static void yield(); // Static because it can be called by the main thread, which doesn't have an LLThread data structure. + static bool is_main_thread(void) { return apr_os_thread_equal(LLThread::sMainThreadID, apr_os_thread_current()); } public: // PAUSE / RESUME functionality. See source code for important usage notes. @@ -135,6 +130,9 @@ public: // Return thread-local data for the current thread. static LLThreadLocalData& tldata(void) { return LLThreadLocalData::tldata(); } + // Called once, from LLThreadLocalData::init(). + static void set_main_thread_id(void); + U32 getID() const { return mID; } private: @@ -178,6 +176,13 @@ protected: // mRunCondition->unlock(); }; +#ifdef SHOW_ASSERT +LL_COMMON_API inline bool is_main_thread(void) { return LLThread::is_main_thread(); } +#define ASSERT_SINGLE_THREAD do { static apr_os_thread_t first_thread_id = apr_os_thread_current(); llassert(apr_os_thread_equal(first_thread_id, apr_os_thread_current())); } while(0) +#else +#define ASSERT_SINGLE_THREAD do { } while(0) +#endif + //============================================================================ #define MUTEX_DEBUG (LL_DEBUG || LL_RELEASE_WITH_DEBUG_INFO) diff --git a/indra/llcommon/llversionviewer.h.in b/indra/llcommon/llversionviewer.h.in index fe3f1012a..81b44887b 100644 --- a/indra/llcommon/llversionviewer.h.in +++ b/indra/llcommon/llversionviewer.h.in @@ -34,7 +34,7 @@ #define LL_LLVERSIONVIEWER_H const S32 LL_VERSION_MAJOR = 1; -const S32 LL_VERSION_MINOR = 6; +const S32 LL_VERSION_MINOR = 7; const S32 LL_VERSION_PATCH = 0; const S32 LL_VERSION_BUILD = ${vBUILD}; diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index a8be44313..c42697ad9 100644 --- a/indra/llcrashlogger/llcrashlogger.cpp +++ b/indra/llcrashlogger/llcrashlogger.cpp @@ -371,6 +371,9 @@ void LLCrashLogger::updateApplication(const std::string& message) bool LLCrashLogger::init() { + // Initialize curl + AICurlInterface::initCurl(); + // We assume that all the logs we're looking for reside on the current drive gDirUtilp->initAppDirs("SecondLife"); diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt index 5891b154c..97989030a 100644 --- a/indra/llimage/CMakeLists.txt +++ b/indra/llimage/CMakeLists.txt @@ -8,12 +8,15 @@ include(LLCommon) include(LLImage) include(LLMath) include(LLVFS) +include(JPEG) +include(PNG) include(ZLIB) include_directories( ${LLCOMMON_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} ${LLVFS_INCLUDE_DIRS} + ${JPEG_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ) diff --git a/indra/llimage/llpngwrapper.h b/indra/llimage/llpngwrapper.h index eb47fdbdd..a4c3d80b5 100644 --- a/indra/llimage/llpngwrapper.h +++ b/indra/llimage/llpngwrapper.h @@ -32,11 +32,7 @@ #ifndef LL_LLPNGWRAPPER_H #define LL_LLPNGWRAPPER_H -#if LL_WINDOWS -#include "libpng15/png.h" -#else -#include "libpng12/png.h" -#endif +#include "png.h" #include "llimage.h" class LLPngWrapper diff --git a/indra/llmessage/aicurl.cpp b/indra/llmessage/aicurl.cpp index ff3dba5f2..f58459119 100644 --- a/indra/llmessage/aicurl.cpp +++ b/indra/llmessage/aicurl.cpp @@ -80,6 +80,7 @@ enum gSSLlib_type { // No locking needed: initialized before threads are created, and subsequently only read. gSSLlib_type gSSLlib; bool gSetoptParamsNeedDup; +void (*statemachines_flush_hook)(void); } // namespace @@ -122,6 +123,13 @@ void ssl_locking_function(int mode, int n, char const* file, int line) } } +#if LL_WINDOWS +static unsigned long __cdecl apr_os_thread_current_wrapper() +{ + return (unsigned long)apr_os_thread_current(); +} +#endif + #if HAVE_CRYPTO_THREADID // OpenSSL uniq id function. void ssl_id_function(CRYPTO_THREADID* thread_id) @@ -185,14 +193,18 @@ ssl_dyn_create_function_type old_ssl_dyn_create_function; ssl_dyn_destroy_function_type old_ssl_dyn_destroy_function; ssl_dyn_lock_function_type old_ssl_dyn_lock_function; +// Set for openssl-1.0.1...1.0.1c. +static bool need_renegotiation_hack = false; + // Initialize OpenSSL library for thread-safety. void ssl_init(void) { // The version identifier format is: MMNNFFPPS: major minor fix patch status. int const compiled_openSLL_major = (OPENSSL_VERSION_NUMBER >> 28) & 0xff; int const compiled_openSLL_minor = (OPENSSL_VERSION_NUMBER >> 20) & 0xff; - int const linked_openSLL_major = (SSLeay() >> 28) & 0xff; - int const linked_openSLL_minor = (SSLeay() >> 20) & 0xff; + unsigned long const ssleay = SSLeay(); + int const linked_openSLL_major = (ssleay >> 28) & 0xff; + int const linked_openSLL_minor = (ssleay >> 20) & 0xff; // Check if dynamically loaded version is compatible with the one we compiled against. // As off version 1.0.0 also minor versions are compatible. if (linked_openSLL_major != compiled_openSLL_major || @@ -215,8 +227,12 @@ void ssl_init(void) // Setting this avoids the need for a thread-local error number facility, which is hard to check. #if HAVE_CRYPTO_THREADID CRYPTO_THREADID_set_callback(&ssl_id_function); +#else +#if LL_WINDOWS + CRYPTO_set_id_callback(&apr_os_thread_current_wrapper); #else CRYPTO_set_id_callback(&apr_os_thread_current); +#endif #endif // Dynamic locks callbacks. old_ssl_dyn_create_function = CRYPTO_get_dynlock_create_callback(); @@ -225,6 +241,13 @@ void ssl_init(void) CRYPTO_set_dynlock_create_callback(&ssl_dyn_create_function); CRYPTO_set_dynlock_lock_callback(&ssl_dyn_lock_function); CRYPTO_set_dynlock_destroy_callback(&ssl_dyn_destroy_function); + need_renegotiation_hack = (0x10001000UL <= ssleay && ssleay < 0x10001040); + if (need_renegotiation_hack) + { + llwarns << "This version of libopenssl has a bug that we work around by forcing the TLSv1 protocol. " + "That works on Second Life, but might cause you to fail to login on some OpenSim grids. " + "Upgrade to openssl 1.0.1d or higher to avoid this warning." << llendl; + } llinfos << "Successful initialization of " << SSLeay_version(SSLEAY_VERSION) << " (0x" << std::hex << SSLeay() << ")." << llendl; } @@ -264,9 +287,9 @@ static unsigned int encoded_version(int major, int minor, int patch) namespace AICurlInterface { // MAIN-THREAD -void initCurl(F32 curl_request_timeout, S32 max_number_handles) +void initCurl(void (*flush_hook)()) { - DoutEntering(dc::curl, "AICurlInterface::initCurl(" << curl_request_timeout << ", " << max_number_handles << ")"); + DoutEntering(dc::curl, "AICurlInterface::initCurl(" << (void*)flush_hook << ")"); llassert(LLThread::getRunning() == 0); // We must not call curl_global_init unless we are the only thread. CURLcode res = curl_global_init(CURL_GLOBAL_ALL); @@ -285,7 +308,7 @@ void initCurl(F32 curl_request_timeout, S32 max_number_handles) llwarns << "libcurl's age is 0; no ares support." << llendl; } llassert_always((version_info->features & CURL_VERSION_SSL)); // SSL support, added in libcurl 7.10. - if (!(version_info->features & CURL_VERSION_ASYNCHDNS)); // Asynchronous name lookups (added in libcurl 7.10.7). + if (!(version_info->features & CURL_VERSION_ASYNCHDNS)) // Asynchronous name lookups (added in libcurl 7.10.7). { llwarns << "libcurl was not compiled with support for asynchronous name lookups!" << llendl; } @@ -340,17 +363,24 @@ void initCurl(F32 curl_request_timeout, S32 max_number_handles) } llassert_always(!gSetoptParamsNeedDup); // Might add support later. } + + // Called in cleanupCurl. + statemachines_flush_hook = flush_hook; } // MAIN-THREAD void cleanupCurl(void) { - using AICurlPrivate::stopCurlThread; - using AICurlPrivate::curlThreadIsRunning; + using namespace AICurlPrivate; DoutEntering(dc::curl, "AICurlInterface::cleanupCurl()"); stopCurlThread(); + if (CurlMultiHandle::getTotalMultiHandles() != 0) + llwarns << "Not all CurlMultiHandle objects were destroyed!" << llendl; + if (statemachines_flush_hook) + (*statemachines_flush_hook)(); + Stats::print(); ssl_cleanup(); llassert(LLThread::getRunning() <= (curlThreadIsRunning() ? 1 : 0)); // We must not call curl_global_cleanup unless we are the only thread left. @@ -546,7 +576,10 @@ void CurlEasyHandle::handle_easy_error(CURLcode code) } // Throws AICurlNoEasyHandle. -CurlEasyHandle::CurlEasyHandle(void) : mActiveMultiHandle(NULL), mErrorBuffer(NULL) +CurlEasyHandle::CurlEasyHandle(void) : mActiveMultiHandle(NULL), mErrorBuffer(NULL), mQueuedForRemoval(false) +#ifdef SHOW_ASSERT + , mRemovedPerCommand(true) +#endif { mEasyHandle = curl_easy_init(); #if 0 @@ -566,6 +599,22 @@ CurlEasyHandle::CurlEasyHandle(void) : mActiveMultiHandle(NULL), mErrorBuffer(NU } } +#if 0 // Not used +CurlEasyHandle::CurlEasyHandle(CurlEasyHandle const& orig) : mActiveMultiHandle(NULL), mErrorBuffer(NULL) +#ifdef SHOW_ASSERT + , mRemovedPerCommand(true) +#endif +{ + mEasyHandle = curl_easy_duphandle(orig.mEasyHandle); + Stats::easy_init_calls++; + if (!mEasyHandle) + { + Stats::easy_init_errors++; + throw AICurlNoEasyHandle("curl_easy_duphandle() returned NULL"); + } +} +#endif + CurlEasyHandle::~CurlEasyHandle() { llassert(!mActiveMultiHandle); @@ -788,7 +837,7 @@ void CurlEasyRequest::revokeCallbacks(void) mWriteCallback = &noWriteCallback; mReadCallback = &noReadCallback; mSSLCtxCallback = &noSSLCtxCallback; - if (active() && !LLApp::isExiting()) + if (active() && !no_warning()) { llwarns << "Revoking callbacks on a still active CurlEasyRequest object!" << llendl; } @@ -869,7 +918,49 @@ static int curl_debug_callback(CURL*, curl_infotype infotype, char* buf, size_t LibcwDoutStream.write(buf, size); else if (infotype == CURLINFO_HEADER_IN || infotype == CURLINFO_HEADER_OUT) LibcwDoutStream << libcwd::buf2str(buf, size); - else if (infotype == CURLINFO_DATA_IN || infotype == CURLINFO_DATA_OUT) + else if (infotype == CURLINFO_DATA_IN) + { + LibcwDoutStream << size << " bytes"; + bool finished = false; + int i = 0; + while (i < size) + { + char c = buf[i]; + if (!('0' <= c && c <= '9') && !('a' <= c && c <= 'f')) + { + if (0 < i && i + 1 < size && buf[i] == '\r' && buf[i + 1] == '\n') + { + // Binary output: "[0-9a-f]*\r\n ...binary data..." + LibcwDoutStream << ": \"" << libcwd::buf2str(buf, i + 2) << "\"..."; + finished = true; + } + break; + } + ++i; + } + if (!finished && size > 9 && buf[0] == '<') + { + // Human readable output: html, xml or llsd. + if (!strncmp(buf, "", 6)) + { + LibcwDoutStream << ": \"" << libcwd::buf2str(buf, size) << '"'; + finished = true; + } + } + if (!finished) + { + // Unknown format. Only print the first and last 20 characters. + if (size > 40UL) + { + LibcwDoutStream << ": \"" << libcwd::buf2str(buf, 20) << "\"...\"" << libcwd::buf2str(&buf[size - 20], 20) << '"'; + } + else + { + LibcwDoutStream << ": \"" << libcwd::buf2str(buf, size) << '"'; + } + } + } + else if (infotype == CURLINFO_DATA_OUT) LibcwDoutStream << size << " bytes: \"" << libcwd::buf2str(buf, size) << '"'; else LibcwDoutStream << size << " bytes"; @@ -916,15 +1007,19 @@ void CurlEasyRequest::applyDefaultOptions(void) { CertificateAuthority_rat CertificateAuthority_r(gCertificateAuthority); setoptString(CURLOPT_CAINFO, CertificateAuthority_r->file); - // This option forces openssl to use TLS version 1. - // The Linden Lab servers don't support later TLS versions, and libopenssl-1.0.1c has - // a bug where renegotiation fails (see http://rt.openssl.org/Ticket/Display.html?id=2828), - // causing the connection to fail completely without this hack. - // For a commandline test of the same, observe the difference between: - // openssl s_client -connect login.agni.lindenlab.com:443 -CAfile packaged/app_settings/CA.pem -debug - // and - // openssl s_client -tls1 -connect login.agni.lindenlab.com:443 -CAfile packaged/app_settings/CA.pem -debug - setopt(CURLOPT_SSLVERSION, (long)CURL_SSLVERSION_TLSv1); + if (need_renegotiation_hack) + { + // This option forces openssl to use TLS version 1. + // The Linden Lab servers don't support later TLS versions, and libopenssl-1.0.1-beta1 up till and including + // libopenssl-1.0.1c have a bug where renegotiation fails (see http://rt.openssl.org/Ticket/Display.html?id=2828), + // causing the connection to fail completely without this hack. + // For a commandline test of the same, observe the difference between: + // openssl s_client -connect login.agni.lindenlab.com:443 -CAfile packaged/app_settings/CA.pem -debug + // which gets no response from the server after sending the initial data, and + // openssl s_client -tls1 -connect login.agni.lindenlab.com:443 -CAfile packaged/app_settings/CA.pem -debug + // which finishes the negotiation and ends with 'Verify return code: 0 (ok)' + setopt(CURLOPT_SSLVERSION, (long)CURL_SSLVERSION_TLSv1); + } setopt(CURLOPT_NOSIGNAL, 1); // The old code did this for the 'buffered' version, but I think it's nonsense. //setopt(CURLOPT_DNS_CACHE_TIMEOUT, 0); @@ -1021,6 +1116,8 @@ CurlResponderBuffer::CurlResponderBuffer() curl_easy_request_w->send_events_to(this); } +#define llmaybeerrs lllog(LLApp::isExiting() ? LLError::LEVEL_WARN : LLError::LEVEL_ERROR, NULL, NULL, false) + // The callbacks need to be revoked when the CurlResponderBuffer is destructed (because that is what the callbacks use). // The AIThreadSafeSimple is destructed first (right to left), so when we get here then the // ThreadSafeCurlEasyRequest base class of ThreadSafeBufferedCurlEasyRequest is still intact and we can create @@ -1033,24 +1130,34 @@ CurlResponderBuffer::~CurlResponderBuffer() curl_easy_request_w->revokeCallbacks(); if (mResponder) { - llwarns << "Calling ~CurlResponderBuffer() with active responder!" << llendl; - llassert(false); // Does this ever happen? And if so, what does it mean? - // FIXME: Does this really mean it timed out? - mResponder->completedRaw(HTTP_REQUEST_TIME_OUT, "Request timeout, aborted.", sChannels, mOutput); - mResponder = NULL; + // If the responder is still alive, then that means that CurlResponderBuffer::processOutput was + // never called, which means that the removed_from_multi_handle event never happened. + // This is definitely an internal error as it can only happen when libcurl is too slow, + // in which case AICurlEasyRequestStateMachine::mTimer times out, but that already + // calls CurlResponderBuffer::timed_out(). + llmaybeerrs << "Calling ~CurlResponderBuffer() with active responder!" << llendl; + if (LLApp::isExiting()) + { + // It might happen if some CurlResponderBuffer escaped clean up somehow :/ + mResponder = NULL; + } + else + { + // User chose to continue. + timed_out(); + } } } +void CurlResponderBuffer::timed_out(void) +{ + mResponder->completedRaw(HTTP_INTERNAL_ERROR, "Request timeout, aborted.", sChannels, mOutput); + mResponder = NULL; +} + void CurlResponderBuffer::resetState(AICurlEasyRequest_wat& curl_easy_request_w) { - if (mResponder) - { - llwarns << "Calling CurlResponderBuffer::resetState() for active easy handle!" << llendl; - llassert(false); // Does this ever happen? And if so, what does it mean? - // FIXME: Does this really mean it timed out? - mResponder->completedRaw(HTTP_REQUEST_TIME_OUT, "Request timeout, aborted.", sChannels, mOutput); - mResponder = NULL; - } + llassert(!mResponder); curl_easy_request_w->resetState(); @@ -1243,10 +1350,12 @@ CurlMultiHandle::~CurlMultiHandle() { curl_multi_cleanup(mMultiHandle); Stats::multi_calls++; +#ifdef CWDEBUG int total = --sTotalMultiHandles; Dout(dc::curl, "Called CurlMultiHandle::~CurlMultiHandle() [" << (void*)this << "], " << total << " remaining."); - if (total == 0) - Stats::print(); +#else + --sTotalMultiHandles; +#endif } } // namespace AICurlPrivate diff --git a/indra/llmessage/aicurl.h b/indra/llmessage/aicurl.h index a0ab05408..90803e050 100644 --- a/indra/llmessage/aicurl.h +++ b/indra/llmessage/aicurl.h @@ -90,7 +90,7 @@ struct TransferInfo { // Called once at start of application (from newview/llappviewer.cpp by main thread (before threads are created)), // with main purpose to initialize curl. -void initCurl(F32 curl_request_timeout = 120.f, S32 max_number_handles = 256); +void initCurl(void (*)(void) = NULL); // Called once at start of application (from LLAppViewer::initThreads), starts AICurlThread. void startCurlThread(void); @@ -237,6 +237,8 @@ struct AICurlEasyHandleEvents { virtual void added_to_multi_handle(AICurlEasyRequest_wat& curl_easy_request_w) = 0; virtual void finished(AICurlEasyRequest_wat& curl_easy_request_w) = 0; virtual void removed_from_multi_handle(AICurlEasyRequest_wat& curl_easy_request_w) = 0; + // Avoid compiler warning. + virtual ~AICurlEasyHandleEvents() { } }; #include "aicurlprivate.h" @@ -274,6 +276,9 @@ class AICurlEasyRequest { // Queue a command to remove this request from the multi session (or cancel a queued command to add it). void removeRequest(void); + // Returns true when this AICurlEasyRequest wraps a AICurlPrivate::ThreadSafeBufferedCurlEasyRequest. + bool isBuffered(void) const { return mCurlEasyRequest->isBuffered(); } + private: // The actual pointer to the ThreadSafeCurlEasyRequest instance. AICurlPrivate::CurlEasyRequestPtr mCurlEasyRequest; diff --git a/indra/llmessage/aicurlprivate.h b/indra/llmessage/aicurlprivate.h index 82d4e9c44..38ce00b5c 100644 --- a/indra/llmessage/aicurlprivate.h +++ b/indra/llmessage/aicurlprivate.h @@ -79,7 +79,7 @@ class CurlEasyHandle : public boost::noncopyable, protected AICurlEasyHandleEven CURLcode setopt(CURLoption option, BUILTIN parameter); // Clone a libcurl session handle using all the options previously set. - CurlEasyHandle(CurlEasyHandle const& orig) : mEasyHandle(curl_easy_duphandle(orig.mEasyHandle)), mActiveMultiHandle(NULL), mErrorBuffer(NULL) { } + //CurlEasyHandle(CurlEasyHandle const& orig); // URL encode/decode the given string. char* escape(char* url, int length); @@ -98,10 +98,21 @@ class CurlEasyHandle : public boost::noncopyable, protected AICurlEasyHandleEven // Pause and unpause a connection. CURLcode pause(int bitmask); + // Called when a request is queued for removal. In that case a race between the actual removal + // and revoking of the callbacks is harmless (and happens for the raw non-statemachine version). + void remove_queued(void) { mQueuedForRemoval = true; } + // In case it's added after being removed. + void add_queued(void) { mQueuedForRemoval = false; } + private: CURL* mEasyHandle; CURLM* mActiveMultiHandle; char* mErrorBuffer; + bool mQueuedForRemoval; // Set if the easy handle is (probably) added to the multi handle, but is queued for removal. +#ifdef SHOW_ASSERT + public: + bool mRemovedPerCommand; // Set if mActiveMultiHandle was reset as per command from the main thread. +#endif private: // This should only be called from MultiHandle; add/remove an easy handle to/from a multi handle. @@ -117,6 +128,11 @@ class CurlEasyHandle : public boost::noncopyable, protected AICurlEasyHandleEven // Only valid when setErrorBuffer was called and the curl_easy function returned an error. std::string getErrorString(void) const { return mErrorBuffer ? mErrorBuffer : "(null)"; } + // Returns true when it is expected that the parent will revoke callbacks before the curl + // easy handle is removed from the multi handle; that usually happens when an external + // error demands termination of the request (ie, an expiration). + bool no_warning(void) const { return mQueuedForRemoval || LLApp::isExiting(); } + // Used for debugging purposes. bool operator==(CURL* easy_handle) const { return mEasyHandle == easy_handle; } @@ -279,6 +295,9 @@ class CurlResponderBuffer : protected AICurlEasyHandleEvents { std::stringstream& getHeaderOutput() { return mHeaderOutput; } LLIOPipe::buffer_ptr_t& getOutput() { return mOutput; } + // Called if libcurl doesn't deliver within CurlRequestTimeOut seconds. + void timed_out(void); + // Called after removed_from_multi_handle was called. void processOutput(AICurlEasyRequest_wat& curl_easy_request_w); @@ -311,6 +330,10 @@ class CurlResponderBuffer : protected AICurlEasyHandleEvents { public: // Return pointer to the ThreadSafe (wrapped) version of this object. ThreadSafeBufferedCurlEasyRequest* get_lockobj(void); + + // Return true when prepRequest was already called and the object has not been + // invalidated as a result of calling timed_out(). + bool isValid(void) const { return mResponder; } }; // This class wraps CurlEasyRequest for thread-safety and adds a reference counter so we can @@ -326,6 +349,9 @@ class ThreadSafeCurlEasyRequest : public AIThreadSafeSimple { virtual ~ThreadSafeCurlEasyRequest() { Dout(dc::curl, "Destructing ThreadSafeCurlEasyRequest with this = " << (void*)this); } + // Returns true if this is a base class of ThreadSafeBufferedCurlEasyRequest. + virtual bool isBuffered(void) const { return false; } + private: LLAtomicU32 mReferenceCount; @@ -344,6 +370,8 @@ class ThreadSafeBufferedCurlEasyRequest : public ThreadSafeCurlEasyRequest, publ public: // Throws AICurlNoEasyHandle. ThreadSafeBufferedCurlEasyRequest(void) { new (AIThreadSafeSimple::ptr()) CurlResponderBuffer; } + + /*virtual*/ bool isBuffered(void) const { return true; } }; // The curl easy request type wrapped in a reference counting pointer. diff --git a/indra/llmessage/aicurlthread.cpp b/indra/llmessage/aicurlthread.cpp index f91d49cdb..2bb33e1a5 100644 --- a/indra/llmessage/aicurlthread.cpp +++ b/indra/llmessage/aicurlthread.cpp @@ -32,11 +32,119 @@ #include "aicurlthread.h" #include "lltimer.h" // ms_sleep #include +#if !LL_WINDOWS #include #include #include +#endif #include +#define DEBUG_WINDOWS_CODE_ON_LINUX 0 + +#if DEBUG_WINDOWS_CODE_ON_LINUX + +struct windows_fd_set { + unsigned int fd_count; + curl_socket_t fd_array[64]; +}; + +unsigned int const not_found = (unsigned int)-1; + +static inline unsigned int find_fd(curl_socket_t s, windows_fd_set const* fsp) +{ + for (unsigned int i = 0; i < fsp->fd_count; ++i) + { + if (fsp->fd_array[i] == s) + return i; + } + return not_found; +} + +static int windows_select(int, windows_fd_set* readfds, windows_fd_set* writefds, windows_fd_set*, timeval* val) +{ + fd_set r; + fd_set w; + FD_ZERO(&r); + FD_ZERO(&w); + int mfd = -1; + if (readfds) + { + for (int i = 0; i < readfds->fd_count; ++i) + { + int fd = readfds->fd_array[i]; + FD_SET(fd, &r); + mfd = llmax(mfd, fd); + } + } + if (writefds) + { + for (int i = 0; i < writefds->fd_count; ++i) + { + int fd = writefds->fd_array[i]; + FD_SET(fd, &w); + mfd = llmax(mfd, fd); + } + } + int nfds = select(mfd + 1, readfds ? &r : NULL, writefds ? &w : NULL, NULL, val); + if (readfds) + { + unsigned int fd_count = 0; + for (int i = 0; i < readfds->fd_count; ++i) + { + if (FD_ISSET(readfds->fd_array[i], &r)) + readfds->fd_array[fd_count++] = readfds->fd_array[i]; + } + readfds->fd_count = fd_count; + } + if (writefds) + { + unsigned int fd_count = 0; + for (int i = 0; i < writefds->fd_count; ++i) + { + if (FD_ISSET(writefds->fd_array[i], &w)) + writefds->fd_array[fd_count++] = writefds->fd_array[i]; + } + writefds->fd_count = fd_count; + } + return nfds; +} + +#undef FD_SETSIZE +#undef FD_ZERO +#undef FD_ISSET +#undef FD_SET +#undef FD_CLR + +int const FD_SETSIZE = sizeof(windows_fd_set::fd_array) / sizeof(curl_socket_t); + +static void FD_ZERO(windows_fd_set* fsp) +{ + fsp->fd_count = 0; +} + +static bool FD_ISSET(curl_socket_t s, windows_fd_set const* fsp) +{ + return find_fd(s, fsp) != not_found; +} + +static void FD_SET(curl_socket_t s, windows_fd_set* fsp) +{ + llassert(!FD_ISSET(s, fsp)); + fsp->fd_array[fsp->fd_count++] = s; +} + +static void FD_CLR(curl_socket_t s, windows_fd_set* fsp) +{ + unsigned int i = find_fd(s, fsp); + llassert(i != not_found); + fsp->fd_array[i] = fsp->fd_array[--(fsp->fd_count)]; +} + +#define fd_set windows_fd_set +#define select windows_select + +#endif // DEBUG_WINDOWS_CODE_ON_LINUX + #undef AICurlPrivate namespace AICurlPrivate { @@ -115,6 +223,68 @@ namespace curlthread { //----------------------------------------------------------------------------- // PollSet +int const empty = 0x1; +int const complete = 0x2; + +enum refresh_t { + not_complete_not_empty = 0, + complete_not_empty = complete, + empty_and_complete = complete|empty +}; + +class PollSet +{ + public: + PollSet(void); + + // Add/remove a filedescriptor to/from mFileDescriptors. + void add(curl_socket_t s); + void remove(curl_socket_t s); + + // Copy mFileDescriptors to an internal fd_set that is returned by access(). + // Returns if all fds could be copied (complete) and/or if the resulting fd_set is empty. + refresh_t refresh(void); + + // Return a pointer to the underlaying fd_set. + fd_set* access(void) { return &mFdSet; } + +#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX) + // Return the largest fd set in mFdSet by refresh. + curl_socket_t get_max_fd(void) const { return mMaxFdSet; } +#endif + + // Return true if a filedescriptor is set in mFileDescriptors (used for debugging). + bool contains(curl_socket_t s) const; + + // Return true if a filedescriptor is set in mFdSet. + bool is_set(curl_socket_t s) const; + + // Clear filedescriptor in mFdSet. + void clr(curl_socket_t fd); + + // Iterate over all file descriptors that were set by refresh and are still set in mFdSet. + void reset(void); // Reset the iterator. + curl_socket_t get(void) const; // Return next filedescriptor, or CURL_SOCKET_BAD when there are no more. + // Only valid if reset() was called after the last call to refresh(). + void next(void); // Advance to next filedescriptor. + + private: + curl_socket_t* mFileDescriptors; + int mNrFds; // The number of filedescriptors in the array. + int mNext; // The index of the first file descriptor to start copying, the next call to refresh(). + + fd_set mFdSet; // Output variable for select(). (Re)initialized by calling refresh(). + +#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX) + curl_socket_t mMaxFd; // The largest filedescriptor in the array, or CURL_SOCKET_BAD when it is empty. + curl_socket_t mMaxFdSet; // The largest filedescriptor set in mFdSet by refresh(), or CURL_SOCKET_BAD when it was empty. + std::vector mCopiedFileDescriptors; // Filedescriptors copied by refresh to mFdSet. + std::vector::iterator mIter; // Index into mCopiedFileDescriptors for next(); loop variable. +#else + unsigned int mIter; // Index into fd_set::fd_array. +#endif +}; + // A PollSet can store at least 1024 filedescriptors, or FD_SETSIZE if that is larger than 1024 [MAXSIZE]. // The number of stored filedescriptors is mNrFds [0 <= mNrFds <= MAXSIZE]. // The largest filedescriptor is stored is mMaxFd, which is -1 iff mNrFds == 0. @@ -132,12 +302,12 @@ namespace curlthread { // // mMaxFdSet is the largest filedescriptor in mFdSet or -1 if it is empty. -static size_t const MAXSIZE = std::max(1024, FD_SETSIZE); +static size_t const MAXSIZE = llmax(1024, FD_SETSIZE); // Create an empty PollSet. PollSet::PollSet(void) : mFileDescriptors(new curl_socket_t [MAXSIZE]), mNrFds(0), mNext(0) -#if !LL_WINDOWS +#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX) , mMaxFd(-1), mMaxFdSet(-1) #endif { @@ -147,10 +317,10 @@ PollSet::PollSet(void) : mFileDescriptors(new curl_socket_t [MAXSIZE]), // Add filedescriptor s to the PollSet. void PollSet::add(curl_socket_t s) { - llassert_always(mNrFds < MAXSIZE); + llassert_always(mNrFds < (int)MAXSIZE); mFileDescriptors[mNrFds++] = s; -#if !LL_WINDOWS - mMaxFd = std::max(mMaxFd, s); +#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX) + mMaxFd = llmax(mMaxFd, s); #endif } @@ -186,7 +356,7 @@ void PollSet::remove(curl_socket_t s) // index: 0 1 2 3 4 5 // a b c s d e curl_socket_t cur = mFileDescriptors[i]; // cur = 'e' -#if !LL_WINDOWS +#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX) curl_socket_t max = -1; #endif while (cur != s) @@ -194,8 +364,8 @@ void PollSet::remove(curl_socket_t s) llassert(i > 0); curl_socket_t next = mFileDescriptors[--i]; // next = 'd' mFileDescriptors[i] = cur; // Overwrite 'd' with 'e'. -#if !LL_WINDOWS - max = std::max(max, cur); // max is the maximum value in 'i' or higher. +#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX) + max = llmax(max, cur); // max is the maximum value in 'i' or higher. #endif cur = next; // cur = 'd' // i NrFds = 5 @@ -214,21 +384,21 @@ void PollSet::remove(curl_socket_t s) // i NrFds = 5 // v v // index: 0 1 2 3 4 - // a b c d e // max = std::max('d', 'e') + // a b c d e // max = llmax('d', 'e') // If mNext pointed to an element before s, it should be left alone. Otherwise, if mNext pointed // to s it must now point to 'd', or if it pointed beyond 's' it must be decremented by 1. if (mNext > i) // i is where s was. --mNext; -#if !LL_WINDOWS +#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX) // If s was the largest file descriptor, we have to update mMaxFd. if (s == mMaxFd) { while (i > 0) { curl_socket_t next = mFileDescriptors[--i]; - max = std::max(max, next); + max = llmax(max, next); } mMaxFd = max; llassert(mMaxFd < s); @@ -238,7 +408,7 @@ void PollSet::remove(curl_socket_t s) // ALSO make sure that s is no longer set in mFdSet, or we might confuse libcurl by // calling curl_multi_socket_action for a socket that it told us to remove. -#if !LL_WINDOWS +#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX) clr(s); #else // We have to use a custom implementation here, because we don't want to invalidate mIter. @@ -246,14 +416,14 @@ void PollSet::remove(curl_socket_t s) // mFdSet.fd_array instead of mFileDescriptors and mIter instead of mNext. if (FD_ISSET(s, &mFdSet)) { - int i = --mFdSet.fd_count; - llassert(i >= 0); + llassert(mFdSet.fd_count > 0); + unsigned int i = --mFdSet.fd_count; curl_socket_t cur = mFdSet.fd_array[i]; while (cur != s) { llassert(i > 0); - curl_socket_t next = mFileDescriptors[--i]; - mFileDescriptors[i] = cur; + curl_socket_t next = mFdSet.fd_array[--i]; + mFdSet.fd_array[i] = cur; cur = next; } if (mIter > i) @@ -278,7 +448,7 @@ inline bool PollSet::is_set(curl_socket_t fd) const inline void PollSet::clr(curl_socket_t fd) { - return FD_CLR(fd, &mFdSet); + FD_CLR(fd, &mFdSet); } // This function fills mFdSet with at most FD_SETSIZE - 1 filedescriptors, @@ -287,13 +457,13 @@ inline void PollSet::clr(curl_socket_t fd) refresh_t PollSet::refresh(void) { FD_ZERO(&mFdSet); -#if !LL_WINDOWS +#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX) mCopiedFileDescriptors.clear(); #endif if (mNrFds == 0) { -#if !LL_WINDOWS +#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX) mMaxFdSet = -1; #endif return empty_and_complete; @@ -308,18 +478,18 @@ refresh_t PollSet::refresh(void) if (mNrFds >= FD_SETSIZE) { llwarns << "PollSet::reset: More than FD_SETSIZE (" << FD_SETSIZE << ") file descriptors active!" << llendl; -#if !LL_WINDOWS +#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX) // Calculate mMaxFdSet. // Run over FD_SETSIZE - 1 elements, starting at mNext, wrapping to 0 when we reach the end. int max = -1, i = mNext, count = 0; - while (++count < FD_SETSIZE) { max = std::max(max, mFileDescriptors[i]); if (++i == mNrFds) i = 0; } + while (++count < FD_SETSIZE) { max = llmax(max, mFileDescriptors[i]); if (++i == mNrFds) i = 0; } mMaxFdSet = max; #endif } else { mNext = 0; // Start at the beginning if we copy everything anyway. -#if !LL_WINDOWS +#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX) mMaxFdSet = mMaxFd; #endif } @@ -333,7 +503,7 @@ refresh_t PollSet::refresh(void) return not_complete_not_empty; } FD_SET(mFileDescriptors[i], &mFdSet); -#if !LL_WINDOWS +#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX) mCopiedFileDescriptors.push_back(mFileDescriptors[i]); #endif if (++i == mNrFds) @@ -371,7 +541,7 @@ refresh_t PollSet::refresh(void) void PollSet::reset(void) { -#if LL_WINDOWS +#if LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX mIter = 0; #else if (mCopiedFileDescriptors.empty()) @@ -387,7 +557,7 @@ void PollSet::reset(void) inline curl_socket_t PollSet::get(void) const { -#if LL_WINDOWS +#if LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX return (mIter >= mFdSet.fd_count) ? CURL_SOCKET_BAD : mFdSet.fd_array[mIter]; #else return (mIter == mCopiedFileDescriptors.end()) ? CURL_SOCKET_BAD : *mIter; @@ -396,7 +566,7 @@ inline curl_socket_t PollSet::get(void) const void PollSet::next(void) { -#if LL_WINDOWS +#if LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX llassert(mIter < mFdSet.fd_count); ++mIter; #else @@ -415,28 +585,28 @@ void PollSet::next(void) class MergeIterator { public: - MergeIterator(PollSet& readPollSet, PollSet& writePollSet); + MergeIterator(PollSet* readPollSet, PollSet* writePollSet); bool next(curl_socket_t& fd_out, int& ev_bitmask_out); private: - PollSet& mReadPollSet; - PollSet& mWritePollSet; + PollSet* mReadPollSet; + PollSet* mWritePollSet; int readIndx; int writeIndx; }; -MergeIterator::MergeIterator(PollSet& readPollSet, PollSet& writePollSet) : +MergeIterator::MergeIterator(PollSet* readPollSet, PollSet* writePollSet) : mReadPollSet(readPollSet), mWritePollSet(writePollSet), readIndx(0), writeIndx(0) { - mReadPollSet.reset(); - mWritePollSet.reset(); + mReadPollSet->reset(); + mWritePollSet->reset(); } bool MergeIterator::next(curl_socket_t& fd_out, int& ev_bitmask_out) { - curl_socket_t rfd = mReadPollSet.get(); - curl_socket_t wfd = mWritePollSet.get(); + curl_socket_t rfd = mReadPollSet->get(); + curl_socket_t wfd = mWritePollSet->get(); if (rfd == CURL_SOCKET_BAD && wfd == CURL_SOCKET_BAD) return false; @@ -445,28 +615,28 @@ bool MergeIterator::next(curl_socket_t& fd_out, int& ev_bitmask_out) { fd_out = rfd; ev_bitmask_out = CURL_CSELECT_IN | CURL_CSELECT_OUT; - mReadPollSet.next(); + mReadPollSet->next(); } else if (wfd == CURL_SOCKET_BAD || (rfd != CURL_SOCKET_BAD && rfd < wfd)) // Use and increment smaller one, unless it's CURL_SOCKET_BAD. { fd_out = rfd; ev_bitmask_out = CURL_CSELECT_IN; - mReadPollSet.next(); - if (wfd != CURL_SOCKET_BAD && mWritePollSet.is_set(rfd)) + mReadPollSet->next(); + if (wfd != CURL_SOCKET_BAD && mWritePollSet->is_set(rfd)) { ev_bitmask_out |= CURL_CSELECT_OUT; - mWritePollSet.clr(rfd); + mWritePollSet->clr(rfd); } } else { fd_out = wfd; ev_bitmask_out = CURL_CSELECT_OUT; - mWritePollSet.next(); - if (rfd != CURL_SOCKET_BAD && mReadPollSet.is_set(wfd)) + mWritePollSet->next(); + if (rfd != CURL_SOCKET_BAD && mReadPollSet->is_set(wfd)) { ev_bitmask_out |= CURL_CSELECT_IN; - mReadPollSet.clr(wfd); + mReadPollSet->clr(wfd); } } @@ -496,8 +666,8 @@ CurlSocketInfo::CurlSocketInfo(MultiHandle& multi_handle, CURL* easy, curl_socke mMultiHandle(multi_handle), mEasy(easy), mSocketFd(s), mAction(CURL_POLL_NONE) { mMultiHandle.assign(s, this); - llassert(!mMultiHandle.mReadPollSet.contains(s)); - llassert(!mMultiHandle.mWritePollSet.contains(s)); + llassert(!mMultiHandle.mReadPollSet->contains(s)); + llassert(!mMultiHandle.mWritePollSet->contains(s)); set_action(action); } @@ -513,16 +683,16 @@ void CurlSocketInfo::set_action(int action) if ((toggle_action & CURL_POLL_IN)) { if ((action & CURL_POLL_IN)) - mMultiHandle.mReadPollSet.add(mSocketFd); + mMultiHandle.mReadPollSet->add(mSocketFd); else - mMultiHandle.mReadPollSet.remove(mSocketFd); + mMultiHandle.mReadPollSet->remove(mSocketFd); } if ((toggle_action & CURL_POLL_OUT)) { if ((action & CURL_POLL_OUT)) - mMultiHandle.mWritePollSet.add(mSocketFd); + mMultiHandle.mWritePollSet->add(mSocketFd); else - mMultiHandle.mWritePollSet.remove(mSocketFd); + mMultiHandle.mWritePollSet->remove(mSocketFd); } } @@ -533,6 +703,8 @@ class AICurlThread : public LLThread { public: static AICurlThread* sInstance; + LLMutex mWakeUpMutex; + bool mWakeUpFlag; // Protected by mWakeUpMutex. public: // MAIN-THREAD @@ -548,6 +720,7 @@ class AICurlThread : public LLThread protected: virtual void run(void); void wakeup(AICurlMultiHandle_wat const& multi_handle_w); + void process_commands(AICurlMultiHandle_wat const& multi_handle_w); private: // MAIN-THREAD @@ -566,7 +739,9 @@ class AICurlThread : public LLThread AICurlThread* AICurlThread::sInstance = NULL; // MAIN-THREAD -AICurlThread::AICurlThread(void) : LLThread("AICurlThread"), mWakeUpFd_in(CURL_SOCKET_BAD), mWakeUpFd(CURL_SOCKET_BAD), mZeroTimeOut(0), mRunning(true) +AICurlThread::AICurlThread(void) : LLThread("AICurlThread"), + mWakeUpFd_in(CURL_SOCKET_BAD), mWakeUpFd(CURL_SOCKET_BAD), + mZeroTimeOut(0), mRunning(true), mWakeUpFlag(false) { create_wakeup_fds(); sInstance = this; @@ -582,9 +757,9 @@ AICurlThread::~AICurlThread() // MAIN-THREAD void AICurlThread::create_wakeup_fds(void) { -#ifdef WINDOWS -// Probably need to use sockets here, cause Windows select doesn't work for a pipe. -#error Missing implementation +#if LL_WINDOWS + // Probably need to use sockets here, cause Windows select doesn't work for a pipe. + #error Missing implementation #else int pipefd[2]; if (pipe(pipefd)) @@ -607,19 +782,32 @@ void AICurlThread::create_wakeup_fds(void) // MAIN-THREAD void AICurlThread::cleanup_wakeup_fds(void) { +#if LL_WINDOWS + #error Missing implementation +#else if (mWakeUpFd_in != CURL_SOCKET_BAD) close(mWakeUpFd_in); if (mWakeUpFd != CURL_SOCKET_BAD) close(mWakeUpFd); +#endif } // MAIN-THREAD void AICurlThread::wakeup_thread(void) { DoutEntering(dc::curl, "AICurlThread::wakeup_thread"); + llassert(is_main_thread()); -#ifdef WINDOWS -#error Missing implementation + // Try if curl thread is still awake and if so, pass the new commands directly. + if (mWakeUpMutex.tryLock()) + { + mWakeUpFlag = true; + mWakeUpMutex.unlock(); + return; + } + +#ifdef LL_WINDOWS + #error Missing implementation #else // If write() is interrupted by a signal before it writes any data, it shall return -1 with errno set to [EINTR]. // If write() is interrupted by a signal after it successfully writes some data, it shall return the number of bytes written. @@ -648,8 +836,8 @@ void AICurlThread::wakeup(AICurlMultiHandle_wat const& multi_handle_w) { DoutEntering(dc::curl, "AICurlThread::wakeup"); -#ifdef WINDOWS -#error Missing implementation +#ifdef LL_WINDOWS + #error Missing implementation #else // If a read() is interrupted by a signal before it reads any data, it shall return -1 with errno set to [EINTR]. // If a read() is interrupted by a signal after it has successfully read some data, it shall return the number of bytes read. @@ -678,6 +866,13 @@ void AICurlThread::wakeup(AICurlMultiHandle_wat const& multi_handle_w) return; } #endif + process_commands(multi_handle_w); +} + +void AICurlThread::process_commands(AICurlMultiHandle_wat const& multi_handle_w) +{ + DoutEntering(dc::curl, "AICurlThread::process_commands(void)"); + // If we get here then the main thread called wakeup_thread() recently. for(;;) { @@ -685,7 +880,12 @@ void AICurlThread::wakeup(AICurlMultiHandle_wat const& multi_handle_w) { command_queue_wat command_queue_w(command_queue); if (command_queue_w->empty()) + { + mWakeUpMutex.lock(); + mWakeUpFlag = false; + mWakeUpMutex.unlock(); break; + } // Move the next command from the queue into command_being_processed. *command_being_processed_wat(command_being_processed) = command_queue_w->front(); command_queue_w->pop_front(); @@ -702,7 +902,7 @@ void AICurlThread::wakeup(AICurlMultiHandle_wat const& multi_handle_w) multi_handle_w->add_easy_request(AICurlEasyRequest(command_being_processed_r->easy_request())); break; case cmd_remove: - multi_handle_w->remove_easy_request(AICurlEasyRequest(command_being_processed_r->easy_request())); + multi_handle_w->remove_easy_request(AICurlEasyRequest(command_being_processed_r->easy_request()), true); break; } // Done processing. @@ -724,32 +924,53 @@ void AICurlThread::run(void) // If mRunning is true then we can only get here if mWakeUpFd != CURL_SOCKET_BAD. llassert(mWakeUpFd != CURL_SOCKET_BAD); // Copy the next batch of file descriptors from the PollSets mFiledescriptors into their mFdSet. - multi_handle_w->mReadPollSet.refresh(); - refresh_t wres = multi_handle_w->mWritePollSet.refresh(); + multi_handle_w->mReadPollSet->refresh(); + refresh_t wres = multi_handle_w->mWritePollSet->refresh(); // Add wake up fd if any, and pass NULL to select() if a set is empty. - fd_set* read_fd_set = multi_handle_w->mReadPollSet.access(); + fd_set* read_fd_set = multi_handle_w->mReadPollSet->access(); FD_SET(mWakeUpFd, read_fd_set); - fd_set* write_fd_set = ((wres & empty)) ? NULL : multi_handle_w->mWritePollSet.access(); + fd_set* write_fd_set = ((wres & empty)) ? NULL : multi_handle_w->mWritePollSet->access(); // Calculate nfds (ignored on windows). -#if !LL_WINDOWS - curl_socket_t const max_rfd = std::max(multi_handle_w->mReadPollSet.get_max_fd(), mWakeUpFd); - curl_socket_t const max_wfd = multi_handle_w->mWritePollSet.get_max_fd(); - int nfds = std::max(max_rfd, max_wfd) + 1; +#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX) + curl_socket_t const max_rfd = llmax(multi_handle_w->mReadPollSet->get_max_fd(), mWakeUpFd); + curl_socket_t const max_wfd = multi_handle_w->mWritePollSet->get_max_fd(); + int nfds = llmax(max_rfd, max_wfd) + 1; llassert(0 <= nfds && nfds <= FD_SETSIZE); llassert((max_rfd == -1) == (read_fd_set == NULL) && (max_wfd == -1) == (write_fd_set == NULL)); // Needed on Windows. - llassert((max_rfd == -1 || multi_handle_w->mReadPollSet.is_set(max_rfd)) && - (max_wfd == -1 || multi_handle_w->mWritePollSet.is_set(max_wfd))); + llassert((max_rfd == -1 || multi_handle_w->mReadPollSet->is_set(max_rfd)) && + (max_wfd == -1 || multi_handle_w->mWritePollSet->is_set(max_wfd))); #else int nfds = 64; #endif int ready = 0; + // Process every command in command_queue before entering select(). + for(;;) + { + mWakeUpMutex.lock(); + if (mWakeUpFlag) + { + mWakeUpMutex.unlock(); + process_commands(multi_handle_w); + continue; + } + break; + } + // wakeup_thread() is also called after setting mRunning to false. + if (!mRunning) + { + mWakeUpMutex.unlock(); + break; + } + // If we get here then mWakeUpFlag has been false since we grabbed the lock. + // We're now entering select(), during which the main thread will write to the pipe/socket + // to wake us up, because it can't get the lock. struct timeval timeout; long timeout_ms = multi_handle_w->getTimeOut(); // If no timeout is set, sleep 1 second. - if (timeout_ms < 0) + if (LL_UNLIKELY(timeout_ms < 0)) timeout_ms = 1000; - if (timeout_ms == 0) + if (LL_UNLIKELY(timeout_ms == 0)) { if (mZeroTimeOut >= 10000) { @@ -763,7 +984,7 @@ void AICurlThread::run(void) } else { - if (mZeroTimeOut >= 10000) + if (LL_UNLIKELY(mZeroTimeOut >= 10000)) llinfos << "Timeout of select() call by curl thread reset (to " << timeout_ms << " ms)." << llendl; mZeroTimeOut = 0; } @@ -787,6 +1008,7 @@ void AICurlThread::run(void) } #endif ready = select(nfds, read_fd_set, write_fd_set, NULL, &timeout); + mWakeUpMutex.unlock(); #ifdef CWDEBUG static int last_ready = -2; static int last_errno = 0; @@ -818,7 +1040,7 @@ void AICurlThread::run(void) } else { - if (multi_handle_w->mReadPollSet.is_set(mWakeUpFd)) + if (multi_handle_w->mReadPollSet->is_set(mWakeUpFd)) { // Process commands from main-thread. This can add or remove filedescriptors from the poll sets. wakeup(multi_handle_w); @@ -831,11 +1053,13 @@ void AICurlThread::run(void) while (ready > 0 && iter.next(fd, ev_bitmask)) { ready -= (ev_bitmask == (CURL_CSELECT_IN|CURL_CSELECT_OUT)) ? 2 : 1; + // This can cause libcurl to do callbacks and remove filedescriptors, causing us to reset their bits in the poll sets. multi_handle_w->socket_action(fd, ev_bitmask); llassert(ready >= 0); } - // Should have handled them all. - llassert(ready == 0); + // Note that ready is not necessarily 0 here, because it's possible + // that libcurl removed file descriptors which we subsequently + // didn't handle. } multi_handle_w->check_run_count(); } @@ -846,8 +1070,10 @@ void AICurlThread::run(void) //----------------------------------------------------------------------------- // MultiHandle -MultiHandle::MultiHandle(void) : mHandleAddedOrRemoved(false), mPrevRunningHandles(0), mRunningHandles(0), mTimeOut(-1) +MultiHandle::MultiHandle(void) : mHandleAddedOrRemoved(false), mPrevRunningHandles(0), mRunningHandles(0), mTimeOut(-1), mReadPollSet(NULL), mWritePollSet(NULL) { + mReadPollSet = new PollSet; + mWritePollSet = new PollSet; check_multi_code(curl_multi_setopt(mMultiHandle, CURLMOPT_SOCKETFUNCTION, &MultiHandle::socket_callback)); check_multi_code(curl_multi_setopt(mMultiHandle, CURLMOPT_SOCKETDATA, this)); check_multi_code(curl_multi_setopt(mMultiHandle, CURLMOPT_TIMERFUNCTION, &MultiHandle::timer_callback)); @@ -856,12 +1082,16 @@ MultiHandle::MultiHandle(void) : mHandleAddedOrRemoved(false), mPrevRunningHandl MultiHandle::~MultiHandle() { + llinfos << "Destructing MultiHandle with " << mAddedEasyRequests.size() << " active curl easy handles." << llendl; + // This thread was terminated. // Curl demands that all handles are removed from the multi session handle before calling curl_multi_cleanup. for(addedEasyRequests_type::iterator iter = mAddedEasyRequests.begin(); iter != mAddedEasyRequests.end(); iter = mAddedEasyRequests.begin()) { remove_easy_request(*iter); } + delete mWritePollSet; + delete mReadPollSet; } #ifdef CWDEBUG @@ -956,7 +1186,7 @@ CURLMcode MultiHandle::add_easy_request(AICurlEasyRequest const& easy_request) return ret; } -CURLMcode MultiHandle::remove_easy_request(AICurlEasyRequest const& easy_request) +CURLMcode MultiHandle::remove_easy_request(AICurlEasyRequest const& easy_request, bool as_per_command) { addedEasyRequests_type::iterator iter = mAddedEasyRequests.find(easy_request); if (iter == mAddedEasyRequests.end()) @@ -965,6 +1195,9 @@ CURLMcode MultiHandle::remove_easy_request(AICurlEasyRequest const& easy_request { AICurlEasyRequest_wat curl_easy_request_w(**iter); res = curl_easy_request_w->remove_handle_from_multi(curl_easy_request_w, mMultiHandle); +#ifdef SHOW_ASSERT + curl_easy_request_w->mRemovedPerCommand = as_per_command; +#endif } mAddedEasyRequests.erase(iter); mHandleAddedOrRemoved = true; @@ -1077,6 +1310,9 @@ void stopCurlThread(void) ms_sleep(10); } Dout(dc::curl, "Curl thread" << (curlThreadIsRunning() ? " not" : "") << " stopped after " << ((100 - count) * 10) << "ms."); + // Clear the command queue, for a cleaner cleanup. + command_queue_wat command_queue_w(command_queue); + command_queue_w->clear(); } } @@ -1129,6 +1365,7 @@ void AICurlEasyRequest::addRequest(void) #endif // Add a command to add the new request to the multi session to the command queue. command_queue_w->push_back(Command(*this, cmd_add)); + AICurlEasyRequest_wat(*get())->add_queued(); } // Something was added to the queue, wake up the thread to get it. wakeUpCurlThread(); @@ -1171,13 +1408,18 @@ void AICurlEasyRequest::removeRequest(void) } else { - // May not already have been removed from multi session handle. - llassert(AICurlEasyRequest_wat(*get())->active()); + // May not already have been removed from multi session handle as per command from the main thread (through this function thus). + { + AICurlEasyRequest_wat curl_easy_request_w(*get()); + llassert(curl_easy_request_w->active() || !curl_easy_request_w->mRemovedPerCommand); + } } } #endif // Add a command to remove this request from the multi session to the command queue. command_queue_w->push_back(Command(*this, cmd_remove)); + // Suppress warning that would otherwise happen if the callbacks are revoked before the curl thread removed the request. + AICurlEasyRequest_wat(*get())->remove_queued(); } // Something was added to the queue, wake up the thread to get it. wakeUpCurlThread(); diff --git a/indra/llmessage/aicurlthread.h b/indra/llmessage/aicurlthread.h index 3980915d0..a2bd36352 100644 --- a/indra/llmessage/aicurlthread.h +++ b/indra/llmessage/aicurlthread.h @@ -39,76 +39,13 @@ namespace AICurlPrivate { namespace curlthread { +class PollSet; + // For ordering a std::set with AICurlEasyRequest objects. struct AICurlEasyRequestCompare { bool operator()(AICurlEasyRequest const& h1, AICurlEasyRequest const& h2) { return h1.get() < h2.get(); } }; -//----------------------------------------------------------------------------- -// PollSet - -int const empty = 0x1; -int const complete = 0x2; - -enum refresh_t { - not_complete_not_empty = 0, - complete_not_empty = complete, - empty_and_complete = complete|empty -}; - -class PollSet -{ - public: - PollSet(void); - - // Add/remove a filedescriptor to/from mFileDescriptors. - void add(curl_socket_t s); - void remove(curl_socket_t s); - - // Copy mFileDescriptors to an internal fd_set that is returned by access(). - // Returns if all fds could be copied (complete) and/or if the resulting fd_set is empty. - refresh_t refresh(void); - - // Return a pointer to the underlaying fd_set. - fd_set* access(void) { return &mFdSet; } - -#if !LL_WINDOWS - // Return the largest fd set in mFdSet by refresh. - curl_socket_t get_max_fd(void) const { return mMaxFdSet; } -#endif - - // Return true if a filedescriptor is set in mFileDescriptors (used for debugging). - bool contains(curl_socket_t s) const; - - // Return true if a filedescriptor is set in mFdSet. - bool is_set(curl_socket_t s) const; - - // Clear filedescriptor in mFdSet. - void clr(curl_socket_t fd); - - // Iterate over all file descriptors that were set by refresh and are still set in mFdSet. - void reset(void); // Reset the iterator. - curl_socket_t get(void) const; // Return next filedescriptor, or CURL_SOCKET_BAD when there are no more. - // Only valid if reset() was called after the last call to refresh(). - void next(void); // Advance to next filedescriptor. - - private: - curl_socket_t* mFileDescriptors; - int mNrFds; // The number of filedescriptors in the array. - int mNext; // The index of the first file descriptor to start copying, the next call to refresh(). - - fd_set mFdSet; // Output variable for select(). (Re)initialized by calling refresh(). - -#if !LL_WINDOWS - curl_socket_t mMaxFd; // The largest filedescriptor in the array, or CURL_SOCKET_BAD when it is empty. - curl_socket_t mMaxFdSet; // The largest filedescriptor set in mFdSet by refresh(), or CURL_SOCKET_BAD when it was empty. - std::vector mCopiedFileDescriptors; // Filedescriptors copied by refresh to mFdSet. - std::vector::iterator mIter; // Index into mCopiedFileDescriptors for next(); loop variable. -#else - int mIter; // Index into fd_set::fd_array. -#endif -}; - //----------------------------------------------------------------------------- // MultiHandle @@ -123,7 +60,7 @@ class MultiHandle : public CurlMultiHandle // Add/remove an easy handle to/from a multi session. CURLMcode add_easy_request(AICurlEasyRequest const& easy_request); - CURLMcode remove_easy_request(AICurlEasyRequest const& easy_request); + CURLMcode remove_easy_request(AICurlEasyRequest const& easy_request, bool as_per_command = false); // Reads/writes available data from a particular socket (non-blocking). CURLMcode socket_action(curl_socket_t sockfd, int ev_bitmask); @@ -161,8 +98,8 @@ class MultiHandle : public CurlMultiHandle //----------------------------------------------------------------------------- // Curl socket administration: - PollSet mReadPollSet; - PollSet mWritePollSet; + PollSet* mReadPollSet; + PollSet* mWritePollSet; }; } // namespace curlthread diff --git a/indra/llmessage/lliopipe.cpp b/indra/llmessage/lliopipe.cpp index 8f827f7a3..c8bef05c6 100644 --- a/indra/llmessage/lliopipe.cpp +++ b/indra/llmessage/lliopipe.cpp @@ -76,7 +76,14 @@ LLIOPipe::~LLIOPipe() } //virtual -bool LLIOPipe::isValid() +bool LLIOPipe::hasExpiration(void) const +{ + // LLIOPipe::hasNotExpired always returns true. + return false; +} + +//virtual +bool LLIOPipe::hasNotExpired(void) const { return true ; } diff --git a/indra/llmessage/lliopipe.h b/indra/llmessage/lliopipe.h index 2def3229f..0e71d7a00 100644 --- a/indra/llmessage/lliopipe.h +++ b/indra/llmessage/lliopipe.h @@ -149,7 +149,7 @@ public: // The connection was lost. STATUS_LOST_CONNECTION = -5, - // The totoal process time has exceeded the timeout. + // The total process time has exceeded the timeout. STATUS_EXPIRED = -6, // Keep track of the count of codes here. @@ -231,7 +231,16 @@ public: */ virtual ~LLIOPipe(); - virtual bool isValid() ; + /** + * @brief External expiration facility. + * + * If hasExpiration() returns true, then we need to check hasNotExpired() + * to see if the LLIOPipe is still valid. In the legacy LL code the + * latter was called isValid() and was overloaded for two purposes: + * either expiration or failure to initialize. + */ + virtual bool hasExpiration(void) const; + virtual bool hasNotExpired(void) const; protected: /** diff --git a/indra/llmessage/llpumpio.cpp b/indra/llmessage/llpumpio.cpp index 498914d33..e6c6a42d6 100644 --- a/indra/llmessage/llpumpio.cpp +++ b/indra/llmessage/llpumpio.cpp @@ -198,19 +198,17 @@ LLPumpIO::~LLPumpIO() } } -bool LLPumpIO::addChain(const chain_t& chain, F32 timeout, bool has_curl_request) +bool LLPumpIO::addChain(chain_t const& chain, F32 timeout) { LLMemType m1(LLMemType::MTYPE_IO_PUMP); - if(chain.empty()) return false; -#if LL_THREADS_APR - LLScopedLock lock(mChainsMutex); -#endif + chain_t::const_iterator it = chain.begin(); + chain_t::const_iterator const end = chain.end(); + if (it == end) return false; + LLChainInfo info; - info.mHasCurlRequest = has_curl_request; info.setTimeoutSeconds(timeout); info.mData = LLIOPipe::buffer_ptr_t(new LLBufferArray); - info.mData->setThreaded(has_curl_request); LLLinkInfo link; #if LL_DEBUG_PIPE_TYPE_IN_PUMP lldebugs << "LLPumpIO::addChain() " << chain[0] << " '" @@ -218,14 +216,17 @@ bool LLPumpIO::addChain(const chain_t& chain, F32 timeout, bool has_curl_request #else lldebugs << "LLPumpIO::addChain() " << chain[0] <hasExpiration(); link.mPipe = (*it); link.mChannels = info.mData->nextChannel(); info.mChainLinks.push_back(link); } + +#if LL_THREADS_APR + LLScopedLock lock(mChainsMutex); +#endif mPendingChains.push_back(info); return true; } @@ -242,11 +243,10 @@ bool LLPumpIO::addChain( // description, we need to have that description matched to a // particular buffer. if(!data) return false; - if(links.empty()) return false; + links_t::const_iterator link = links.begin(); + links_t::const_iterator const end = links.end(); + if (link == end) return false; -#if LL_THREADS_APR - LLScopedLock lock(mChainsMutex); -#endif #if LL_DEBUG_PIPE_TYPE_IN_PUMP lldebugs << "LLPumpIO::addChain() " << links[0].mPipe << " '" << typeid(*(links[0].mPipe)).name() << "'" << llendl; @@ -258,6 +258,17 @@ bool LLPumpIO::addChain( info.mChainLinks = links; info.mData = data; info.mContext = context; + for (; link != end; ++link) + { + if (link->mPipe->hasExpiration()) + { + info.mHasExpiration = true; + break; + } + } +#if LL_THREADS_APR + LLScopedLock lock(mChainsMutex); +#endif mPendingChains.push_back(info); return true; } @@ -1086,14 +1097,14 @@ void LLPumpIO::processChain(LLChainInfo& chain) bool LLPumpIO::isChainExpired(LLChainInfo& chain) { - if(!chain.mHasCurlRequest) + if(!chain.mHasExpiration) { return false ; } for(links_t::iterator iter = chain.mChainLinks.begin(); iter != chain.mChainLinks.end(); ++iter) { - if(!(*iter).mPipe->isValid()) + if(!(*iter).mPipe->hasNotExpired()) { return true ; } @@ -1106,6 +1117,8 @@ bool LLPumpIO::handleChainError( LLChainInfo& chain, LLIOPipe::EStatus error) { + DoutEntering(dc::notice, "LLPumpIO::handleChainError(" << (void*)&chain << ", " << LLIOPipe::lookupStatusString(error) << ")"); + LLMemType m1(LLMemType::MTYPE_IO_PUMP); links_t::reverse_iterator rit; if(chain.mHead == chain.mChainLinks.end()) @@ -1168,7 +1181,7 @@ LLPumpIO::LLChainInfo::LLChainInfo() : mInit(false), mLock(0), mEOS(false), - mHasCurlRequest(false), + mHasExpiration(false), mDescriptorsPool(new LLAPRPool(LLThread::tldata().mRootPool)) { LLMemType m1(LLMemType::MTYPE_IO_PUMP); @@ -1180,9 +1193,7 @@ void LLPumpIO::LLChainInfo::setTimeoutSeconds(F32 timeout) LLMemType m1(LLMemType::MTYPE_IO_PUMP); if(timeout > 0.0f) { - mTimer.start(); - mTimer.reset(); - mTimer.setTimerExpirySec(timeout); + mTimer.start(timeout); } else { diff --git a/indra/llmessage/llpumpio.h b/indra/llmessage/llpumpio.h index 3771be9cf..0d1387257 100644 --- a/indra/llmessage/llpumpio.h +++ b/indra/llmessage/llpumpio.h @@ -100,10 +100,9 @@ public: * @param chain The pipes for the chain * @param timeout The number of seconds in the future to * expire. Pass in 0.0f to never expire. - * @param has_curl_request The chain contains LLURLRequest if true. * @return Returns true if anything was added to the pump. */ - bool addChain(const chain_t& chain, F32 timeout, bool has_curl_request = false); + bool addChain(const chain_t& chain, F32 timeout); /** * @brief Struct to associate a pipe with it's buffer io indexes. @@ -347,7 +346,7 @@ protected: // basic member data bool mInit; bool mEOS; - bool mHasCurlRequest; + bool mHasExpiration; S32 mLock; LLFrameTimer mTimer; links_t::iterator mHead; diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp index 97a8e48d9..8bb52c55a 100644 --- a/indra/llmessage/llurlrequest.cpp +++ b/indra/llmessage/llurlrequest.cpp @@ -260,11 +260,22 @@ void LLURLRequest::allowCookies() } //virtual -bool LLURLRequest::isValid() +bool LLURLRequest::hasExpiration(void) const { - //FIXME - wtf is with this isValid? - //return mDetail->mCurlRequest->isValid(); - return true; + // Currently, this ALWAYS returns false -- because only AICurlEasyRequestStateMachine uses buffered + // AICurlEasyRequest objects, and LLURLRequest uses (unbuffered) AICurlEasyRequest directly, which + // have no expiration facility. + return mDetail->mCurlEasyRequest.isBuffered(); +} + +//virtual +bool LLURLRequest::hasNotExpired(void) const +{ + if (!mDetail->mCurlEasyRequest.isBuffered()) + return true; + AICurlEasyRequest_wat buffered_easy_request_w(*mDetail->mCurlEasyRequest); + AICurlResponderBuffer_wat buffer_w(*mDetail->mCurlEasyRequest); + return buffer_w->isValid(); } // virtual @@ -272,10 +283,24 @@ LLIOPipe::EStatus LLURLRequest::handleError( LLIOPipe::EStatus status, LLPumpIO* pump) { + DoutEntering(dc::curl, "LLURLRequest::handleError(" << LLIOPipe::lookupStatusString(status) << ", " << (void*)pump << ")"); LLMemType m1(LLMemType::MTYPE_IO_URL_REQUEST); - - if(!isValid()) + + if (LL_LIKELY(!mDetail->mCurlEasyRequest.isBuffered())) // Currently always true. { + // The last reference will be deleted when the pump that this chain belongs to + // is removed from the running chains vector, upon returning from this function. + // This keeps the CurlEasyRequest object alive until the curl thread cleanly removed it. + Dout(dc::curl, "Calling mDetail->mCurlEasyRequest.removeRequest()"); + mDetail->mCurlEasyRequest.removeRequest(); + } + else if (!hasNotExpired()) + { + // The buffered version has it's own time out handling, and that already expired, + // so we can ignore the expiration of this timer (currently never happens). + // I left it here because it's what LL did (in the form if (!isValid() ...), + // and it would be relevant if this characteristic of mDetail->mCurlEasyRequest + // would change. --Aleric return STATUS_EXPIRED ; } diff --git a/indra/llmessage/llurlrequest.h b/indra/llmessage/llurlrequest.h index 6cfe83a5e..d265a0dae 100644 --- a/indra/llmessage/llurlrequest.h +++ b/indra/llmessage/llurlrequest.h @@ -190,7 +190,8 @@ public: */ void allowCookies(); - /*virtual*/ bool isValid() ; + /*virtual*/ bool hasExpiration(void) const; + /*virtual*/ bool hasNotExpired(void) const; public: /** diff --git a/indra/llplugin/llpluginclassbasic.cpp b/indra/llplugin/llpluginclassbasic.cpp index 0567b157f..e3c587642 100644 --- a/indra/llplugin/llpluginclassbasic.cpp +++ b/indra/llplugin/llpluginclassbasic.cpp @@ -52,15 +52,16 @@ LLPluginClassBasic::~LLPluginClassBasic() delete mPlugin; } -bool LLPluginClassBasic::init(std::string const& launcher_filename, std::string const& plugin_filename, bool debug) +bool LLPluginClassBasic::init(std::string const& launcher_filename, std::string const& plugin_dir, std::string const& plugin_filename, bool debug) { LL_DEBUGS("Plugin") << "launcher: " << launcher_filename << LL_ENDL; + LL_DEBUGS("Plugin") << "dir: " << plugin_dir << LL_ENDL; LL_DEBUGS("Plugin") << "plugin: " << plugin_filename << LL_ENDL; mPlugin = new LLPluginProcessParent(this); mPlugin->setSleepTime(mSleepTime); - mPlugin->init(launcher_filename, plugin_filename, debug); + mPlugin->init(launcher_filename, plugin_dir, plugin_filename, debug); return init_impl(); } diff --git a/indra/llplugin/llpluginclassbasic.h b/indra/llplugin/llpluginclassbasic.h index 6c0602608..b7f9a3a86 100644 --- a/indra/llplugin/llpluginclassbasic.h +++ b/indra/llplugin/llpluginclassbasic.h @@ -53,7 +53,10 @@ public: virtual ~LLPluginClassBasic(); // Local initialization, called when creating a plugin process. Return true if successful. - bool init(std::string const& launcher_filename, std::string const& plugin_filename, bool debug); + bool init(std::string const& launcher_filename, + std::string const& plugin_dir, + std::string const& plugin_filename, + bool debug); // Undoes everything init did. Called when destroying a plugin process. void reset(void); diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index de208cb44..c71515496 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -484,6 +484,7 @@ void LLPluginClassMedia::jsAgentMaturityEvent( const std::string& maturity ) message.setValue( "maturity", maturity ); sendMessage( message ); } + void LLPluginClassMedia::mouseEvent(EMouseEventType type, int button, int x, int y, MASK modifiers) { if(type == MOUSE_EVENT_MOVE) @@ -573,7 +574,15 @@ bool LLPluginClassMedia::keyEvent(EKeyEventType type, int key_code, MASK modifie } break; } - + +#if LL_DARWIN + if(modifiers & MASK_ALT) + { + // Option-key modified characters should be handled by the unicode input path instead of this one. + result = false; + } +#endif + if(result) { LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "key_event"); @@ -731,6 +740,14 @@ void LLPluginClassMedia::setJavascriptEnabled(const bool enabled) sendMessage(message); } + +void LLPluginClassMedia::enableMediaPluginDebugging( bool enable ) +{ + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "enable_media_plugin_debugging"); + message.setValueBoolean( "enable", enable ); + sendMessage( message ); +} + void LLPluginClassMedia::setTarget(const std::string &target) { mTarget = target; @@ -795,7 +812,7 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) mDirtyRect.unionWith(newDirtyRect); } - LL_DEBUGS("PluginUpdated") << "adjusted incoming rect is: (" + LL_DEBUGS("PluginUpdated") << "adjusted incoming rect is: (" << newDirtyRect.mLeft << ", " << newDirtyRect.mTop << ", " << newDirtyRect.mRight << ", " @@ -958,6 +975,12 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) mAuthURL = message.getValue("url"); mAuthRealm = message.getValue("realm"); mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_AUTH_REQUEST); + } + else if(message_name == "debug_message") + { + mDebugMessageText = message.getValue("message_text"); + mDebugMessageLevel = message.getValue("message_level"); + mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_DEBUG_MESSAGE); } else { @@ -1103,6 +1126,14 @@ void LLPluginClassMedia::focus(bool focused) sendMessage(message); } +void LLPluginClassMedia::set_page_zoom_factor( double factor ) +{ + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "set_page_zoom_factor"); + + message.setValueReal("factor", factor); + sendMessage(message); +} + void LLPluginClassMedia::clear_cache() { LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "clear_cache"); @@ -1186,6 +1217,13 @@ void LLPluginClassMedia::setBrowserUserAgent(const std::string& user_agent) sendMessage(message); } +void LLPluginClassMedia::showWebInspector( bool show ) +{ + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "show_web_inspector"); + message.setValueBoolean("show", true); // only open for now - closed manually by user + sendMessage(message); +} + void LLPluginClassMedia::proxyWindowOpened(const std::string &target, const std::string &uuid) { LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "proxy_window_opened"); diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 8136e9cb7..b58d0c95f 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -112,6 +112,9 @@ public: void scrollEvent(int x, int y, MASK modifiers); + // enable/disable media plugin debugging messages and info spam + void enableMediaPluginDebugging( bool enable ); + // Javascript <-> viewer events void jsEnableObject( bool enable ); void jsAgentLocationEvent( double x, double y, double z ); @@ -167,6 +170,7 @@ public: bool pluginSupportsMediaBrowser(void); void focus(bool focused); + void set_page_zoom_factor( double factor ); void clear_cache(); void clear_cookies(); void set_cookies(const std::string &cookies); @@ -178,6 +182,7 @@ public: void browse_back(); void set_status_redirect(int code, const std::string &url); void setBrowserUserAgent(const std::string& user_agent); + void showWebInspector( bool show ); void proxyWindowOpened(const std::string &target, const std::string &uuid); void proxyWindowClosed(const std::string &uuid); void ignore_ssl_cert_errors(bool ignore); @@ -213,6 +218,10 @@ public: // This is valid during MEDIA_EVENT_CLICK_LINK_HREF and MEDIA_EVENT_GEOMETRY_CHANGE std::string getClickUUID() const { return mClickUUID; }; + // These are valid during MEDIA_EVENT_DEBUG_MESSAGE + std::string getDebugMessageText() const { return mDebugMessageText; }; + std::string getDebugMessageLevel() const { return mDebugMessageLevel; }; + // This is valid after MEDIA_EVENT_NAVIGATE_ERROR_PAGE S32 getStatusCode() const { return mStatusCode; }; @@ -271,7 +280,7 @@ protected: protected: LLPluginClassMediaOwner *mOwner; - + bool mTextureParamsReceived; // the mRequestedTexture* fields are only valid when this is true S32 mRequestedTextureDepth; LLGLenum mRequestedTextureInternalFormat; @@ -358,6 +367,8 @@ protected: std::string mClickNavType; std::string mClickTarget; std::string mClickUUID; + std::string mDebugMessageText; + std::string mDebugMessageLevel; S32 mGeometryX; S32 mGeometryY; S32 mGeometryWidth; diff --git a/indra/llplugin/llpluginclassmediaowner.h b/indra/llplugin/llpluginclassmediaowner.h index 0083e0c41..4a739cf86 100644 --- a/indra/llplugin/llpluginclassmediaowner.h +++ b/indra/llplugin/llpluginclassmediaowner.h @@ -71,6 +71,8 @@ public: MEDIA_EVENT_AUTH_REQUEST, // The plugin wants to display an auth dialog + MEDIA_EVENT_DEBUG_MESSAGE, // plugin sending back debug information for host to process + MEDIA_EVENT_LINK_HOVERED // Got a "link hovered" event from the plugin } EMediaEvent; diff --git a/indra/llplugin/llplugininstance.cpp b/indra/llplugin/llplugininstance.cpp index 793c8bb97..a53f67087 100644 --- a/indra/llplugin/llplugininstance.cpp +++ b/indra/llplugin/llplugininstance.cpp @@ -40,8 +40,13 @@ #include "linden_common.h" #include "llplugininstance.h" + #include "llaprpool.h" +#if LL_WINDOWS +#include "direct.h" // needed for _chdir() +#endif + /** Virtual destructor. */ LLPluginInstanceMessageListener::~LLPluginInstanceMessageListener() { @@ -83,10 +88,24 @@ LLPluginInstance::~LLPluginInstance() * @param[in] plugin_file Name of plugin dll/dylib/so. TODO:DOC is this correct? see .h * @return 0 if successful, APR error code or error code from the plugin's init function on failure. */ -int LLPluginInstance::load(std::string &plugin_file) +int LLPluginInstance::load(const std::string& plugin_dir, std::string &plugin_file) { pluginInitFunction init_function = NULL; + if ( plugin_dir.length() ) + { +#if LL_WINDOWS + // VWR-21275: + // *SOME* Windows systems fail to load the Qt plugins if the current working + // directory is not the same as the directory with the Qt DLLs in. + // This should not cause any run time issues since we are changing the cwd for the + // plugin shell process and not the viewer. + // Changing back to the previous directory is not necessary since the plugin shell + // quits once the plugin exits. + _chdir( plugin_dir.c_str() ); +#endif + }; + #if LL_LINUX && defined(LL_STANDALONE) void *dso_handle = dlopen(plugin_file.c_str(), RTLD_NOW | RTLD_GLOBAL); int result = (!dso_handle)?APR_EDSOOPEN:apr_os_dso_handle_put(&mDSOHandle, diff --git a/indra/llplugin/llplugininstance.h b/indra/llplugin/llplugininstance.h index b2b107bab..c77da97ba 100644 --- a/indra/llplugin/llplugininstance.h +++ b/indra/llplugin/llplugininstance.h @@ -64,7 +64,7 @@ public: // Load a plugin dll/dylib/so // Returns 0 if successful, APR error code or error code returned from the plugin's init function on failure. - int load(std::string &plugin_file); + int load(const std::string& plugin_dir, std::string &plugin_file); // Sends a message to the plugin. void sendMessage(const std::string &message); diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp index d014cf9bb..a85a0343d 100644 --- a/indra/llplugin/llpluginprocesschild.cpp +++ b/indra/llplugin/llpluginprocesschild.cpp @@ -146,7 +146,7 @@ void LLPluginProcessChild::idle(void) if(!mPluginFile.empty()) { mInstance = new LLPluginInstance(this); - if(mInstance->load(mPluginFile) == 0) + if(mInstance->load(mPluginDir, mPluginFile) == 0) { mHeartbeat.start(); mHeartbeat.setTimerExpirySec(HEARTBEAT_SECONDS); @@ -372,6 +372,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message) if(message_name == "load_plugin") { mPluginFile = parsed.getValue("file"); + mPluginDir = parsed.getValue("dir"); } else if(message_name == "shm_add") { diff --git a/indra/llplugin/llpluginprocesschild.h b/indra/llplugin/llpluginprocesschild.h index 66082db7c..53dcccb81 100644 --- a/indra/llplugin/llpluginprocesschild.h +++ b/indra/llplugin/llpluginprocesschild.h @@ -101,6 +101,7 @@ private: LLSocket::ptr_t mSocket; std::string mPluginFile; + std::string mPluginDir; LLPluginInstance *mInstance; diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp index 685485fc1..cdb8ec88a 100644 --- a/indra/llplugin/llpluginprocessparent.cpp +++ b/indra/llplugin/llpluginprocessparent.cpp @@ -114,7 +114,6 @@ LLPluginProcessParent::LLPluginProcessParent(LLPluginProcessParentOwner *owner) // Don't start the timer here -- start it when we actually launch the plugin process. mHeartbeat.stop(); - // Don't add to the global list until fully constructed. { @@ -173,10 +172,12 @@ void LLPluginProcessParent::errorState(void) setState(STATE_ERROR); } -void LLPluginProcessParent::init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug) +void LLPluginProcessParent::init(const std::string &launcher_filename, const std::string &plugin_dir, const std::string &plugin_filename, bool debug) { mProcess.setExecutable(launcher_filename); + mProcess.setWorkingDirectory(plugin_dir); mPluginFile = plugin_filename; + mPluginDir = plugin_dir; mCPUUsage = 0.0f; mDebug = debug; setState(STATE_INITIALIZED); @@ -483,6 +484,7 @@ void LLPluginProcessParent::idle(void) { LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_INTERNAL, "load_plugin"); message.setValue("file", mPluginFile); + message.setValue("dir", mPluginDir); sendMessage(message); } diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h index 28e8edd19..d5a08c435 100644 --- a/indra/llplugin/llpluginprocessparent.h +++ b/indra/llplugin/llpluginprocessparent.h @@ -67,6 +67,7 @@ public: ~LLPluginProcessParent(); void init(const std::string &launcher_filename, + const std::string &plugin_dir, const std::string &plugin_filename, bool debug); @@ -166,12 +167,13 @@ private: LLProcessLauncher mProcess; std::string mPluginFile; + std::string mPluginDir; LLPluginProcessParentOwner *mOwner; - + typedef std::map sharedMemoryRegionsType; sharedMemoryRegionsType mSharedMemoryRegions; - + LLSD mMessageClassVersions; std::string mPluginVersionString; @@ -194,7 +196,7 @@ private: apr_pollfd_t mPollFD; LLAPRPool mPollFDPool; static apr_pollset_t *sPollSet; - static LLAPRPool sPollSetPool; + static LLAPRPool sPollSetPool; static bool sPollsetNeedsRebuild; static LLMutex *sInstancesMutex; static std::list sInstances; diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 061fb48e7..1e698adfc 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -352,7 +352,10 @@ void LLImageGL::destroyGL(BOOL save_state) glimage->mSaveData = NULL ; } else + { + glimage->mSaveDiscardLevel = glimage->mCurrentDiscardLevel; stored_count++; + } } glimage->destroyGLTexture(); @@ -379,13 +382,14 @@ void LLImageGL::restoreGL() } if (glimage->mSaveData.notNull()) { - if (glimage->getComponents() && glimage->mSaveData->getComponents()) + if (glimage->getComponents() && glimage->mSaveData->getComponents() && glimage->mSaveDiscardLevel >= 0) { - glimage->createGLTexture(glimage->mCurrentDiscardLevel, glimage->mSaveData, 0, TRUE, glimage->getCategory()); + glimage->createGLTexture(glimage->mSaveDiscardLevel, glimage->mSaveData, 0, TRUE, glimage->getCategory()); stop_glerror(); recovered_count++; } glimage->mSaveData = NULL; // deletes data + glimage->mSaveDiscardLevel = -1; } } llinfos << "Restored " << recovered_count << " images" << llendl; @@ -430,7 +434,7 @@ BOOL LLImageGL::create(LLPointer& dest, const LLImageRaw* imageraw, B //---------------------------------------------------------------------------- LLImageGL::LLImageGL(BOOL usemipmaps) - : mSaveData(0) + : mSaveData(0), mSaveDiscardLevel(-1) { init(usemipmaps); setSize(0, 0, 0); @@ -439,7 +443,7 @@ LLImageGL::LLImageGL(BOOL usemipmaps) } LLImageGL::LLImageGL(U32 width, U32 height, U8 components, BOOL usemipmaps) - : mSaveData(0) + : mSaveData(0), mSaveDiscardLevel(-1) { llassert( components <= 4 ); init(usemipmaps); @@ -449,7 +453,7 @@ LLImageGL::LLImageGL(U32 width, U32 height, U8 components, BOOL usemipmaps) } LLImageGL::LLImageGL(const LLImageRaw* imageraw, BOOL usemipmaps) - : mSaveData(0) + : mSaveData(0), mSaveDiscardLevel(-1) { init(usemipmaps); setSize(0, 0, 0); @@ -1415,6 +1419,8 @@ BOOL LLImageGL::readBackRaw(S32 discard_level, LLImageRaw* imageraw, bool compre if (discard_level < 0) { discard_level = mCurrentDiscardLevel; + if(discard_level < 0) + return FALSE; } if (mTexName == 0 || discard_level < mCurrentDiscardLevel || discard_level > mMaxDiscardLevel ) diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h index e90b242e1..a80dd0998 100644 --- a/indra/llrender/llimagegl.h +++ b/indra/llrender/llimagegl.h @@ -183,6 +183,7 @@ public: private: LLPointer mSaveData; // used for destroyGL/restoreGL + S32 mSaveDiscardLevel; U8* mPickMask; //downsampled bitmap approximation of alpha channel. NULL if no alpha channel U16 mPickMaskWidth; U16 mPickMaskHeight; diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 63e0d3e83..0c17fbfb5 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -718,20 +718,33 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade } else if (major_version > 1 || minor_version >= 30) { //switches are supported in GLSL 1.30 and later - text[count++] = strdup("\tvec4 ret = vec4(1,0,1,1);\n"); - text[count++] = strdup("\tswitch (vary_texture_index.r)\n"); - text[count++] = strdup("\t{\n"); - - //switch body - for (S32 i = 0; i < texture_index_channels; ++i) - { - std::string case_str = llformat("\t\tcase %d: ret = texture2D(tex%d, texcoord); break;\n", i, i); - text[count++] = strdup(case_str.c_str()); + if (gGLManager.mIsNVIDIA) + { //switches are unreliable on some NVIDIA drivers + for (S32 i = 0; i < texture_index_channels; ++i) + { + std::string if_string = llformat("\t%sif (vary_texture_index.r == %d) { return texture2D(tex%d, texcoord); }\n", i > 0 ? "else " : "", i, i); + text[count++] = strdup(if_string.c_str()); + } + text[count++] = strdup("\treturn vec4(1,0,1,1);\n"); + text[count++] = strdup("}\n"); } + else + { + text[count++] = strdup("\tvec4 ret = vec4(1,0,1,1);\n"); + text[count++] = strdup("\tswitch (vary_texture_index.r)\n"); + text[count++] = strdup("\t{\n"); + + //switch body + for (S32 i = 0; i < texture_index_channels; ++i) + { + std::string case_str = llformat("\t\tcase %d: ret = texture2D(tex%d, texcoord); break;\n", i, i); + text[count++] = strdup(case_str.c_str()); + } - text[count++] = strdup("\t}\n"); - text[count++] = strdup("\treturn ret;\n"); - text[count++] = strdup("}\n"); + text[count++] = strdup("\t}\n"); + text[count++] = strdup("\treturn ret;\n"); + text[count++] = strdup("}\n"); + } } else { //should never get here. Indexed texture rendering requires GLSL 1.30 or later diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index de2843db4..bc4c201d9 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -39,10 +39,8 @@ #include "llmemory.h" #include "llfasttimer.h" -#if LL_DARWIN -#define LL_VBO_POOLING 1 -#else -#endif +#define LL_VBO_POOLING 0 + //Next Highest Power Of Two //helper function, returns first number > v that is a power of 2, or v if v is already a power of 2 U32 nhpo2(U32 v) @@ -70,7 +68,6 @@ U32 wpo2(U32 i) const U32 LL_VBO_BLOCK_SIZE = 2048; -const U32 LL_VBO_POOL_MAX_SEED_SIZE = 256*1024; U32 vbo_block_size(U32 size) { //what block size will fit size? @@ -83,7 +80,6 @@ U32 vbo_block_index(U32 size) return vbo_block_size(size)/LL_VBO_BLOCK_SIZE; } -const U32 LL_VBO_POOL_SEED_COUNT = vbo_block_index(LL_VBO_POOL_MAX_SEED_SIZE); //============================================================================ @@ -96,11 +92,6 @@ LLVBOPool LLVertexBuffer::sDynamicIBOPool(GL_DYNAMIC_DRAW_ARB, GL_ELEMENT_ARRAY_ U32 LLVBOPool::sBytesPooled = 0; U32 LLVBOPool::sIndexBytesPooled = 0; -U32 LLVBOPool::sCurGLName = 1; - -std::list LLVertexBuffer::sAvailableVAOName; -U32 LLVertexBuffer::sCurVAOName = 1; - U32 LLVertexBuffer::sAllocatedIndexBytes = 0; U32 LLVertexBuffer::sIndexCount = 0; @@ -110,7 +101,7 @@ U32 LLVertexBuffer::sSetCount = 0; S32 LLVertexBuffer::sCount = 0; S32 LLVertexBuffer::sGLCount = 0; S32 LLVertexBuffer::sMappedCount = 0; -bool LLVertexBuffer::sDisableVBOMapping = false; +bool LLVertexBuffer::sDisableVBOMapping = true; //Temporary workaround for vbo mapping being straight up broken bool LLVertexBuffer::sEnableVBOs = true; U32 LLVertexBuffer::sGLRenderBuffer = 0; U32 LLVertexBuffer::sGLRenderArray = 0; @@ -126,54 +117,14 @@ bool LLVertexBuffer::sUseVAO = false; bool LLVertexBuffer::sPreferStreamDraw = false; -U32 LLVBOPool::genBuffer() -{ - U32 ret = 0; - - if (mGLNamePool.empty()) - { - ret = sCurGLName++; - } - else - { - ret = mGLNamePool.front(); - mGLNamePool.pop_front(); - } - - return ret; -} - -void LLVBOPool::deleteBuffer(U32 name) -{ - if (gGLManager.mInited) - { - LLVertexBuffer::unbind(); - - glBindBufferARB(mType, name); - glBufferDataARB(mType, 0, NULL, mUsage); - - llassert(std::find(mGLNamePool.begin(), mGLNamePool.end(), name) == mGLNamePool.end()); - - mGLNamePool.push_back(name); - - glBindBufferARB(mType, 0); - } -} - - -LLVBOPool::LLVBOPool(U32 vboUsage, U32 vboType) -: mUsage(vboUsage), mType(vboType) -{ - mMissCount.resize(LL_VBO_POOL_SEED_COUNT); - std::fill(mMissCount.begin(), mMissCount.end(), 0); -} - -volatile U8* LLVBOPool::allocate(U32& name, U32 size, bool for_seed) +volatile U8* LLVBOPool::allocate(U32& name, U32 size) { llassert(vbo_block_size(size) == size); volatile U8* ret = NULL; +#if LL_VBO_POOLING + U32 i = vbo_block_index(size); if (mFreeList.size() <= i) @@ -181,31 +132,25 @@ volatile U8* LLVBOPool::allocate(U32& name, U32 size, bool for_seed) mFreeList.resize(i+1); } - if (mFreeList[i].empty() || for_seed) + if (mFreeList[i].empty()) { //make a new buffer - name = genBuffer(); - + glGenBuffersARB(1, &name); glBindBufferARB(mType, name); - if (!for_seed && i < LL_VBO_POOL_SEED_COUNT) - { //record this miss - mMissCount[i]++; - } - if (mType == GL_ARRAY_BUFFER_ARB) { LLVertexBuffer::sAllocatedBytes += size; } else - { - LLVertexBuffer::sAllocatedIndexBytes += size; - } + { + LLVertexBuffer::sAllocatedIndexBytes += size; + } - if (LLVertexBuffer::sDisableVBOMapping || mUsage != GL_DYNAMIC_DRAW_ARB) - { - glBufferDataARB(mType, size, 0, mUsage); - ret = (U8*) ll_aligned_malloc_16(size); + if (LLVertexBuffer::sDisableVBOMapping || mUsage != GL_DYNAMIC_DRAW_ARB) + { + glBufferDataARB(mType, size, 0, mUsage); + ret = (U8*) ll_aligned_malloc_16(size); } else { //always use a true hint of static draw when allocating non-client-backed buffers @@ -213,25 +158,6 @@ volatile U8* LLVBOPool::allocate(U32& name, U32 size, bool for_seed) } glBindBufferARB(mType, 0); - - if (for_seed) - { //put into pool for future use - llassert(mFreeList.size() > i); - - Record rec; - rec.mGLName = name; - rec.mClientData = ret; - - if (mType == GL_ARRAY_BUFFER_ARB) - { - sBytesPooled += size; - } - else - { - sIndexBytesPooled += size; - } - mFreeList[i].push_back(rec); - } } else { @@ -249,6 +175,33 @@ volatile U8* LLVBOPool::allocate(U32& name, U32 size, bool for_seed) mFreeList[i].pop_front(); } +#else //no pooling + + glGenBuffersARB(1, &name); + glBindBufferARB(mType, name); + + if (mType == GL_ARRAY_BUFFER_ARB) + { + LLVertexBuffer::sAllocatedBytes += size; + } + else + { + LLVertexBuffer::sAllocatedIndexBytes += size; + } + + if (LLVertexBuffer::sDisableVBOMapping || mUsage != GL_DYNAMIC_DRAW_ARB) + { + glBufferDataARB(mType, size, 0, mUsage); + ret = (U8*) ll_aligned_malloc_16(size); + } + else + { //always use a true hint of static draw when allocating non-client-backed buffers + glBufferDataARB(mType, size, 0, GL_STATIC_DRAW_ARB); + } + + glBindBufferARB(mType, 0); + +#endif return ret; } @@ -257,7 +210,34 @@ void LLVBOPool::release(U32 name, volatile U8* buffer, U32 size) { llassert(vbo_block_size(size) == size); - deleteBuffer(name); +#if LL_VBO_POOLING + + U32 i = vbo_block_index(size); + + llassert(mFreeList.size() > i); + + Record rec; + rec.mGLName = name; + rec.mClientData = buffer; + + if (buffer == NULL) + { + glDeleteBuffersARB(1, &rec.mGLName); + } + else + { + if (mType == GL_ARRAY_BUFFER_ARB) + { + sBytesPooled += size; + } + else + { + sIndexBytesPooled += size; + } + mFreeList[i].push_back(rec); + } +#else //no pooling + glDeleteBuffersARB(1, &name); ll_aligned_free_16((U8*) buffer); if (mType == GL_ARRAY_BUFFER_ARB) @@ -268,36 +248,12 @@ void LLVBOPool::release(U32 name, volatile U8* buffer, U32 size) { LLVertexBuffer::sAllocatedIndexBytes -= size; } +#endif } -void LLVBOPool::seedPool() -{ - U32 dummy_name = 0; - - if (mFreeList.size() < LL_VBO_POOL_SEED_COUNT) - { - mFreeList.resize(LL_VBO_POOL_SEED_COUNT); - } - - for (U32 i = 0; i < LL_VBO_POOL_SEED_COUNT; i++) - { - if (mMissCount[i] > mFreeList[i].size()) - { - U32 size = i*LL_VBO_BLOCK_SIZE; - - S32 count = mMissCount[i] - mFreeList[i].size(); - for (S32 j = 0; j < count; ++j) - { - allocate(dummy_name, size, true); - } - } - } -} - - void LLVBOPool::cleanup() { - U32 size = LL_VBO_BLOCK_SIZE; + U32 size = 1; for (U32 i = 0; i < mFreeList.size(); ++i) { @@ -307,8 +263,8 @@ void LLVBOPool::cleanup() { Record& r = l.front(); - deleteBuffer(r.mGLName); - + glDeleteBuffersARB(1, &r.mGLName); + if (r.mClientData) { ll_aligned_free_16((void*) r.mClientData); @@ -328,11 +284,8 @@ void LLVBOPool::cleanup() } } - size += LL_VBO_BLOCK_SIZE; + size *= 2; } - - //reset miss counts - std::fill(mMissCount.begin(), mMissCount.end(), 0); } @@ -366,41 +319,6 @@ U32 LLVertexBuffer::sGLMode[LLRender::NUM_MODES] = GL_LINE_LOOP, }; -//static -U32 LLVertexBuffer::getVAOName() -{ - U32 ret = 0; - - if (!sAvailableVAOName.empty()) - { - ret = sAvailableVAOName.front(); - sAvailableVAOName.pop_front(); - } - else - { -#ifdef GL_ARB_vertex_array_object - glGenVertexArrays(1, &ret); -#endif - } - - return ret; -} - -//static -void LLVertexBuffer::releaseVAOName(U32 name) -{ - sAvailableVAOName.push_back(name); -} - - -//static -void LLVertexBuffer::seedPools() -{ - sStreamVBOPool.seedPool(); - sDynamicVBOPool.seedPool(); - sStreamIBOPool.seedPool(); - sDynamicIBOPool.seedPool(); -} //static void LLVertexBuffer::setupClientArrays(U32 data_mask) @@ -820,7 +738,7 @@ void LLVertexBuffer::drawArrays(U32 mode, U32 first, U32 count) const void LLVertexBuffer::initClass(bool use_vbo, bool no_vbo_mapping) { sEnableVBOs = use_vbo && gGLManager.mHasVertexBufferObject; - sDisableVBOMapping = sEnableVBOs && no_vbo_mapping; + sDisableVBOMapping = sEnableVBOs;// && no_vbo_mapping; //Temporary workaround for vbo mapping being straight up broken if (!sPrivatePoolp) { @@ -1010,7 +928,7 @@ LLVertexBuffer::~LLVertexBuffer() if (mGLArray) { #if GL_ARB_vertex_array_object - releaseVAOName(mGLArray); + glDeleteVertexArrays(1, &mGLArray); #endif } @@ -1295,7 +1213,7 @@ void LLVertexBuffer::allocateBuffer(S32 nverts, S32 nindices, bool create) if (gGLManager.mHasVertexArrayObject && useVBOs() && (LLRender::sGLCoreProfile || sUseVAO)) { #if GL_ARB_vertex_array_object - mGLArray = getVAOName(); + glGenVertexArrays(1, &mGLArray); #endif setupVertexArray(); } @@ -2165,16 +2083,6 @@ void LLVertexBuffer::flush() } } -// bind for transform feedback (quick 'n dirty) -void LLVertexBuffer::bindForFeedback(U32 channel, U32 type, U32 index, U32 count) -{ -#ifdef GL_TRANSFORM_FEEDBACK_BUFFER - U32 offset = mOffsets[type] + sTypeSize[type]*index; - U32 size= (sTypeSize[type]*count); - glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, channel, mGLBuffer, offset, size); -#endif -} - // Set for rendering void LLVertexBuffer::setBuffer(U32 data_mask) { diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h index 14438a95e..469acfcef 100644 --- a/indra/llrender/llvertexbuffer.h +++ b/indra/llrender/llvertexbuffer.h @@ -56,29 +56,24 @@ class LLVBOPool public: static U32 sBytesPooled; static U32 sIndexBytesPooled; - - static U32 sCurGLName; - LLVBOPool(U32 vboUsage, U32 vboType); - + LLVBOPool(U32 vboUsage, U32 vboType) + : mUsage(vboUsage) + , mType(vboType) + {} + const U32 mUsage; const U32 mType; //size MUST be a power of 2 - volatile U8* allocate(U32& name, U32 size, bool for_seed = false); + volatile U8* allocate(U32& name, U32 size); //size MUST be the size provided to allocate that returned the given name void release(U32 name, volatile U8* buffer, U32 size); - //batch allocate buffers to be provided to the application on demand - void seedPool(); - //destroy all records in mFreeList void cleanup(); - U32 genBuffer(); - void deleteBuffer(U32 name); - class Record { public: @@ -86,13 +81,11 @@ public: volatile U8* mClientData; }; - std::list mGLNamePool; - typedef std::list record_list_t; std::vector mFreeList; - std::vector mMissCount; }; + //============================================================================ // base class class LLPrivateMemoryPool; @@ -126,22 +119,13 @@ public: static LLVBOPool sStreamIBOPool; static LLVBOPool sDynamicIBOPool; - static std::list sAvailableVAOName; - static U32 sCurVAOName; - static bool sUseStreamDraw; static bool sUseVAO; static bool sPreferStreamDraw; - static void seedPools(); - - static U32 getVAOName(); - static void releaseVAOName(U32 name); - static void initClass(bool use_vbo, bool no_vbo_mapping); static void cleanupClass(); static void setupClientArrays(U32 data_mask); - static void pushPositions(U32 mode, const LLVector4a* pos, U32 count); static void drawArrays(U32 mode, const std::vector& pos, const std::vector& norm); static void drawElements(U32 mode, const LLVector4a* pos, const LLVector2* tc, S32 num_indices, const U16* indicesp); @@ -218,6 +202,7 @@ protected: void destroyGLIndices(); void updateNumVerts(S32 nverts); void updateNumIndices(S32 nindices); + bool useVBOs() const; void unmapBuffer(); public: @@ -227,8 +212,6 @@ public: volatile U8* mapVertexBuffer(S32 type, S32 index, S32 count, bool map_range); volatile U8* mapIndexBuffer(S32 index, S32 count, bool map_range); - void bindForFeedback(U32 channel, U32 type, U32 index, U32 count); - // set for rendering virtual void setBuffer(U32 data_mask); // calls setupVertexBuffer() if data_mask is not 0 void flush(); //flush pending data to GL memory @@ -251,14 +234,12 @@ public: bool getNormalStrider(LLStrider& strider, S32 index=0, S32 count = -1, bool map_range = false); bool getBinormalStrider(LLStrider& strider, S32 index=0, S32 count = -1, bool map_range = false); bool getColorStrider(LLStrider& strider, S32 index=0, S32 count = -1, bool map_range = false); - bool getTextureIndexStrider(LLStrider& strider, S32 index=0, S32 count = -1, bool map_range = false); bool getEmissiveStrider(LLStrider& strider, S32 index=0, S32 count = -1, bool map_range = false); bool getWeightStrider(LLStrider& strider, S32 index=0, S32 count = -1, bool map_range = false); bool getWeight4Strider(LLStrider& strider, S32 index=0, S32 count = -1, bool map_range = false); bool getClothWeightStrider(LLStrider& strider, S32 index=0, S32 count = -1, bool map_range = false); - bool useVBOs() const; bool isEmpty() const { return mEmpty; } bool isLocked() const { return mVertexLocked || mIndexLocked; } S32 getNumVerts() const { return mNumVerts; } diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index 4dbffde3a..bf5fc316d 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -809,7 +809,11 @@ void gl_stippled_line_3d( const LLVector3& start, const LLVector3& end, const LL gGL.flush(); glLineWidth(2.5f); - glLineStipple(2, 0x3333 << shift); + if (!LLGLSLShader::sNoFixedFunction) + { + glLineStipple(2, 0x3333 << shift); + } + gGL.begin(LLRender::LINES); { diff --git a/indra/llwindow/glh/glh_linear.h b/indra/llwindow/glh/glh_linear.h old mode 100644 new mode 100755 diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index bbb8b5eb4..26e29533c 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -17,7 +17,7 @@ if(NOT FMODEX) include(FMOD) endif(NOT FMODEX) include(OPENAL) -include(HUNSPELL) +include(Hunspell) include(FindOpenGL) #include(JsonCpp) include(LLAddBuildTest) @@ -98,8 +98,8 @@ set(viewer_SOURCE_FILES ascentprefschat.cpp ascentprefssys.cpp ascentprefsvan.cpp - dhparam.cpp - dsaparam.cpp + #dhparam.cpp + #dsaparam.cpp emeraldboobutils.cpp dofloaterhex.cpp dohexeditor.cpp @@ -111,6 +111,7 @@ set(viewer_SOURCE_FILES hippolimits.cpp hipporestrequest.cpp hippopanelgrids.cpp + importtracker.cpp jcfloaterareasearch.cpp chatbar_as_cmdline.cpp qtoolalign.cpp @@ -170,6 +171,7 @@ set(viewer_SOURCE_FILES lldrawpoolwater.cpp lldrawpoolwlsky.cpp lldriverparam.cpp + lldroptarget.cpp lldynamictexture.cpp llemote.cpp lleventinfo.cpp @@ -604,6 +606,7 @@ set(viewer_HEADER_FILES hippolimits.h hipporestrequest.h hippopanelgrids.h + importtracker.h jcfloaterareasearch.h lggdicdownload.h lgghunspell_wrapper.h @@ -666,6 +669,7 @@ set(viewer_HEADER_FILES lldrawpoolwater.h lldrawpoolwlsky.h lldriverparam.h + lldroptarget.h lldynamictexture.h llemote.h lleventinfo.h diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index dfe079264..f43dad8a0 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -21,6 +21,19 @@ 1 + SianaVoidWaterSubdivision + + Comment + Number of tiles of void water + Persist + 1 + Type + U32 + Value + 8 + + + SGAbsolutePointer Comment @@ -759,7 +772,7 @@ Type Boolean Value - 1 + 0 PrivateLookAt @@ -2189,38 +2202,16 @@ Value http://www.singularityviewer.org - BrowserCookiesEnabled + BrowserIgnoreSSLCertErrors Comment - Enable Cookes in WebKit + FOR TESTING ONLY: Tell the built-in web browser to ignore SSL cert errors. Persist 1 Type Boolean Value - 1 - - BrowserPluginsEnabled - - Comment - Enable Mozilla Plug-Ins in WebKit - Persist - 1 - Type - Boolean - Value - 1 - - BrowserJavascriptEnabled - - Comment - Enable JavaScript execution in WebKit - Persist - 1 - Type - Boolean - Value - 1 + 0 PluginAttachDebuggerToPlugins @@ -3927,6 +3918,28 @@ Value 1 + BrowserJavascriptEnabled + + Comment + Enable Javascript in the built-in Web browser? + Persist + 1 + Type + Boolean + Value + 1 + + BrowserPluginsEnabled + + Comment + Enable Web plugins in the built-in Web browser? + Persist + 1 + Type + Boolean + Value + 1 + CreateToolCopyCenters Comment @@ -8185,6 +8198,17 @@ Value 0 + MediaPluginDebugging + + Comment + Turn on debugging messages that may help diagnosing media issues (WARNING: May reduce performance). + Persist + 1 + Type + Boolean + Value + 0 + MediaControlFadeTime Comment @@ -8249,7 +8273,7 @@ Type Boolean Value - 0 + 0 MemoryPrivatePoolSize @@ -8492,7 +8516,7 @@ 29 - DisableWindAudio + MuteWind Comment Disable the wind audio effect diff --git a/indra/newview/app_settings/settings_ascent.xml b/indra/newview/app_settings/settings_ascent.xml index bcd1c2864..5a77d0f50 100644 --- a/indra/newview/app_settings/settings_ascent.xml +++ b/indra/newview/app_settings/settings_ascent.xml @@ -125,17 +125,6 @@ Value :: - AscentHideTypingNotification - - Comment - Keep those jerks guessing by hiding your "____ is typing..." message. - Persist - 1 - Type - Boolean - Value - 1 - AscentShowSelfTag Comment diff --git a/indra/newview/app_settings/settings_ascent_coa.xml b/indra/newview/app_settings/settings_ascent_coa.xml index ca4baa6d4..9c94281c4 100644 --- a/indra/newview/app_settings/settings_ascent_coa.xml +++ b/indra/newview/app_settings/settings_ascent_coa.xml @@ -44,7 +44,20 @@ Type Boolean Value + 0 + IsCOA 1 + + AscentHideTypingNotification + + Comment + Keep those jerks guessing by hiding your "____ is typing..." message. + Persist + 1 + Type + Boolean + Value + 0 IsCOA 1 @@ -191,5 +204,164 @@ 1 + BuildPrefs_Xsize + + Comment + Default Size For New Objects to be created X + Persist + 1 + Type + F32 + Value + 0.5 + + BuildPrefs_Ysize + + Comment + Default Size For New Objects to be created Y + Persist + 1 + Type + F32 + Value + 0.5 + + BuildPrefs_Zsize + + Comment + Default Size For New Objects to be created Z + Persist + 1 + Type + F32 + Value + 0.5 + + EmeraldBuildPrefs_Phantom + + Comment + Default Setting For New Objects to be created, phantom flag + Persist + 1 + Type + Boolean + Value + 0 + + EmeraldBuildPrefs_Temporary + + Comment + Default Setting For New Objects to be created, temp flag + Persist + 1 + Type + Boolean + Value + 0 + + EmeraldBuildPrefs_Physical + + Comment + Default Setting For New Objects to be created, physical flag + Persist + 1 + Type + Boolean + Value + 0 + + EmeraldBuildPrefs_EmbedItem + + Comment + Whether to add item to objects + Persist + 1 + Type + Boolean + Value + 0 + + BuildPrefs_Material + + Comment + Default Setting For New Objects to be created, physical flag + Persist + 1 + Type + String + Value + Wood + + EmeraldBuildPrefs_Color + + Comment + Color of new objects textures + Persist + 1 + Type + Color4 + Value + + 1.0 + 1.0 + 1.0 + 1.0 + + + EmeraldBuildPrefs_Texture + + Comment + Texture used as 'Default' for new object created + Persist + 1 + Type + String + Value + 89556747-24cb-43ed-920b-47caed15465f + + EmeraldBuildPrefs_Alpha + + Comment + Default Alpha For New Objects to be created + Persist + 1 + Type + F32 + Value + 0.0 + + EmeraldBuildPrefs_Glow + + Comment + Default Glow For New Objects to be created + Persist + 1 + Type + F32 + Value + 0.0 + + EmeraldBuildPrefs_FullBright + + Comment + Default Setting For New Objects to be created, whether textures are full bright + Persist + 1 + Type + Boolean + Value + 0 + + EmeraldBuildPrefs_Shiny + + Comment + Shiny level used as 'Default' for new objects created + Persist + 1 + Type + String + Value + None + diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index 97ff2cd19..ba157bd6a 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -314,14 +314,6 @@ Value 0 - - - - - - - - RLVaLoginLastLocation Comment @@ -631,6 +623,17 @@ Value + EmeraldBuildPrefs_Item + + Comment + UUID of item added to new object created + Persist + 1 + Type + String + Value + + diff --git a/indra/newview/app_settings/windlight/days/%5BNB%5D%20Aftermath.xml b/indra/newview/app_settings/windlight/days/%5BNB%5D%20Aftermath.xml new file mode 100644 index 000000000..00ce4ddd0 --- /dev/null +++ b/indra/newview/app_settings/windlight/days/%5BNB%5D%20Aftermath.xml @@ -0,0 +1,28 @@ + + + + 0.003472220851108431816101074 + [NB] Aftermath 0000 + + + 0.2083332538604736328125 + [NB] Aftermath 0500 + + + 0.4131942689418792724609375 + [NB] Aftermath 1200 + + + 0.652777493000030517578125 + [NB] Aftermath 1630 + + + 0.760416328907012939453125 + [NB] Aftermath 1750 + + + 0.843749701976776123046875 + [NB] Aftermath 2000 + + + diff --git a/indra/newview/app_settings/windlight/days/%5BNB%5D%20P-Haze.xml b/indra/newview/app_settings/windlight/days/%5BNB%5D%20P-Haze.xml new file mode 100644 index 000000000..26f3258b8 --- /dev/null +++ b/indra/newview/app_settings/windlight/days/%5BNB%5D%20P-Haze.xml @@ -0,0 +1,32 @@ + + + + 0.003472220851108431816101074 + [NB] P-Haze 0000 + + + 0.1840276867151260375976562 + [NB] P-Haze 0430 + + + 0.333333194255828857421875 + [NB] P-Haze 0800 + + + 0.4999997913837432861328125 + [NB] P-Haze 1200 + + + 0.66666638851165771484375 + [NB] P-Haze 1700 + + + 0.749999701976776123046875 + [NB] P-Haze 1800 + + + 0.83333301544189453125 + [NB] P-Haze 2000 + + + diff --git a/indra/newview/app_settings/windlight/days/%5BNB%5D%20Sepia.xml b/indra/newview/app_settings/windlight/days/%5BNB%5D%20Sepia.xml new file mode 100644 index 000000000..32f918563 --- /dev/null +++ b/indra/newview/app_settings/windlight/days/%5BNB%5D%20Sepia.xml @@ -0,0 +1,32 @@ + + + + 0.003472220851108431816101074 + [NB] Sepia 0000 + + + 0.1840276867151260375976562 + [NB] Sepia 0430 + + + 0.333333194255828857421875 + [NB] Sepia 0800 + + + 0.4999997913837432861328125 + [NB] Sepia 1200 + + + 0.66666638851165771484375 + [NB] Sepia 1700 + + + 0.749999701976776123046875 + [NB] Sepia 1800 + + + 0.83333301544189453125 + [NB] Sepia 2000 + + + diff --git a/indra/newview/app_settings/windlight/days/%5BNB%5D-MistyDay.xml b/indra/newview/app_settings/windlight/days/%5BNB%5D-MistyDay.xml new file mode 100644 index 000000000..9d975fa69 --- /dev/null +++ b/indra/newview/app_settings/windlight/days/%5BNB%5D-MistyDay.xml @@ -0,0 +1,44 @@ + + + + 0.1666665971279144287109375 + [NB]-MistyDay-4am + + + 0.229166567325592041015625 + [NB]-MistyDay-5am + + + 0.2499998956918716430664062 + [NB]-MistyDay-6am + + + 0.4999997913837432861328125 + [NB]-MistyDay-12pm + + + 0.66666638851165771484375 + [NB]-MistyDay-4pm + + + 0.70833301544189453125 + [NB]-MistyDay-5pm + + + 0.743055284023284912109375 + [NB]-MistyDay-6pm + + + 0.77083301544189453125 + [NB]-MistyDay-7pm + + + 0.874999582767486572265625 + [NB]-MistyDay-9pm + + + 0.996527373790740966796875 + [NB]-MistyDay-12am + + + diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio1.xml b/indra/newview/app_settings/windlight/skies/%252ACanimod.xml similarity index 66% rename from indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio1.xml rename to indra/newview/app_settings/windlight/skies/%252ACanimod.xml index ca448d0d7..d4e69e622 100644 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio1.xml +++ b/indra/newview/app_settings/windlight/skies/%252ACanimod.xml @@ -2,17 +2,17 @@ ambient - 0.51940256357192993 - 0.61718720197677612 - 0.84000003337860107 - 0.2800000011920929 + 1.4699999094009399 + 1.4699999094009399 + 1.4699999094009399 + 0.48999997973442078 blue_density - 0.14522500336170197 - 0.39999699592590332 - 0.80000197887420654 - 1 + 0.099999994039535522 + 0.037499997764825821 + 0.067499987781047821 + 0.049999997019767761 blue_horizon @@ -23,60 +23,60 @@ cloud_color - 0.12862999737262726 - 0.12862999737262726 - 0.12862999737262726 - 1 + 0.22999998927116394 + 0.22999998927116394 + 0.22999998927116394 + 0.22999998927116394 cloud_pos_density1 0.88419097661972046 0.53047597408294678 - 0.4270470142364502 + 0.52999997138977051 1 cloud_pos_density2 - 0.38419300317764282 - 0.5 - 0.125 + 0.2800000011920929 + 0.19999998807907104 + 0.31999999284744263 1 cloud_scale - 0.41999998688697815 + 0.0099999997764825821 0 0 1 cloud_scroll_rate - 10 - 10 + 0 + 15.329999446868896 cloud_shadow - 0.59999996423721313 + 0 0 0 1 density_multiplier - 7.9999997979030013e-005 + 0.00022000000171829015 0 0 1 distance_multiplier - 11.40000057220459 + 16.200000762939453 0 0 1 east_angle - 0 + 6.2831854820251465 enable_cloud_scroll 1 @@ -84,42 +84,42 @@ gamma - 1.0099999904632568 + 1.4199999570846558 0 0 1 glow - 6.4079799652099609 + 18.599998474121094 0.0012815999798476696 - -0.42292699217796326 + 0 1 haze_density - 4 + 0 0 0 1 haze_horizon - 0.21744099259376526 + 1 0.21744099259376526 0.21744099259376526 1 lightnorm - -0 - 0.21200713515281677 - 0.97726809978485107 + -1.7484555314695172e-007 + 0 + 1 0 max_y - 4000 + 403 0 0 1 @@ -129,13 +129,13 @@ star_brightness 0 sun_angle - 0.21362832188606262 + 0 sunlight_color - 3 - 3 - 3 - 1 + 0 + 0 + 0 + 0 diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20shadows.xml b/indra/newview/app_settings/windlight/skies/%252AStarley%252A%20Settings%202.xml similarity index 75% rename from indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20shadows.xml rename to indra/newview/app_settings/windlight/skies/%252AStarley%252A%20Settings%202.xml index 01d06a1e6..6d1c09d30 100644 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20shadows.xml +++ b/indra/newview/app_settings/windlight/skies/%252AStarley%252A%20Settings%202.xml @@ -2,24 +2,24 @@ ambient - 0.2226010262966156 - 0.26450860500335693 - 0.35999998450279236 - 0.11999999731779099 + 1.4699999094009399 + 1.4699999094009399 + 1.4699999094009399 + 0.48999997973442078 blue_density - 0.14522500336170197 - 0.39999699592590332 - 0.80000197887420654 - 1 + 0.14000000059604645 + 0.14000000059604645 + 0.14000000059604645 + 0.070000000298023224 blue_horizon - 0.15130999684333801 - 0.30000001192092896 - 0.35131001472473145 - 1 + 0.83809572458267212 + 1.0735483169555664 + 1.2799999713897705 + 0.63999998569488525 cloud_color @@ -30,7 +30,7 @@ cloud_pos_density1 - 0.88419097661972046 + 0.70999997854232788 0.53047597408294678 0.4270470142364502 1 @@ -44,7 +44,7 @@ cloud_scale - 0.41999998688697815 + 0.72999995946884155 0 0 1 @@ -56,14 +56,14 @@ cloud_shadow - 0 + 0.2199999988079071 0 0 1 density_multiplier - 0.0001250890054507181 + 0.00017999998817685992 0 0 1 @@ -76,7 +76,7 @@ 1 east_angle - 1.8849555253982544 + 0 enable_cloud_scroll 1 @@ -84,42 +84,42 @@ gamma - 1.7300000190734863 + 1.6899999380111694 0 0 1 glow - 0.19999980926513672 + 6.4079799652099609 0.0012815999798476696 - 0 + -0.39999997615814209 1 haze_density - 1.6499999761581421 + 1.4900000095367432 0 0 1 haze_horizon - 0.14999999105930328 + 0 0.21744099259376526 0.21744099259376526 1 lightnorm - -0.95105654001235962 0 - -0.30901694297790527 + 0 + 1 0 max_y - 4000 + 805 0 0 1 @@ -127,7 +127,7 @@ preset_num 2 star_brightness - 0 + 1.5699999332427979 sun_angle 0 sunlight_color diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20AvatarOpt%20%28Caliah%29%20whiter.xml b/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20AvatarOpt%20%28Caliah%29%20whiter.xml deleted file mode 100644 index 5e342656e..000000000 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20AvatarOpt%20%28Caliah%29%20whiter.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 2.0099997520446777 - 1.9199999570846558 - 2.0099997520446777 - 2.0099997520446777 - - blue_density - - 0.63999998569488525 - 1.1799999475479126 - 2 - 2 - - blue_horizon - - 0.23999999463558197 - 0.23999999463558197 - 0.31999999284744263 - 0.31999999284744263 - - cloud_color - - 0.12862999737262726 - 0.12862999737262726 - 0.12862999737262726 - 1 - - cloud_pos_density1 - - 0.88419097661972046 - 0.53047597408294678 - 0.4270470142364502 - 1 - - cloud_pos_density2 - - 0.38419300317764282 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.41999998688697815 - 0 - 0 - 1 - - cloud_scroll_rate - - 10 - 10 - - cloud_shadow - - 0.12999999523162842 - 0 - 0 - 1 - - density_multiplier - - 0.00017999998817685992 - 0 - 0 - 1 - - distance_multiplier - - 2 - 0 - 0 - 1 - - east_angle - 1.0053097009658813 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.0799999237060547 - 0 - 0 - 1 - - glow - - 5 - 0.0012815999798476696 - -0.49999997019767761 - 1 - - haze_density - - 0.64999997615814209 - 0 - 0 - 1 - - haze_horizon - - 0.08999999612569809 - 0.21744099259376526 - 0.21744099259376526 - 1 - - lightnorm - - -0.84432792663574219 - 0 - 0.53582674264907837 - 0 - - max_y - - 188 - 0 - 0 - 1 - - preset_num - 2 - star_brightness - 0 - sun_angle - 0 - sunlight_color - - 2.5799999237060547 - 2.5799999237060547 - 2.5799999237060547 - 2.5799999237060547 - - - diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default1.xml b/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default1.xml deleted file mode 100644 index a9d0f0e9c..000000000 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default1.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1.0384939114611456 - 0.95795135955843591 - 0.95795135955843591 - 0.60696905358246056 - - blue_density - - 0.20658362946772124 - 0.43003502308076946 - 0.77534221609780829 - 0.61779229342937469 - - blue_horizon - - 0.34674560611608651 - 0.38732792231055679 - 0.49042100459337234 - 0.58080440759658813 - - cloud_color - - 0.33948845342081757 - 0.33948845342081757 - 0.33948845342081757 - 0.6362861692905426 - - cloud_pos_density1 - - 1.6884100437164307 - 0.52609699964523315 - 0.95397572096092276 - 1.0000000298023224 - - cloud_pos_density2 - - 1.6884100437164307 - 0.52609699964523315 - 0.1250000037252903 - 1.0000000298023224 - - cloud_scale - - 0.41999998722208165 - 0 - 0 - 1.0000000298023224 - - cloud_scroll_rate - - 10.314831098603321 - 10.011000171161356 - - cloud_shadow - - 0.26999998092651367 - 0 - 0 - 1.0000000298023224 - - density_multiplier - - 0.0002873900482277883 - 0 - 0 - 1.0000000298023224 - - distance_multiplier - - 0.87670719623565674 - 0 - 0 - 1.0000000298023224 - - east_angle - 0 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.0000000298023224 - 0 - 0 - 1.0000000298023224 - - glow - - 5.0000001490116119 - 0.0010000000917914607 - -0.48000001257440683 - 1.0000000298023224 - - haze_density - - 0.70000002224998603 - 0 - 0 - 1.0000000298023224 - - haze_horizon - - 0.1784939272396473 - 0.1991560042470284 - 0.1991560042470284 - 1.0000000298023224 - - lightnorm - - 0 - 0.49086946249008179 - -0.87123316526412964 - 0 - - max_y - - 1205.163865879178 - 0 - 0 - 1.0000000298023224 - - preset_num - 22 - star_brightness - 0 - sun_angle - 2.6285052299499512 - sunlight_color - - 1.5413080077610317 - 1.5705089192829433 - 1.6435112576923672 - 0.56847512722015381 - - - diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default2.xml b/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default2.xml deleted file mode 100644 index 53673875f..000000000 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default2.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1.0499999505996698 - 1.0499999505996698 - 1.0499999505996698 - 0.34999999382495872 - - blue_density - - 0.24475815546304436 - 0.44872327986443139 - 0.759999978199005 - 0.38000001338005091 - - blue_horizon - - 0.49548382238803412 - 0.49548381855426504 - 0.64000000093460097 - 0.32000000046730048 - - cloud_color - - 0.40999999671936077 - 0.40999999671936077 - 0.40999999671936077 - 0.40999999671936077 - - cloud_pos_density1 - - 1.6884100437164307 - 0.52609699964523315 - 0.99999999999999623 - 1 - - cloud_pos_density2 - - 1.6884100437164307 - 0.52609699964523315 - 0.125 - 1 - - cloud_scale - - 0.41999999237537178 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.200000040817258 - 10.010999893335338 - - cloud_shadow - - 0.26999998092651367 - 0 - 0 - 1 - - density_multiplier - - 0.00017999998592350524 - 0 - 0 - 1 - - distance_multiplier - - 0.80000001235008633 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1 - 0 - 0 - 1 - - glow - - 5 - 0.0010000000503715134 - -0.47999998292446122 - 1 - - haze_density - - 0.69999998764991744 - 0 - 0 - 1 - - haze_horizon - - 0.18999999454975031 - 0.19915600071018602 - 0.19915600071018602 - 1 - - lightnorm - - 0 - 0.91269153356552124 - -0.40864923596382141 - 0 - - max_y - - 1604.9999921321869 - 0 - 0 - 1 - - preset_num - 22 - star_brightness - 0 - sun_angle - 1.9917699098587036 - sunlight_color - - 0.73421055009741187 - 0.78157896155557771 - 0.89999997529983111 - 0.29999998147487428 - - - diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default3.xml b/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default3.xml deleted file mode 100644 index 518517501..000000000 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default3.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1.0499999460917593 - 1.0499999460917593 - 1.0499999460917593 - 0.34999999512411506 - - blue_density - - 0.2447581519847149 - 0.44872328351986113 - 0.75999999517881633 - 0.38000003464613324 - - blue_horizon - - 0.49548381839263711 - 0.49548381254157786 - 0.63999999116870609 - 0.31999999558435305 - - cloud_color - - 0.40999999615399413 - 0.40999999615399413 - 0.40999999615399413 - 0.40999999615399413 - - cloud_pos_density1 - - 1.6884100437164307 - 0.52609699964523315 - 0.99999999999999423 - 1 - - cloud_pos_density2 - - 1.6884100437164307 - 0.52609699964523315 - 0.125 - 1 - - cloud_scale - - 0.41999998778293413 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.199999843971682 - 10.010999677075688 - - cloud_shadow - - 0.26999998092651367 - 0 - 0 - 1 - - density_multiplier - - 0.00017999998844229546 - 0 - 0 - 1 - - distance_multiplier - - 0.80000000975177565 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1 - 0 - 0 - 1 - - glow - - 5 - 0.0010000000429292444 - -0.47999999271352323 - 1 - - haze_density - - 0.69999999024823012 - 0 - 0 - 1 - - haze_horizon - - 0.18999999879470264 - 0.19915600203784933 - 0.19915600203784933 - 1 - - lightnorm - - 0 - 0.80060893297195435 - -0.59918725490570068 - 0 - - max_y - - 1604.9999940395355 - 0 - 0 - 1 - - preset_num - 22 - star_brightness - 0 - sun_angle - 2.2132818698883057 - sunlight_color - - 0.73421055652810585 - 0.78157895060378157 - 0.89999998049645447 - 0.29999998164705199 - - - diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20city%20weirdlights.xml b/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20city%20weirdlights.xml deleted file mode 100644 index c2daa9988..000000000 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20city%20weirdlights.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.71999996900558472 - 0.71999996900558472 - 0.71999996900558472 - 0.23999999463558197 - - blue_density - - 0 - 0 - 0 - 0 - - blue_horizon - - 0 - 0 - 0.43999999761581421 - 0.2199999988079071 - - cloud_color - - 0.14000000059604645 - 0.14000000059604645 - 0.14000000059604645 - 0.14000000059604645 - - cloud_pos_density1 - - 0.74000000953674316 - 0.93999999761581421 - 0.20999999344348907 - 1 - - cloud_pos_density2 - - 0.65999996662139893 - 0.52999997138977051 - 0.0099999997764825821 - 1 - - cloud_scale - - 0.070000000298023224 - 0 - 0 - 1 - - cloud_scroll_rate - - 18 - 20 - - cloud_shadow - - 0.34000000357627869 - 0 - 0 - 1 - - density_multiplier - - 0.00018000000272877514 - 0 - 0 - 1 - - distance_multiplier - - 6.7000002861022949 - 0 - 0 - 1 - - east_angle - 3.5185837745666504 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.0399999618530273 - 0 - 0 - 1 - - glow - - 17.399999618530273 - 0.0010000000474974513 - -0.64999997615814209 - 1 - - haze_density - - 0.34999999403953552 - 0 - 0 - 1 - - haze_horizon - - 0.17000000178813934 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.36812454462051392 - 1.7484555314695172e-007 - -0.92977648973464966 - 0 - - max_y - - 263 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 1.0399999618530273 - sun_angle - 6.2831854820251465 - sunlight_color - - 1.5899999141693115 - 1.5899999141693115 - 1.5899999141693115 - 1.5899999141693115 - - - diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20city.xml b/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20city.xml deleted file mode 100644 index 0728f664e..000000000 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20city.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.71999996900558472 - 0.71999996900558472 - 0.71999996900558472 - 0.23999999463558197 - - blue_density - - 0 - 0 - 0 - 0 - - blue_horizon - - 0 - 0 - 0.43999999761581421 - 0.2199999988079071 - - cloud_color - - 0.14000000059604645 - 0.14000000059604645 - 0.14000000059604645 - 0.14000000059604645 - - cloud_pos_density1 - - 0.74000000953674316 - 0.93999999761581421 - 0.20999999344348907 - 1 - - cloud_pos_density2 - - 0.65999996662139893 - 0.52999997138977051 - 0.0099999997764825821 - 1 - - cloud_scale - - 0.070000000298023224 - 0 - 0 - 1 - - cloud_scroll_rate - - 18 - 20 - - cloud_shadow - - 0.34000000357627869 - 0 - 0 - 1 - - density_multiplier - - 0.00018000000272877514 - 0 - 0 - 1 - - distance_multiplier - - 6.7000002861022949 - 0 - 0 - 1 - - east_angle - 3.5185837745666504 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.0399999618530273 - 0 - 0 - 1 - - glow - - 17.399999618530273 - 0.0010000000474974513 - -0.64999997615814209 - 1 - - haze_density - - 0.34999999403953552 - 0 - 0 - 1 - - haze_horizon - - 0.17000000178813934 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.36776852607727051 - 0.043968122452497482 - -0.92887729406356812 - 0 - - max_y - - 263 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 1.0399999618530273 - sun_angle - 0.043982300907373428 - sunlight_color - - 1.5899999141693115 - 1.5899999141693115 - 1.5899999141693115 - 1.5899999141693115 - - - diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio2.xml b/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio2.xml deleted file mode 100644 index fc32f2982..000000000 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio2.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.80999994277954102 - 0.6044776439666748 - 0.6044776439666748 - 0.26999998092651367 - - blue_density - - 0.63999998569488525 - 1.1799999475479126 - 2 - 2 - - blue_horizon - - 0.23999999463558197 - 0.23999999463558197 - 0.31999999284744263 - 0.31999999284744263 - - cloud_color - - 0.12862999737262726 - 0.12862999737262726 - 0.12862999737262726 - 1 - - cloud_pos_density1 - - 0.88419097661972046 - 0.53047597408294678 - 0.4270470142364502 - 1 - - cloud_pos_density2 - - 0.38419300317764282 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.41999998688697815 - 0 - 0 - 1 - - cloud_scroll_rate - - 10 - 10 - - cloud_shadow - - 0.12999999523162842 - 0 - 0 - 1 - - density_multiplier - - 0.00017999998817685992 - 0 - 0 - 1 - - distance_multiplier - - 2 - 0 - 0 - 1 - - east_angle - 1.0053097009658813 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.0799999237060547 - 0 - 0 - 1 - - glow - - 5 - 0.0012815999798476696 - -0.49999997019767761 - 1 - - haze_density - - 0.64999997615814209 - 0 - 0 - 1 - - haze_horizon - - 0.08999999612569809 - 0.21744099259376526 - 0.21744099259376526 - 1 - - lightnorm - - -0.84432792663574219 - 0 - 0.53582674264907837 - 0 - - max_y - - 188 - 0 - 0 - 1 - - preset_num - 2 - star_brightness - 0 - sun_angle - 0 - sunlight_color - - 2.5799999237060547 - 2.5799999237060547 - 2.5799999237060547 - 2.5799999237060547 - - - diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio3.xml b/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio3.xml deleted file mode 100644 index af5676ba3..000000000 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio3.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.71999996900558472 - 0.53731358051300049 - 0.53731358051300049 - 0.23999999463558197 - - blue_density - - 0.47999998927116394 - 1.1799999475479126 - 2 - 2 - - blue_horizon - - 0.23999999463558197 - 0.23999999463558197 - 0.31999999284744263 - 0.31999999284744263 - - cloud_color - - 0.12862999737262726 - 0.12862999737262726 - 0.12862999737262726 - 1 - - cloud_pos_density1 - - 0.88419097661972046 - 0.53047597408294678 - 0.4270470142364502 - 1 - - cloud_pos_density2 - - 0.38419300317764282 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.41999998688697815 - 0 - 0 - 1 - - cloud_scroll_rate - - 10 - 10 - - cloud_shadow - - 0.12999999523162842 - 0 - 0 - 1 - - density_multiplier - - 0.00017999998817685992 - 0 - 0 - 1 - - distance_multiplier - - 2 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.2200000286102295 - 0 - 0 - 1 - - glow - - 4.8000001907348633 - 0.0012815999798476696 - -0.44999998807907104 - 1 - - haze_density - - 1 - 0 - 0 - 1 - - haze_horizon - - 0.08999999612569809 - 0.21744099259376526 - 0.21744099259376526 - 1 - - lightnorm - - 0 - 0.32094338536262512 - -0.94709837436676025 - 0 - - max_y - - 188 - 0 - 0 - 1 - - preset_num - 2 - star_brightness - 0 - sun_angle - 2.8148672580718994 - sunlight_color - - 2.5799999237060547 - 2.5799999237060547 - 2.5799999237060547 - 2.5799999237060547 - - - diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio4.xml b/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio4.xml deleted file mode 100644 index c2e57928f..000000000 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio4.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1.0384939114611456 - 0.95795135955843591 - 0.95795135955843591 - 0.60696905358246056 - - blue_density - - 0.20658362946772124 - 0.43003502308076946 - 0.77534221609780829 - 0.61779229342937469 - - blue_horizon - - 0.34674560611608651 - 0.38732792231055679 - 0.49042100459337234 - 0.58080440759658813 - - cloud_color - - 0.33948845342081757 - 0.33948845342081757 - 0.33948845342081757 - 0.6362861692905426 - - cloud_pos_density1 - - 1.6884100437164307 - 0.52609699964523315 - 0.95397572096092276 - 1.0000000298023224 - - cloud_pos_density2 - - 1.6884100437164307 - 0.52609699964523315 - 0.1250000037252903 - 1.0000000298023224 - - cloud_scale - - 0.41999998722208165 - 0 - 0 - 1.0000000298023224 - - cloud_scroll_rate - - 10.314831098603321 - 10.011000171161356 - - cloud_shadow - - 0.26999998092651367 - 0 - 0 - 1.0000000298023224 - - density_multiplier - - 0.0002873900482277883 - 0 - 0 - 1.0000000298023224 - - distance_multiplier - - 0.87670719623565674 - 0 - 0 - 1.0000000298023224 - - east_angle - 3.1415927410125732 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.0000000298023224 - 0 - 0 - 1.0000000298023224 - - glow - - 5.0000001490116119 - 0.0010000000917914607 - -0.48000001257440683 - 1.0000000298023224 - - haze_density - - 0.70000002224998603 - 0 - 0 - 1.0000000298023224 - - haze_horizon - - 0.1784939272396473 - 0.1991560042470284 - 0.1991560042470284 - 1.0000000298023224 - - lightnorm - - 8.7422776573475858e-008 - 0 - -1 - 0 - - max_y - - 1205.163865879178 - 0 - 0 - 1.0000000298023224 - - preset_num - 22 - star_brightness - 0 - sun_angle - 0 - sunlight_color - - 1.5413080077610317 - 1.5705089192829433 - 1.6435112576923672 - 0.56847512722015381 - - - diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio6.xml b/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio6.xml deleted file mode 100644 index f18cc7522..000000000 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio6.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1.5299999713897705 - 1.5299999713897705 - 1.5299999713897705 - 0.50999999046325684 - - blue_density - - 0.72533315420150757 - 0.995555579662323 - 1.2799999713897705 - 0.63999998569488525 - - blue_horizon - - 0.19999998807907104 - 0.2199999988079071 - 0.23999999463558197 - 0.23999999463558197 - - cloud_color - - 0.39999997615814209 - 0.40999999642372131 - 0.40999999642372131 - 0.40999999642372131 - - cloud_pos_density1 - - 1 - 1 - 0.29999998211860657 - 1 - - cloud_pos_density2 - - 0.29999998211860657 - 0.29999998211860657 - 0.08999999612569809 - 1 - - cloud_scale - - 0.69999998807907104 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.069999776780605 - 10.069999776780605 - - cloud_shadow - - 0 - 0 - 0 - 1 - - density_multiplier - - 0.00011000000085914508 - 0 - 0 - 1 - - distance_multiplier - - 15.5 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.0099999904632568 - 0 - 0 - 1 - - glow - - 12 - 0.0010000000474974513 - -0.89999997615814209 - 1 - - haze_density - - 0.26999998092651367 - 0 - 0 - 1 - - haze_horizon - - 0 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0 - 0.95105654001235962 - 0.30901697278022766 - 0 - - max_y - - 913 - 0 - 0 - 1 - - preset_num - 22 - star_brightness - 0 - sun_angle - 1.2566370964050293 - sunlight_color - - 0.17999999225139618 - 0.17999999225139618 - 0.17999999225139618 - 0.059999998658895493 - - - diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio8.xml b/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio8.xml deleted file mode 100644 index 0fff0a166..000000000 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio8.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1.1100000143051147 - 1.1100000143051147 - 1.1100000143051147 - 0.37000000476837158 - - blue_density - - 0.72533315420150757 - 0.995555579662323 - 1.2799999713897705 - 0.63999998569488525 - - blue_horizon - - 0.19999998807907104 - 0.2199999988079071 - 0.23999999463558197 - 0.23999999463558197 - - cloud_color - - 0.39999997615814209 - 0.40999999642372131 - 0.40999999642372131 - 0.40999999642372131 - - cloud_pos_density1 - - 1 - 1 - 0.29999998211860657 - 1 - - cloud_pos_density2 - - 0.29999998211860657 - 0.29999998211860657 - 0.08999999612569809 - 1 - - cloud_scale - - 0.69999998807907104 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.069999776780605 - 10.069999776780605 - - cloud_shadow - - 0 - 0 - 0 - 1 - - density_multiplier - - 0.00011000000085914508 - 0 - 0 - 1 - - distance_multiplier - - 15.5 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.8199999332427979 - 0 - 0 - 1 - - glow - - 12 - 0.0010000000474974513 - -0.89999997615814209 - 1 - - haze_density - - 0.26999998092651367 - 0 - 0 - 1 - - haze_horizon - - 0 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0 - 0.97452688217163086 - 0.22427067160606384 - 0 - - max_y - - 913 - 0 - 0 - 1 - - preset_num - 22 - star_brightness - 0 - sun_angle - 1.3446017503738403 - sunlight_color - - 0.23999999463558197 - 0.23999999463558197 - 0.23999999463558197 - 0.079999998211860657 - - - diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20AvatarOpt%20%28Caliah%29%20%2Dmod%2D.xml b/indra/newview/app_settings/windlight/skies/%5BAnaLu%5D%20AvatarOpt%20%28Caliah%29%20%2Dmod%2D.xml similarity index 100% rename from indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20AvatarOpt%20%28Caliah%29%20%2Dmod%2D.xml rename to indra/newview/app_settings/windlight/skies/%5BAnaLu%5D%20AvatarOpt%20%28Caliah%29%20%2Dmod%2D.xml diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor2.xml b/indra/newview/app_settings/windlight/skies/%5BAnaLu%5D%20outdoor2.xml similarity index 100% rename from indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor2.xml rename to indra/newview/app_settings/windlight/skies/%5BAnaLu%5D%20outdoor2.xml diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Aftermath%200000.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Aftermath%200000.xml new file mode 100644 index 000000000..3f532c176 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Aftermath%200000.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.435498058795928955078125 + 0.411328136920928955078125 + 0.48867189884185791015625 + 0.1628906279802322387695312 + + blue_density + + 0.778124988079071044921875 + 0.1818749904632568359375 + 0.4893166124820709228515625 + 0.3890624940395355224609375 + + blue_horizon + + 0.0719999969005584716796875 + 0.1779999434947967529296875 + 0.328000009059906005859375 + 0.1640000045299530029296875 + + cloud_color + + 0.2529999911785125732421875 + 0.1870000064373016357421875 + 0.2272188216447830200195312 + 0.2529999911785125732421875 + + cloud_pos_density1 + + 0.1799999922513961791992188 + 0.90999996662139892578125 + 0.4099999964237213134765625 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.009999999776482582092285156 + 1 + + cloud_scale + + 0.999999940395355224609375 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.92999935150146484375 + 10.0109996795654296875 + + cloud_shadow + + 0.39999997615814208984375 + 0 + 0 + 1 + + density_multiplier + + 0.0001499999925727024674415588 + 0 + 0 + 1 + + distance_multiplier + + 65.3000030517578125 + 0 + 0 + 1 + + east_angle + 1.31946885585784912109375 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 11.1999988555908203125 + 0.001000000047497451305389404 + -0.550000011920928955078125 + 1 + + haze_density + + 0.989999949932098388671875 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + 1.155023898746776467305608e-08 + 1 + -2.965597989401658196584322e-09 + 1 + + max_y + + 533 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 2 + sun_angle + 4.7123889923095703125 + sunlight_color + + 0.46696889400482177734375 + 0.555900037288665771484375 + 0.46410000324249267578125 + 0.1853000074625015258789062 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Aftermath%200500.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Aftermath%200500.xml new file mode 100644 index 000000000..d78357517 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Aftermath%200500.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.435498058795928955078125 + 0.411328136920928955078125 + 0.48867189884185791015625 + 0.1628906279802322387695312 + + blue_density + + 0.778124988079071044921875 + 0.1818749904632568359375 + 0.4893166124820709228515625 + 0.3890624940395355224609375 + + blue_horizon + + 0.0719999969005584716796875 + 0.1779999434947967529296875 + 0.328000009059906005859375 + 0.1640000045299530029296875 + + cloud_color + + 0.2529999911785125732421875 + 0.1870000064373016357421875 + 0.2272188216447830200195312 + 0.2529999911785125732421875 + + cloud_pos_density1 + + 0.1799999922513961791992188 + 0.90999996662139892578125 + 0.4099999964237213134765625 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.009999999776482582092285156 + 1 + + cloud_scale + + 0.999999940395355224609375 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.92999935150146484375 + 10.0109996795654296875 + + cloud_shadow + + 0.39999997615814208984375 + 0 + 0 + 1 + + density_multiplier + + 0.0001499999925727024674415588 + 0 + 0 + 1 + + distance_multiplier + + 65.3000030517578125 + 0 + 0 + 1 + + east_angle + 1.31946885585784912109375 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 11.1999988555908203125 + 0.001000000047497451305389404 + -0.550000011920928955078125 + 1 + + haze_density + + 2.7999999523162841796875 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + -0.968583166599273681640625 + 0 + 0.248689949512481689453125 + 0 + + max_y + + 533 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 2 + sun_angle + 6.283184528350830078125 + sunlight_color + + 0.6135938167572021484375 + 0.40640628337860107421875 + 0.4064064323902130126953125 + 0.2045312821865081787109375 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Aftermath%201200.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Aftermath%201200.xml new file mode 100644 index 000000000..104c6394f --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Aftermath%201200.xml @@ -0,0 +1,141 @@ + + + ambient + + 1.40380954742431640625 + 1.2775714397430419921875 + 1.23619043827056884765625 + 0.46793651580810546875 + + blue_density + + 0.205078125 + 0.266815245151519775390625 + 0.669921875 + 0.3349609375 + + blue_horizon + + 0.39999997615814208984375 + 0.397499978542327880859375 + 0.2400000095367431640625 + 0.199999988079071044921875 + + cloud_color + + 0.660351574420928955078125 + 0.319648444652557373046875 + 0.527264535427093505859375 + 0.660351574420928955078125 + + cloud_pos_density1 + + 0.1799999922513961791992188 + 0.90999996662139892578125 + 0.2099999934434890747070312 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.67999994754791259765625 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.92999935150146484375 + 10.0109996795654296875 + + cloud_shadow + + 0.4199999868869781494140625 + 0 + 0 + 1 + + density_multiplier + + 0.0002600000007078051567077637 + 0 + 0 + 1 + + distance_multiplier + + 8.80000019073486328125 + 0 + 0 + 1 + + east_angle + 1.31946885585784912109375 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 20 + 0.001000000047497451305389404 + -0.2499999850988388061523438 + 1 + + haze_density + + 0.709999978542327880859375 + 0 + 0 + 1 + + haze_horizon + + 0.1599999964237213134765625 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + -1.112303039008111227303743e-06 + 1 + 2.855909428944869432598352e-07 + 0 + + max_y + + 2160 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 1.57079517841339111328125 + sunlight_color + + 0.9111328125 + 0.86077880859375 + 0.5888671875 + 0.3037109375 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Aftermath%201630.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Aftermath%201630.xml new file mode 100644 index 000000000..0e6de5f63 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Aftermath%201630.xml @@ -0,0 +1,141 @@ + + + ambient + + 1.40380954742431640625 + 1.2775714397430419921875 + 1.23619043827056884765625 + 0.46793651580810546875 + + blue_density + + 0.205078125 + 0.266815245151519775390625 + 0.669921875 + 0.3349609375 + + blue_horizon + + 0.32959997653961181640625 + 0.329299986362457275390625 + 0.3104000091552734375 + 0.164799988269805908203125 + + cloud_color + + 0.7007000446319580078125 + 0.2792999744415283203125 + 0.5360910892486572265625 + 0.7007000446319580078125 + + cloud_pos_density1 + + 0.1799999922513961791992188 + 0.90999996662139892578125 + 0.310000002384185791015625 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.67999994754791259765625 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.92999935150146484375 + 10.0109996795654296875 + + cloud_shadow + + 0.319999992847442626953125 + 0 + 0 + 1 + + density_multiplier + + 0.0002600000007078051567077637 + 0 + 0 + 1 + + distance_multiplier + + 8.80000019073486328125 + 0 + 0 + 1 + + east_angle + 1.31946885585784912109375 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 20 + 0.001000000047497451305389404 + -0.2499999850988388061523438 + 1 + + haze_density + + 0.859999954700469970703125 + 0 + 0 + 1 + + haze_horizon + + 0.1599999964237213134765625 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + 0.89485347270965576171875 + 0.3826852738857269287109375 + -0.2297593653202056884765625 + 0 + + max_y + + 853 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.7488915920257568359375 + sunlight_color + + 0.9111328125 + 0.86077880859375 + 0.5888671875 + 0.3037109375 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Aftermath%201750.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Aftermath%201750.xml new file mode 100644 index 000000000..6caf48c3f --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Aftermath%201750.xml @@ -0,0 +1,141 @@ + + + ambient + + 1.40380954742431640625 + 1.2775714397430419921875 + 1.23619043827056884765625 + 0.46793651580810546875 + + blue_density + + 0.205078125 + 0.266815245151519775390625 + 0.669921875 + 0.3349609375 + + blue_horizon + + 0.32959997653961181640625 + 0.329299986362457275390625 + 0.3104000091552734375 + 0.164799988269805908203125 + + cloud_color + + 0.7007000446319580078125 + 0.2792999744415283203125 + 0.5360910892486572265625 + 0.7007000446319580078125 + + cloud_pos_density1 + + 0.1799999922513961791992188 + 0.90999996662139892578125 + 0.4199999868869781494140625 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.67999994754791259765625 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.92999935150146484375 + 10.0109996795654296875 + + cloud_shadow + + 0.3400000035762786865234375 + 0 + 0 + 1 + + density_multiplier + + 0.0002600000007078051567077637 + 0 + 0 + 1 + + distance_multiplier + + 8.80000019073486328125 + 0 + 0 + 1 + + east_angle + 1.31946885585784912109375 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 4.00000095367431640625 + 0.001000000047497451305389404 + -0.7999999523162841796875 + 1 + + haze_density + + 0.859999954700469970703125 + 0 + 0 + 1 + + haze_horizon + + 0.1599999964237213134765625 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + 0.968583166599273681640625 + 2.058344534816569648683071e-06 + -0.248689949512481689453125 + 0 + + max_y + + 853 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 3.141590595245361328125 + sunlight_color + + 0.97265625 + 0.52734375 + 0.934387385845184326171875 + 0.32421875 + + + diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20AvatarOpt%20%28Caliah%29.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Aftermath%202000.xml similarity index 50% rename from indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20AvatarOpt%20%28Caliah%29.xml rename to indra/newview/app_settings/windlight/skies/%5BNB%5D%20Aftermath%202000.xml index f374de230..7e83adbe8 100644 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20AvatarOpt%20%28Caliah%29.xml +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Aftermath%202000.xml @@ -2,81 +2,81 @@ ambient - 0.5565025806427002 - 0.66127157211303711 - 0.89999997615814209 - 0.29999998211860657 + 1.40380954742431640625 + 1.2775714397430419921875 + 1.23619043827056884765625 + 0.46793651580810546875 blue_density - 0.14522500336170197 - 0.39999699592590332 - 0.80000197887420654 - 1 + 0.205078125 + 0.266815245151519775390625 + 0.669921875 + 0.3349609375 blue_horizon - 0.15130999684333801 - 0.30000001192092896 - 0.35131001472473145 - 1 + 0 + 0.0828124582767486572265625 + 0.2000000029802322387695312 + 0.1000000014901161193847656 cloud_color - 0.12862999737262726 - 0.12862999737262726 - 0.12862999737262726 - 1 + 0.2529999911785125732421875 + 0.1870000064373016357421875 + 0.2272188216447830200195312 + 0.2529999911785125732421875 cloud_pos_density1 - 0.88419097661972046 - 0.53047597408294678 - 0.4270470142364502 + 0.1799999922513961791992188 + 0.90999996662139892578125 + 0.4199999868869781494140625 1 cloud_pos_density2 - 0.38419300317764282 + 0.5 0.5 0.125 1 cloud_scale - 0.41999998688697815 + 0.67999994754791259765625 0 0 1 cloud_scroll_rate - 10 - 10 + 9.92999935150146484375 + 10.0109996795654296875 cloud_shadow - 0 + 0.3400000035762786865234375 0 0 1 density_multiplier - 0.0001250890054507181 + 0.0002800000074785202741622925 0 0 1 distance_multiplier - 11.40000057220459 + 16.3000011444091796875 0 0 1 east_angle - 3.3300881385803223 + 1.31946885585784912109375 enable_cloud_scroll 1 @@ -84,58 +84,58 @@ gamma - 1.7300000190734863 + 0.819999992847442626953125 0 0 1 glow - 0.19999980926513672 - 0.0012815999798476696 - 0 + 11.1999988555908203125 + 0.001000000047497451305389404 + -0.550000011920928955078125 1 haze_density - 1.4399999380111694 + 0.859999954700469970703125 0 0 1 haze_horizon - 0.14999999105930328 - 0.21744099259376526 - 0.21744099259376526 + 0.1599999964237213134765625 + 0.1991560012102127075195312 + 0.1991560012102127075195312 1 lightnorm - 0.18507426977157593 - 0.15643447637557983 - -0.97019374370574951 - 0 + -0.83881855010986328125 + 0.4999983310699462890625 + 0.2153720408678054809570312 + 1 max_y - 4000 + 267 0 0 1 preset_num - 2 + 21 star_brightness 0 sun_angle - 0.15707963705062866 + 3.6651895046234130859375 sunlight_color - 3 - 3 - 3 - 1 + 0.1042499989271163940429688 + 0.136799991130828857421875 + 0.1032000035047531127929688 + 0.045599997043609619140625 diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio7.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Alpine%2Dskinlight%20RGB.xml similarity index 53% rename from indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio7.xml rename to indra/newview/app_settings/windlight/skies/%5BNB%5D%20Alpine%2Dskinlight%20RGB.xml index 05deb2e26..109001ce3 100644 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio7.xml +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Alpine%2Dskinlight%20RGB.xml @@ -2,81 +2,81 @@ ambient - 1.5299999713897705 - 1.5299999713897705 - 1.5299999713897705 - 0.50999999046325684 + 2.1600000858306884765625 + 2.1600000858306884765625 + 2.1600000858306884765625 + 0.7200000286102294921875 blue_density - 0.72533315420150757 - 0.995555579662323 - 1.2799999713897705 - 0.63999998569488525 + 0.644100606441497802734375 + 1.1808507442474365234375 + 2 + 1 blue_horizon - 0.19999998807907104 - 0.2199999988079071 - 0.23999999463558197 - 0.23999999463558197 + 0.2477418929338455200195312 + 0.2477418929338455200195312 + 0.319999992847442626953125 + 0.1599999964237213134765625 cloud_color - 0.39999997615814209 - 0.40999999642372131 - 0.40999999642372131 - 0.40999999642372131 + 0.1973876953125 + 0.1854248046875 + 0.196079254150390625 + 0.1973876953125 cloud_pos_density1 - 1 - 1 - 0.29999998211860657 + 0.64999997615814208984375 + 0.189999997615814208984375 + 0.2299999892711639404296875 1 cloud_pos_density2 - 0.29999998211860657 - 0.29999998211860657 - 0.08999999612569809 + 0.4299999773502349853515625 + 0.5099999904632568359375 + 0.05999999865889549255371094 1 cloud_scale - 0.69999998807907104 + 0.1199999973177909851074219 0 0 1 cloud_scroll_rate - 10.069999776780605 - 10.069999776780605 + 10.21000003814697265625 + 9.92999935150146484375 cloud_shadow - 0 + 0.2599999904632568359375 0 0 1 density_multiplier - 0.00011000000085914508 + 0.0002200000017182901501655579 0 0 1 distance_multiplier - 15.5 + 0.699999988079071044921875 0 0 1 east_angle - 0 + 3.895575046539306640625 enable_cloud_scroll 1 @@ -84,42 +84,42 @@ gamma - 1.2200000286102295 + 1 0 0 1 glow - 11.80000114440918 - 0.0010000000474974513 - -0.89999997615814209 + 20 + 0.001000000047497451305389404 + -0 1 haze_density - 0.26999998092651367 + 0.88999998569488525390625 0 0 1 haze_horizon - 0 - 0.19915600121021271 - 0.19915600121021271 + 0.1400000005960464477539062 + 0.1991560012102127075195312 + 0.1991560012102127075195312 1 lightnorm - -0 - 0.95105654001235962 - 0.30901697278022766 + 0.684547245502471923828125 + 0 + -0.72896850109100341796875 0 max_y - 913 + 320 0 0 1 @@ -127,15 +127,15 @@ preset_num 22 star_brightness - 0 + 0.08999999612569808959960938 sun_angle - 1.2566370964050293 + 6.152285099029541015625 sunlight_color - 0.23999999463558197 - 0.23999999463558197 - 0.23999999463558197 - 0.079999998211860657 + 0 + 0 + 0 + 0 diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%200000.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%200000.xml new file mode 100644 index 000000000..b33d39c4e --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%200000.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.97265625 + 0.97265625 + 0.97265625 + 0.32421875 + + blue_density + + 1.30079996585845947265625 + 1.31144011020660400390625 + 1.93920004367828369140625 + 0.969600021839141845703125 + + blue_horizon + + 0.064021885395050048828125 + 0.05339999496936798095703125 + 0.06660000234842300415039062 + 0.03330000117421150207519531 + + cloud_color + + 0.2634625136852264404296875 + 0.2407999932765960693359375 + 0.3192000091075897216796875 + 0.3192000091075897216796875 + + cloud_pos_density1 + + 0.39999997615814208984375 + 0.579999983310699462890625 + 0.2299999892711639404296875 + 1 + + cloud_pos_density2 + + 0.05999999865889549255371094 + 0.37000000476837158203125 + 0.009999999776482582092285156 + 1 + + cloud_scale + + 0.1099999919533729553222656 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.78999996185302734375 + 10.34999942779541015625 + + cloud_shadow + + 0.1499999910593032836914062 + 0 + 0 + 1 + + density_multiplier + + 0.0001199999969685450196266174 + 0 + 0 + 1 + + distance_multiplier + + 26.5 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.61000001430511474609375 + 0 + 0 + 1 + + glow + + 10.3999996185302734375 + 0.001000000047497451305389404 + -1.5499999523162841796875 + 1 + + haze_density + + 0.680000007152557373046875 + 0 + 0 + 1 + + haze_horizon + + 0.07000000029802322387695312 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + 0 + 1 + -1.192488063850305479718372e-08 + 1 + + max_y + + 3413 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 1.7599999904632568359375 + sun_angle + 4.7123889923095703125 + sunlight_color + + 0.66994583606719970703125 + 0.32427978515625 + 0.75384521484375 + 0.25128173828125 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%200430.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%200430.xml new file mode 100644 index 000000000..aac0c45c5 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%200430.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.97265625 + 0.97265625 + 0.97265625 + 0.32421875 + + blue_density + + 1.30079996585845947265625 + 1.31144011020660400390625 + 1.93920004367828369140625 + 0.969600021839141845703125 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.3499999940395355224609375 + 1 + + cloud_pos_density2 + + 0 + 0.819999992847442626953125 + 0.269999980926513671875 + 1 + + cloud_scale + + 0.1099999919533729553222656 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.5100002288818359375 + 10.34999942779541015625 + + cloud_shadow + + 0.2099999934434890747070312 + 0 + 0 + 1 + + density_multiplier + + 0.0001199999969685450196266174 + 0 + 0 + 1 + + distance_multiplier + + 34.700000762939453125 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.61000001430511474609375 + 0 + 0 + 1 + + glow + + 10.3999996185302734375 + 0.001000000047497451305389404 + -1.5499999523162841796875 + 1 + + haze_density + + 0.839999973773956298828125 + 0 + 0 + 1 + + haze_horizon + + 0.07000000029802322387695312 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + 0 + 0.3826834261417388916015625 + -0.92387950420379638671875 + 1 + + max_y + + 3413 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 1.7599999904632568359375 + sun_angle + 5.890486240386962890625 + sunlight_color + + 0.941037833690643310546875 + 0.600311279296875 + 1.251251220703125 + 0.417083740234375 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%200800.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%200800.xml new file mode 100644 index 000000000..681fea472 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%200800.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.97265625 + 0.97265625 + 0.97265625 + 0.32421875 + + blue_density + + 0.34753131866455078125 + 0.22200000286102294921875 + 0.3780000209808349609375 + 0.18900001049041748046875 + + blue_horizon + + 0.28799998760223388671875 + 0.312499940395355224609375 + 0.512000024318695068359375 + 0.2560000121593475341796875 + + cloud_color + + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.709999978542327880859375 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.12999999523162841796875 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.92999935150146484375 + 10.0109996795654296875 + + cloud_shadow + + 0.37000000476837158203125 + 0 + 0 + 1 + + density_multiplier + + 9.999999747378751635551453e-05 + 0 + 0 + 1 + + distance_multiplier + + 29.3000011444091796875 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 20 + 0.001000000047497451305389404 + -0.1499999910593032836914062 + 1 + + haze_density + + 2.559999942779541015625 + 0 + 0 + 1 + + haze_horizon + + 0.3400000035762786865234375 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + -0 + 0.4999992549419403076171875 + 0.86602580547332763671875 + 0 + + max_y + + 3307 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 0.523597896099090576171875 + sunlight_color + + 0.3229031860828399658203125 + 0.1674000173807144165039062 + 0.372600018978118896484375 + 0.1242000013589859008789062 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%201200.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%201200.xml new file mode 100644 index 000000000..9822dfead --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%201200.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.97265625 + 0.97265625 + 0.97265625 + 0.32421875 + + blue_density + + 0.4128265678882598876953125 + 0.3623046875 + 0.5126953125 + 0.25634765625 + + blue_horizon + + 0.401468336582183837890625 + 0.3909056484699249267578125 + 0.304895222187042236328125 + 0.2007341682910919189453125 + + cloud_color + + 0.381757795810699462890625 + 0.4037994444370269775390625 + 0.638242185115814208984375 + 0.638242185115814208984375 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.2599999904632568359375 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.12999999523162841796875 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.92999935150146484375 + 10.0109996795654296875 + + cloud_shadow + + 0.269999980926513671875 + 0 + 0 + 1 + + density_multiplier + + 8.999999408842995762825012e-05 + 0 + 0 + 1 + + distance_multiplier + + 29.3000011444091796875 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 20 + 0.001000000047497451305389404 + -0.2499999850988388061523438 + 1 + + haze_density + + 0.1599999964237213134765625 + 0 + 0 + 1 + + haze_horizon + + 0.25 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + -0 + 1 + 1.148381556959066074341536e-06 + 0 + + max_y + + 3307 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 1.57079517841339111328125 + sunlight_color + + 0.841461181640625 + 0.96441543102264404296875 + 1.525726318359375 + 0.508575439453125 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%201700.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%201700.xml new file mode 100644 index 000000000..568a0623e --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%201700.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.97265625 + 0.97265625 + 0.97265625 + 0.32421875 + + blue_density + + 0.94277012348175048828125 + 0.6368408203125 + 1.0975341796875 + 0.54876708984375 + + blue_horizon + + 0.309034049510955810546875 + 0.3124831020832061767578125 + 0.397329509258270263671875 + 0.1986647546291351318359375 + + cloud_color + + 0.370273411273956298828125 + 0.4204876720905303955078125 + 0.649726569652557373046875 + 0.649726569652557373046875 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.3499999940395355224609375 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.12999999523162841796875 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.78999996185302734375 + 10.21000003814697265625 + + cloud_shadow + + 0.2099999934434890747070312 + 0 + 0 + 1 + + density_multiplier + + 8.999999408842995762825012e-05 + 0 + 0 + 1 + + distance_multiplier + + 29.3000011444091796875 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 20 + 0.001000000047497451305389404 + -0.64999997615814208984375 + 1 + + haze_density + + 0.3400000035762786865234375 + 0 + 0 + 1 + + haze_horizon + + 0.3400000035762786865234375 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + 0 + 0.2588209807872772216796875 + -0.96592533588409423828125 + 0 + + max_y + + 3307 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.879791259765625 + sunlight_color + + 0.90032958984375 + 0.54568004608154296875 + 0.13092041015625 + 0.30010986328125 + + + diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20night.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%201800.xml similarity index 58% rename from indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20night.xml rename to indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%201800.xml index 2f5cfb8b4..43c03b7ae 100644 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20night.xml +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%201800.xml @@ -2,81 +2,81 @@ ambient - 0 - 0 - 0 - 0 + 0.97265625 + 0.97265625 + 0.97265625 + 0.32421875 blue_density - 0.13997539444089213 - 0.38665792478461469 - 0.77332294252195766 - 0.95108884837904384 + 0.435394346714019775390625 + 0.2215576171875 + 0.4659423828125 + 0.23297119140625 blue_horizon - 0 - 0.22876684367656708 - 0.290018230676651 - 0.31999999284744263 + 0.401468336582183837890625 + 0.3909056484699249267578125 + 0.304895222187042236328125 + 0.2007341682910919189453125 cloud_color - 0.25999999046325684 - 0.28883209824562073 - 0.28994369506835938 - 0.28999999165534973 + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 + 1 cloud_pos_density1 - 0.17999999225139618 - 0.50999999046325684 - 0.91999995708465576 + 0.5 + 0.5 + 0.3499999940395355224609375 1 cloud_pos_density2 0.5 0.5 - 0.079999998211860657 + 0.125 1 cloud_scale - 0.25 + 0.12999999523162841796875 0 0 1 cloud_scroll_rate - 10.436104517528292 - 10 + 9.78999996185302734375 + 10.21000003814697265625 cloud_shadow - 0 + 0.2099999934434890747070312 0 0 1 density_multiplier - 0.0002899999963119626 + 8.999999408842995762825012e-05 0 0 1 distance_multiplier - 1.3000000715255737 + 29.3000011444091796875 0 0 1 east_angle - 2.2619466781616211 + 0 enable_cloud_scroll 1 @@ -84,7 +84,7 @@ gamma - 1.5399999618530273 + 0.819999992847442626953125 0 0 1 @@ -92,50 +92,50 @@ glow 20 - 0.0010000000474974513 - 0 + 0.001000000047497451305389404 + -2.5 1 haze_density - 0.12999999523162842 + 0.3400000035762786865234375 0 0 1 haze_horizon - 0.14999999105930328 - 0.19915600121021271 - 0.19915600121021271 + 0.3400000035762786865234375 + 0.1991560012102127075195312 + 0.1991560012102127075195312 1 lightnorm - -0.024202039465308189 - 0.99950659275054932 - -0.020021669566631317 - 1 + 0 + 0 + -1 + 0 max_y - 394.39999389648437 + 3307 0 0 1 preset_num - 18 + 21 star_brightness - 2 + 0 sun_angle - 4.6809735298156738 + 3.27249050140380859375 sunlight_color - 0.98999994993209839 - 0.95999997854232788 - 0.95999997854232788 - 1.0799999237060547 + 0 + 0 + 0 + 0 diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%201900.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%201900.xml new file mode 100644 index 000000000..9e916b029 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%201900.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.97265625 + 0.97265625 + 0.97265625 + 0.32421875 + + blue_density + + 0.447982847690582275390625 + 0.22021484375 + 0.46728515625 + 0.233642578125 + + blue_horizon + + 0.401468336582183837890625 + 0.3909056484699249267578125 + 0.304895222187042236328125 + 0.2007341682910919189453125 + + cloud_color + + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.3499999940395355224609375 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.12999999523162841796875 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.78999996185302734375 + 10.21000003814697265625 + + cloud_shadow + + 0.2099999934434890747070312 + 0 + 0 + 1 + + density_multiplier + + 8.999999408842995762825012e-05 + 0 + 0 + 1 + + distance_multiplier + + 29.3000011444091796875 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 20 + 0.001000000047497451305389404 + -2.5 + 1 + + haze_density + + 0.3400000035762786865234375 + 0 + 0 + 1 + + haze_horizon + + 0.3400000035762786865234375 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + -0 + 0.258817017078399658203125 + 0.965926349163055419921875 + 1 + + max_y + + 3307 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 3.40338993072509765625 + sunlight_color + + 0 + 0 + 0 + 0 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%202000.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%202000.xml new file mode 100644 index 000000000..5e6283c6a --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20P%2DHaze%202000.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.97265625 + 0.97265625 + 0.97265625 + 0.32421875 + + blue_density + + 1.30079996585845947265625 + 1.31144011020660400390625 + 1.93920004367828369140625 + 0.969600021839141845703125 + + blue_horizon + + 0.064021885395050048828125 + 0.05339999496936798095703125 + 0.06660000234842300415039062 + 0.03330000117421150207519531 + + cloud_color + + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.3499999940395355224609375 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.12999999523162841796875 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.78999996185302734375 + 10.21000003814697265625 + + cloud_shadow + + 0.2099999934434890747070312 + 0 + 0 + 1 + + density_multiplier + + 8.999999408842995762825012e-05 + 0 + 0 + 1 + + distance_multiplier + + 29.3000011444091796875 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 20 + 0.001000000047497451305389404 + -2.5 + 1 + + haze_density + + 0.3400000035762786865234375 + 0 + 0 + 1 + + haze_horizon + + 0.3400000035762786865234375 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + -0 + 0.4999983310699462890625 + 0.866026341915130615234375 + 1 + + max_y + + 3307 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 3.6651895046234130859375 + sunlight_color + + 0 + 0 + 0 + 0 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Kelf%20shelf.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%200000.xml similarity index 56% rename from indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Kelf%20shelf.xml rename to indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%200000.xml index 1e96ad20b..0e4a5260d 100644 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Kelf%20shelf.xml +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%200000.xml @@ -2,140 +2,140 @@ ambient - 0.18999999761581421 - 0.15999999642372131 - 0 - 0.18999999761581421 + 0.97265625 + 0.97265625 + 0.97265625 + 0.32421875 blue_density - 0.019999999552965164 - 0.22999770939350128 - 0.059999998658895493 - 0.25 + 1.30079996585845947265625 + 1.31144011020660400390625 + 1.93920004367828369140625 + 0.969600021839141845703125 blue_horizon 0 - 0.6319204568862915 - 0.93999999761581421 - 0.93999999761581421 + 0 + 0 + 0 cloud_color - 1 - 0 - 0 + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 1 cloud_pos_density1 - 0.53999996185302734 - 0.45999997854232788 - 1 + 0.5 + 0.5 + 0.3499999940395355224609375 1 cloud_pos_density2 - 0.5 - 0.5 - 0.059999998658895493 + 0 + 0.819999992847442626953125 + 0.269999980926513671875 1 cloud_scale - 0.2800000011920929 + 0.1099999919533729553222656 0 0 1 cloud_scroll_rate - 20 - 20 + 9.5100002288818359375 + 10.34999942779541015625 cloud_shadow - 0.31000000238418579 + 0.2099999934434890747070312 0 0 1 density_multiplier - 0.00016999999934341758 + 0.0001199999969685450196266174 0 0 1 distance_multiplier - 8.1000003814697266 + 34.700000762939453125 0 0 1 east_angle - 3.7699110507965088 + 0 enable_cloud_scroll - 0 - 0 + 1 + 1 gamma - 1.5399999618530273 + 0.61000001430511474609375 0 0 1 glow - 0.39999961853027344 - 0.0010000000474974513 - -0.49999997019767761 + 10.3999996185302734375 + 0.001000000047497451305389404 + -1.5499999523162841796875 1 haze_density - 3.2599999904632568 + 0.839999973773956298828125 0 0 1 haze_horizon - 0.4699999988079071 - 0.19915600121021271 - 0.19915600121021271 + 0.07000000029802322387695312 + 0.1991560012102127075195312 + 0.1991560012102127075195312 1 lightnorm - 0.58778512477874756 - 0 - -0.80901706218719482 0 + 1 + -1.192488063850305479718372e-08 + 1 max_y - 1267.5999755859375 + 3413 0 0 1 preset_num - 18 + 21 star_brightness - 0 + 1.7599999904632568359375 sun_angle - -0.031415928155183792 + 4.7123889923095703125 sunlight_color - 0.75 - 0.71999996900558472 - 3 - 3 + 1.04150390625 + 0.94567108154296875 + 0.81005859375 + 0.34716796875 diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%200430.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%200430.xml new file mode 100644 index 000000000..c368db45a --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%200430.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.97265625 + 0.97265625 + 0.97265625 + 0.32421875 + + blue_density + + 1.30079996585845947265625 + 1.31144011020660400390625 + 1.93920004367828369140625 + 0.969600021839141845703125 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.3499999940395355224609375 + 1 + + cloud_pos_density2 + + 0 + 0.819999992847442626953125 + 0.269999980926513671875 + 1 + + cloud_scale + + 0.1099999919533729553222656 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.5100002288818359375 + 10.34999942779541015625 + + cloud_shadow + + 0.2099999934434890747070312 + 0 + 0 + 1 + + density_multiplier + + 0.0001199999969685450196266174 + 0 + 0 + 1 + + distance_multiplier + + 34.700000762939453125 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.61000001430511474609375 + 0 + 0 + 1 + + glow + + 10.3999996185302734375 + 0.001000000047497451305389404 + -1.5499999523162841796875 + 1 + + haze_density + + 0.839999973773956298828125 + 0 + 0 + 1 + + haze_horizon + + 0.07000000029802322387695312 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + 0 + 0.3826834261417388916015625 + -0.92387950420379638671875 + 1 + + max_y + + 3413 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 1.7599999904632568359375 + sun_angle + 5.890486240386962890625 + sunlight_color + + 1.04150390625 + 0.94567108154296875 + 0.81005859375 + 0.34716796875 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%200800.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%200800.xml new file mode 100644 index 000000000..85c9eaa06 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%200800.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.97265625 + 0.97265625 + 0.97265625 + 0.32421875 + + blue_density + + 1.24658203125 + 0.86125946044921875 + 0.48779296875 + 0.623291015625 + + blue_horizon + + 0.401468336582183837890625 + 0.3909056484699249267578125 + 0.304895222187042236328125 + 0.2007341682910919189453125 + + cloud_color + + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.709999978542327880859375 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.12999999523162841796875 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.92999935150146484375 + 10.0109996795654296875 + + cloud_shadow + + 0.37000000476837158203125 + 0 + 0 + 1 + + density_multiplier + + 8.999999408842995762825012e-05 + 0 + 0 + 1 + + distance_multiplier + + 29.3000011444091796875 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 20 + 0.001000000047497451305389404 + -0.1499999910593032836914062 + 1 + + haze_density + + 0.3400000035762786865234375 + 0 + 0 + 1 + + haze_horizon + + 0.3400000035762786865234375 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + -0 + 0.4999992549419403076171875 + 0.86602580547332763671875 + 0 + + max_y + + 3307 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 0.523597896099090576171875 + sunlight_color + + 0.75128173828125 + 0.55612850189208984375 + 0.27996826171875 + 0.25042724609375 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%201200.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%201200.xml new file mode 100644 index 000000000..86ef17984 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%201200.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.97265625 + 0.97265625 + 0.97265625 + 0.32421875 + + blue_density + + 1.24658203125 + 0.86125946044921875 + 0.48779296875 + 0.623291015625 + + blue_horizon + + 0.401468336582183837890625 + 0.3909056484699249267578125 + 0.304895222187042236328125 + 0.2007341682910919189453125 + + cloud_color + + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.2599999904632568359375 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.12999999523162841796875 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.92999935150146484375 + 10.0109996795654296875 + + cloud_shadow + + 0.37000000476837158203125 + 0 + 0 + 1 + + density_multiplier + + 8.999999408842995762825012e-05 + 0 + 0 + 1 + + distance_multiplier + + 29.3000011444091796875 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 20 + 0.001000000047497451305389404 + -0 + 1 + + haze_density + + 0.3400000035762786865234375 + 0 + 0 + 1 + + haze_horizon + + 0.3400000035762786865234375 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + -0 + 1 + 1.148381556959066074341536e-06 + 0 + + max_y + + 3307 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 1.57079517841339111328125 + sunlight_color + + 0.3665771484375 + 0.420141279697418212890625 + 0.6646728515625 + 0.2215576171875 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%201700.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%201700.xml new file mode 100644 index 000000000..f62d67cea --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%201700.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.97265625 + 0.97265625 + 0.97265625 + 0.32421875 + + blue_density + + 1.24658203125 + 0.86125946044921875 + 0.48779296875 + 0.623291015625 + + blue_horizon + + 0.401468336582183837890625 + 0.3909056484699249267578125 + 0.304895222187042236328125 + 0.2007341682910919189453125 + + cloud_color + + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.3499999940395355224609375 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.12999999523162841796875 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.78999996185302734375 + 10.21000003814697265625 + + cloud_shadow + + 0.2099999934434890747070312 + 0 + 0 + 1 + + density_multiplier + + 8.999999408842995762825012e-05 + 0 + 0 + 1 + + distance_multiplier + + 29.3000011444091796875 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 20 + 0.001000000047497451305389404 + -0.64999997615814208984375 + 1 + + haze_density + + 0.3400000035762786865234375 + 0 + 0 + 1 + + haze_horizon + + 0.3400000035762786865234375 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + 0 + 0.2588209807872772216796875 + -0.96592533588409423828125 + 0 + + max_y + + 3307 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.879791259765625 + sunlight_color + + 0.90032958984375 + 0.54568004608154296875 + 0.13092041015625 + 0.30010986328125 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Asiatix.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%201800.xml similarity index 57% rename from indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Asiatix.xml rename to indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%201800.xml index bf3500817..0fe3f0add 100644 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Asiatix.xml +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%201800.xml @@ -2,140 +2,140 @@ ambient - 0.32999998331069946 - 0.059999998658895493 - 0 - 0.32999998331069946 + 0.97265625 + 0.97265625 + 0.97265625 + 0.32421875 blue_density - 0.083504162728786469 - 0.22999770939350128 - 0.45999997854232788 - 0.45999997854232788 + 0.494140625 + 0.341400146484375 + 0.193359375 + 0.2470703125 blue_horizon - 0.31871956586837769 - 0.6319204568862915 - 0.74000000953674316 - 0.74000000953674316 + 0.401468336582183837890625 + 0.3909056484699249267578125 + 0.304895222187042236328125 + 0.2007341682910919189453125 cloud_color - 1 - 0.47999998927116394 - 0.69999998807907104 + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 1 cloud_pos_density1 0.5 0.5 - 0.22999998927116394 + 0.3499999940395355224609375 1 cloud_pos_density2 0.5 0.5 - 0 + 0.125 1 cloud_scale - 0.28999999165534973 + 0.12999999523162841796875 0 0 1 cloud_scroll_rate - 20 - 20 + 9.78999996185302734375 + 10.21000003814697265625 cloud_shadow - 0.38999998569488525 + 0.2099999934434890747070312 0 0 1 density_multiplier - 0.00016999999934341758 + 8.999999408842995762825012e-05 0 0 1 distance_multiplier - 10.699999809265137 + 29.3000011444091796875 0 0 1 east_angle - 3.5814156532287598 + 0 enable_cloud_scroll - 0 - 0 + 1 + 1 gamma - 1.5399999618530273 + 0.819999992847442626953125 0 0 1 glow - 6.6000008583068848 - 0.0010000000474974513 - -0.89999997615814209 + 20 + 0.001000000047497451305389404 + -2.5 1 haze_density - 3.2599999904632568 + 0.3400000035762786865234375 0 0 1 haze_horizon - 0.4699999988079071 - 0.19915600121021271 - 0.19915600121021271 + 0.3400000035762786865234375 + 0.1991560012102127075195312 + 0.1991560012102127075195312 1 lightnorm - 0.4257793128490448 - 0 - -0.9048270583152771 - 0 + -0 + 0.258817017078399658203125 + 0.965926349163055419921875 + 1 max_y - 1267.5999755859375 + 3307 0 0 1 preset_num - 18 + 21 star_brightness 0 sun_angle - 0 + 3.40338993072509765625 sunlight_color - 1.3199999332427979 - 0.84000003337860107 - 0.37800011038780212 - 1.3199999332427979 + 0 + 0 + 0 + 0 diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%202000.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%202000.xml new file mode 100644 index 000000000..da103cd93 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%20Sepia%202000.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.97265625 + 0.97265625 + 0.97265625 + 0.32421875 + + blue_density + + 0.25830078125 + 0.17845916748046875 + 0.10107421875 + 0.129150390625 + + blue_horizon + + 0.401468336582183837890625 + 0.3909056484699249267578125 + 0.304895222187042236328125 + 0.2007341682910919189453125 + + cloud_color + + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.3499999940395355224609375 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.12999999523162841796875 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.78999996185302734375 + 10.21000003814697265625 + + cloud_shadow + + 0.2099999934434890747070312 + 0 + 0 + 1 + + density_multiplier + + 8.999999408842995762825012e-05 + 0 + 0 + 1 + + distance_multiplier + + 29.3000011444091796875 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 20 + 0.001000000047497451305389404 + -2.5 + 1 + + haze_density + + 0.3400000035762786865234375 + 0 + 0 + 1 + + haze_horizon + + 0.3400000035762786865234375 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + -0 + 0.4999983310699462890625 + 0.866026341915130615234375 + 1 + + max_y + + 3307 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 3.6651895046234130859375 + sunlight_color + + 0 + 0 + 0 + 0 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Oyster%20Bay.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D12am.xml similarity index 59% rename from indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Oyster%20Bay.xml rename to indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D12am.xml index ae6c4106c..7dc21b7aa 100644 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Oyster%20Bay.xml +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D12am.xml @@ -9,133 +9,133 @@ blue_density - 0 - 0.49999496340751648 - 1 - 1 + 0.062164306640625 + 0.146548688411712646484375 + 0.265960693359375 + 0.1329803466796875 blue_horizon 0 - 0.80000001192092896 - 1 - 1 + 0 + 0 + 0 cloud_color - 0.37000000476837158 - 0.25999999046325684 - 0.040000002831220627 - 0.37000000476837158 + 0.41015625 + 0.41015625 + 0.41015625 + 0.41015625 cloud_pos_density1 - 0.51999998092651367 - 0.37999999523162842 - 0.68999999761581421 + 0.5 + 0.5 + 0.3499999940395355224609375 1 cloud_pos_density2 - 0 - 0 - 0 + 0.5 + 0.5 + 0.125 1 cloud_scale - 0.17000000178813934 + 0.07999999821186065673828125 0 0 1 cloud_scroll_rate - 10.49940013885498 - 10.01099967956543 + 10.49940013885498046875 + 10.0109996795654296875 cloud_shadow - 0.5 + 0.2299999892711639404296875 0 0 1 density_multiplier - 0.00089999998454004526 + 0.0002999999851454049348831177 0 0 1 distance_multiplier - 14.800000190734863 + 4.80000019073486328125 0 0 1 east_angle - 6.1575217247009277 + 0 enable_cloud_scroll - 0 - 0 + 1 + 1 gamma - 1.6699999570846558 + 0.819999992847442626953125 0 0 1 glow - 14.000000953674316 - 0.0010000000474974513 - -1.4999998807907104 + 20 + 0.001000000047497451305389404 + -0.199999988079071044921875 1 haze_density - 0.62000000476837158 + 0.939999997615814208984375 0 0 1 haze_horizon - 0.44999998807907104 - 0.19915600121021271 - 0.19915600121021271 + 0 + 0.1991560012102127075195312 + 0.1991560012102127075195312 1 lightnorm - 0.093491122126579285 - 0.66601186990737915 - 0.74005919694900513 - 0 + -0 + 1 + 2.372260951233329251408577e-06 + 1 max_y - 1 + 3280 0 0 1 preset_num - 18 + 21 star_brightness - 0 + 0.769999980926513671875 sun_angle - 0.72884953022003174 + 4.712386608123779296875 sunlight_color - 1.5 - 0.89361709356307983 - 0.47872340679168701 - 0.5 + 0.6617889404296875 + 0.693290233612060546875 + 0.7678985595703125 + 0.2559661865234375 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Holy%20romance.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D12pm.xml similarity index 53% rename from indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Holy%20romance.xml rename to indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D12pm.xml index 4515e5ef5..0914331fa 100644 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Holy%20romance.xml +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D12pm.xml @@ -2,75 +2,75 @@ ambient - 0.31535112857818604 - 0.37471914291381836 - 0.50999999046325684 - 0.17000000178813934 + 0.269999980926513671875 + 0.2100000083446502685546875 + 0.08999999612569808959960938 + 0.269999980926513671875 blue_density - 0.019999999552965164 - 0.31999650597572327 - 0.63999998569488525 - 0.69999998807907104 + 0.328582763671875 + 0.77461493015289306640625 + 1.405792236328125 + 0.7028961181640625 blue_horizon - 0.37999999523162842 - 0.34158006310462952 - 0.39999997615814209 - 0.39999997615814209 + 0.29799711704254150390625 + 0.3643911778926849365234375 + 0.4083664417266845703125 + 0.20418322086334228515625 cloud_color - 0.34000000357627869 - 0.21396400034427643 - 0.21396400034427643 - 0.34000000357627869 + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 + 1 cloud_pos_density1 - 0.27044001221656799 - 1 - 1 + 0.5 + 0.5 + 0.5 1 cloud_pos_density2 - 0.5 - 0.5 - 0.10062900185585022 + 0.25 + 0.4099999964237213134765625 + 0.2199999988079071044921875 1 cloud_scale - 0.41999998688697815 + 0.07999999821186065673828125 0 0 1 cloud_scroll_rate - 9.644780158996582 - 10.423800468444824 + 10.49940013885498046875 + 10.0109996795654296875 cloud_shadow - 0.32704401016235352 + 0.25 0 0 1 density_multiplier - 0.00015849100600462407 + 8.999999408842995762825012e-05 0 0 1 distance_multiplier - 3.4000000953674316 + 17 0 0 1 @@ -84,58 +84,58 @@ gamma - 1 + 0.819999992847442626953125 0 0 1 glow - 5 - 0.0013735899701714516 - -0.55000001192092896 + 20 + 0.001000000047497451305389404 + -0.199999988079071044921875 1 haze_density - 0.6792449951171875 + 1.19999992847442626953125 0 0 1 haze_horizon - 0.13210900127887726 - 0.13210900127887726 - 0.13210900127887726 + 0.1700000017881393432617188 + 0.1991560012102127075195312 + 0.1991560012102127075195312 1 lightnorm - 0 - 0.031410444527864456 - -0.99950659275054932 + -0 + 1 + 1.148381556959066074341536e-06 0 max_y - 1308.1800537109375 + 3307 0 0 1 preset_num - 5 + 21 star_brightness 0 sun_angle - 3.1101770401000977 + 1.57079517841339111328125 sunlight_color - 3 - 3 - 3 - 1 + 2.00408935546875 + 1.76338291168212890625 + 1.69903564453125 + 0.66802978515625 diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20Studio%20Light%20%28Gillian%29.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D4am.xml similarity index 55% rename from indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20Studio%20Light%20%28Gillian%29.xml rename to indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D4am.xml index f3f0d20cb..97db9f740 100644 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20Studio%20Light%20%28Gillian%29.xml +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D4am.xml @@ -2,81 +2,81 @@ ambient - 0.86250013113021851 - 0.89999997615814209 - 0.89999997615814209 - 0.29999998211860657 + 0.228515625 + 0.1777344793081283569335938 + 0.076171875 + 0.076171875 blue_density - 0.14522500336170197 - 0.39999699592590332 - 0.80000197887420654 - 1 + 0.032562255859375 + 0.0767636001110076904296875 + 0.139312744140625 + 0.0696563720703125 blue_horizon - 0.15130999684333801 - 0.30000001192092896 - 0.35131001472473145 - 1 + 0.09228515625 + 0.1128463670611381530761719 + 0.12646484375 + 0.063232421875 cloud_color - 0.12862999737262726 - 0.12862999737262726 - 0.12862999737262726 + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 1 cloud_pos_density1 - 0.88419097661972046 - 0.53047597408294678 - 0.4270470142364502 + 0.5 + 0.5 + 1 1 cloud_pos_density2 - 0.38419300317764282 + 0.5 0.5 0.125 1 cloud_scale - 0.41999998688697815 + 0.07999999821186065673828125 0 0 1 cloud_scroll_rate - 10 - 10 + 10.49940013885498046875 + 10.0109996795654296875 cloud_shadow - 0 + 0.2899999916553497314453125 0 0 1 density_multiplier - 0.0001250890054507181 + 4.999999873689375817775726e-05 0 0 1 distance_multiplier - 6.9000000953674316 + 25.8999996185302734375 0 0 1 east_angle - 6.2831854820251465 + 0 enable_cloud_scroll 1 @@ -84,58 +84,58 @@ gamma - 1.0099999904632568 + 0.819999992847442626953125 0 0 1 glow - 6.8000006675720215 - 0.0012815999798476696 - -0.42292699217796326 + 20 + 0.001000000047497451305389404 + -2.5 1 haze_density - 4 + 2.3299999237060546875 0 0 1 haze_horizon - 0.21744099259376526 - 0.21744099259376526 - 0.21744099259376526 + 0.1099999994039535522460938 + 0.1991560012102127075195312 + 0.1991560012102127075195312 1 lightnorm - -1.7332573065687029e-007 - 0.13156437873840332 - 0.99130761623382568 0 + 0.500000178813934326171875 + -0.866025269031524658203125 + 1 max_y - 4000 + 3307 0 0 1 preset_num - 2 + 21 star_brightness - 0 + 0.949999988079071044921875 sun_angle - 0.13194690644741058 + 5.759586334228515625 sunlight_color - 3 - 3 - 3 - 1 + 0.3046875 + 0.3046875 + 0.3046875 + 0.1015625 diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D4pm.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D4pm.xml new file mode 100644 index 000000000..706bf5ae7 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D4pm.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.269999980926513671875 + 0.2100000083446502685546875 + 0.08999999612569808959960938 + 0.269999980926513671875 + + blue_density + + 0.328582763671875 + 0.77461493015289306640625 + 1.405792236328125 + 0.7028961181640625 + + blue_horizon + + 0.29799711704254150390625 + 0.3643911778926849365234375 + 0.4083664417266845703125 + 0.20418322086334228515625 + + cloud_color + + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.07999999821186065673828125 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498046875 + 10.0109996795654296875 + + cloud_shadow + + 0.25 + 0 + 0 + 1 + + density_multiplier + + 8.999999408842995762825012e-05 + 0 + 0 + 1 + + distance_multiplier + + 17 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 20 + 0.001000000047497451305389404 + -0.199999988079071044921875 + 1 + + haze_density + + 1.19999992847442626953125 + 0 + 0 + 1 + + haze_horizon + + 0.1700000017881393432617188 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + 0 + 0.500001490116119384765625 + -0.866024553775787353515625 + 0 + + max_y + + 3307 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.6179921627044677734375 + sunlight_color + + 2.00408935546875 + 1.76338291168212890625 + 1.69903564453125 + 0.66802978515625 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D5am.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D5am.xml new file mode 100644 index 000000000..dafc1e3f9 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D5am.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.509765625 + 0.39648449420928955078125 + 0.169921875 + 0.169921875 + + blue_density + + 0.15985107421875 + 0.37683951854705810546875 + 0.68389892578125 + 0.341949462890625 + + blue_horizon + + 0.29799711704254150390625 + 0.3643911778926849365234375 + 0.4083664417266845703125 + 0.20418322086334228515625 + + cloud_color + + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.07999999821186065673828125 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498046875 + 10.0109996795654296875 + + cloud_shadow + + 0.329999983310699462890625 + 0 + 0 + 1 + + density_multiplier + + 8.999999408842995762825012e-05 + 0 + 0 + 1 + + distance_multiplier + + 8.19999980926513671875 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 20 + 0.001000000047497451305389404 + -0.199999988079071044921875 + 1 + + haze_density + + 1.19999992847442626953125 + 0 + 0 + 1 + + haze_horizon + + 0.1799999922513961791992188 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + -0 + 0 + 0.999999940395355224609375 + 0 + + max_y + + 3307 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 6.152285099029541015625 + sunlight_color + + 0.26953125 + 0.26953125 + 0.26953125 + 0.08984375 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D5pm.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D5pm.xml new file mode 100644 index 000000000..e12e64492 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D5pm.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.269999980926513671875 + 0.2100000083446502685546875 + 0.08999999612569808959960938 + 0.269999980926513671875 + + blue_density + + 0.328582763671875 + 0.77461493015289306640625 + 1.405792236328125 + 0.7028961181640625 + + blue_horizon + + 0.29799711704254150390625 + 0.3643911778926849365234375 + 0.4083664417266845703125 + 0.20418322086334228515625 + + cloud_color + + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.07999999821186065673828125 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498046875 + 10.0109996795654296875 + + cloud_shadow + + 0.25 + 0 + 0 + 1 + + density_multiplier + + 8.999999408842995762825012e-05 + 0 + 0 + 1 + + distance_multiplier + + 17 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 17.3999996185302734375 + 0.001000000047497451305389404 + -0.2999999821186065673828125 + 1 + + haze_density + + 1.19999992847442626953125 + 0 + 0 + 1 + + haze_horizon + + 0.1700000017881393432617188 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + 0 + 0.2588209807872772216796875 + -0.96592533588409423828125 + 0 + + max_y + + 3307 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.879791259765625 + sunlight_color + + 2.00408935546875 + 1.76338291168212890625 + 1.69903564453125 + 0.66802978515625 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D6am.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D6am.xml new file mode 100644 index 000000000..24d77de9c --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D6am.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.73828125 + 0.574218928813934326171875 + 0.24609375 + 0.24609375 + + blue_density + + 0.15985107421875 + 0.37683951854705810546875 + 0.68389892578125 + 0.341949462890625 + + blue_horizon + + 0.29799711704254150390625 + 0.3643911778926849365234375 + 0.4083664417266845703125 + 0.20418322086334228515625 + + cloud_color + + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.709999978542327880859375 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.07999999821186065673828125 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498046875 + 10.0109996795654296875 + + cloud_shadow + + 0.459999978542327880859375 + 0 + 0 + 1 + + density_multiplier + + 8.999999408842995762825012e-05 + 0 + 0 + 1 + + distance_multiplier + + 29.3000011444091796875 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 12.799999237060546875 + 0.001000000047497451305389404 + -1.10000002384185791015625 + 1 + + haze_density + + 1.19999992847442626953125 + 0 + 0 + 1 + + haze_horizon + + 0.1700000017881393432617188 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + -0 + 0 + 1 + 0 + + max_y + + 3307 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 6.283184528350830078125 + sunlight_color + + 1.6461181640625 + 1.3415508270263671875 + 1.2601318359375 + 0.5487060546875 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Warmer%20sunset.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D6pm.xml similarity index 56% rename from indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Warmer%20sunset.xml rename to indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D6pm.xml index b3282f919..07556d961 100644 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Warmer%20sunset.xml +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D6pm.xml @@ -2,37 +2,37 @@ ambient - 0.44999998807907104 - 0.20999999344348907 - 0.10999999940395355 - 0.44999998807907104 + 0.685546875 + 0.533202946186065673828125 + 0.228515625 + 0.228515625 blue_density - 0.039999999105930328 - 0.39999699592590332 - 0.80000197887420654 - 1 + 0.12432861328125 + 0.29309737682342529296875 + 0.53192138671875 + 0.265960693359375 blue_horizon - 0.40999999642372131 - 0.21348699927330017 - 0.25 - 0.40999999642372131 + 0.29799711704254150390625 + 0.3643911778926849365234375 + 0.4083664417266845703125 + 0.20418322086334228515625 cloud_color - 0.22615399956703186 - 0.22615399956703186 - 0.22615399956703186 + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 1 cloud_pos_density1 0.5 0.5 - 0.74000000953674316 + 1 1 cloud_pos_density2 @@ -44,33 +44,33 @@ cloud_scale - 0.32999998331069946 + 0.07999999821186065673828125 0 0 1 cloud_scroll_rate - 10.49940013885498 - 10.01099967956543 + 10.49940013885498046875 + 10.0109996795654296875 cloud_shadow - 0.40999999642372131 + 0.25 0 0 1 density_multiplier - 0.00046000001020729542 + 8.999999408842995762825012e-05 0 0 1 distance_multiplier - 2.7000000476837158 + 14.30000019073486328125 0 0 1 @@ -79,63 +79,63 @@ 0 enable_cloud_scroll - 0 - 0 + 1 + 1 gamma - 2.0499999523162842 + 0.819999992847442626953125 0 0 1 glow - 13.600001335144043 - 0.0010000000474974513 - -0.55000001192092896 + 8.60000133514404296875 + 0.001000000047497451305389404 + -1.0499999523162841796875 1 haze_density - 0.69999998807907104 + 0.680000007152557373046875 0 0 1 haze_horizon - 0.15999999642372131 - 0.19915600121021271 - 0.19915600121021271 + 0.1700000017881393432617188 + 0.1991560012102127075195312 + 0.1991560012102127075195312 1 lightnorm 0 - 0.056518375873565674 - -0.99840158224105835 + 2.058344534816569648683071e-06 + -1 0 max_y - 562.5 + 3307 0 0 1 preset_num - 18 + 21 star_brightness 0 sun_angle - 3.0850441455841064 + 3.141590595245361328125 sunlight_color - 3 - 2.8385701179504395 - 2.8385701179504395 - 3 + 0.6767578125 + 0.788543701171875 + 0.8701171875 + 0.2900390625 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Fogvari.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D7pm.xml similarity index 63% rename from indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Fogvari.xml rename to indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D7pm.xml index addb48039..66f532913 100644 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Fogvari.xml +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D7pm.xml @@ -2,37 +2,37 @@ ambient - 0.3952941596508026123046875 - 0.3952941596508026123046875 - 0.420000016689300537109375 - 0.1400000005960464477539062 + 0.731689453125 + 0.668346405029296875 + 0.533935546875 + 0.243896484375 blue_density - 0.1452250033617019653320312 - 0.3999969959259033203125 - 0.80000197887420654296875 - 1 + 0.12432861328125 + 0.29309737682342529296875 + 0.53192138671875 + 0.265960693359375 blue_horizon - 0.430702149868011474609375 - 0.853946685791015625 - 1 - 1 + 0.29799711704254150390625 + 0.3643911778926849365234375 + 0.4083664417266845703125 + 0.20418322086334228515625 cloud_color - 0.699999988079071044921875 - 0.699999988079071044921875 - 0.699999988079071044921875 - 0.699999988079071044921875 + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 + 1 cloud_pos_density1 0.5 0.5 - 0.53999996185302734375 + 1 1 cloud_pos_density2 @@ -44,7 +44,7 @@ cloud_scale - 0.2999999821186065673828125 + 0.07999999821186065673828125 0 0 1 @@ -56,21 +56,21 @@ cloud_shadow - 0.2199999988079071044921875 + 0.25 0 0 1 density_multiplier - 0.0003100000030826777219772339 + 8.999999408842995762825012e-05 0 0 1 distance_multiplier - 8.1000003814697265625 + 14.30000019073486328125 0 0 1 @@ -84,58 +84,58 @@ gamma - 0.949999988079071044921875 + 0.819999992847442626953125 0 0 1 glow - 0.99999904632568359375 + 20 0.001000000047497451305389404 -2.5 1 haze_density - 4 + 0.729999959468841552734375 0 0 1 haze_horizon - 0.64999997615814208984375 + 0.1199999973177909851074219 0.1991560012102127075195312 0.1991560012102127075195312 1 lightnorm - 0 - 0.99715888500213623046875 - -0.0753269493579864501953125 - 0 + -0 + 0.258817017078399658203125 + 0.965926349163055419921875 + 1 max_y - 54 + 3307 0 0 1 preset_num - 18 + 21 star_brightness - 0 + 0.38999998569488525390625 sun_angle - 1.6461946964263916015625 + 3.40338993072509765625 sunlight_color - 0.599999964237213134765625 - 0.599999964237213134765625 - 0.599999964237213134765625 - 0.199999988079071044921875 + 0 + 0 + 0 + 0 diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D8am.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D8am.xml new file mode 100644 index 000000000..e951cf77e --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D8am.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.38671875 + 0.30078125 + 0.12890625 + 0.12890625 + + blue_density + + 0.328582763671875 + 0.77461493015289306640625 + 1.405792236328125 + 0.7028961181640625 + + blue_horizon + + 0.29799711704254150390625 + 0.3643911778926849365234375 + 0.4083664417266845703125 + 0.20418322086334228515625 + + cloud_color + + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.709999978542327880859375 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.07999999821186065673828125 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498046875 + 10.0109996795654296875 + + cloud_shadow + + 0.25 + 0 + 0 + 1 + + density_multiplier + + 8.999999408842995762825012e-05 + 0 + 0 + 1 + + distance_multiplier + + 29.3000011444091796875 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 20 + 0.001000000047497451305389404 + -0.2999999821186065673828125 + 1 + + haze_density + + 1.19999992847442626953125 + 0 + 0 + 1 + + haze_horizon + + 0.1700000017881393432617188 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + -0 + 0.555569469928741455078125 + 0.83147013187408447265625 + 0 + + max_y + + 3307 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 0.5890476703643798828125 + sunlight_color + + 2.00408935546875 + 1.76338291168212890625 + 1.69903564453125 + 0.66802978515625 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D9pm.xml b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D9pm.xml new file mode 100644 index 000000000..1b1e0d6d3 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/%5BNB%5D%2DMistyDay%2D9pm.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.520111083984375 + 0.47569942474365234375 + 0.370513916015625 + 0.173370361328125 + + blue_density + + 0.133209228515625 + 0.31403291225433349609375 + 0.569915771484375 + 0.2849578857421875 + + blue_horizon + + 0.349365234375 + 0.4272041022777557373046875 + 0.478759765625 + 0.2393798828125 + + cloud_color + + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.64999997615814208984375 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.07999999821186065673828125 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498046875 + 10.0109996795654296875 + + cloud_shadow + + 0.25 + 0 + 0 + 1 + + density_multiplier + + 8.999999408842995762825012e-05 + 0 + 0 + 1 + + distance_multiplier + + 7.5 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.819999992847442626953125 + 0 + 0 + 1 + + glow + + 20 + 0.001000000047497451305389404 + -0.199999988079071044921875 + 1 + + haze_density + + 2.2200000286102294921875 + 0 + 0 + 1 + + haze_horizon + + 0.1700000017881393432617188 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + -0 + 0.70710504055023193359375 + 0.70710849761962890625 + 1 + + max_y + + 3307 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 3.9269883632659912109375 + sunlight_color + + 0.0384521484375 + 0.08151056617498397827148438 + 0.1959228515625 + 0.0653076171875 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%202012.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%202012.xml deleted file mode 100644 index 657f423d9..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%202012.xml +++ /dev/null @@ -1 +0,0 @@ -ambient10.4592350125312805201blue_density0.256136158253326580.418193680840090560.67263220168956651blue_horizon0.477746507050028410.801083839831449040.912661194779673220.98532241580704749cloud_color0.527561901605793080.527561901605793080.527561901605793081cloud_pos_density10.729999959468841550.340000003576278690.329999983310699461cloud_pos_density20.289999991655349730.849999964237213130.0199999995529651641cloud_scale0.32999998058761548001cloud_scroll_rate10.49939994693431810.010999746491507cloud_shadow0.34999999403953552001density_multiplier9.9999997473787516e-006001distance_multiplier0.69999999890643494001east_angle0.9424777626991272enable_cloud_scroll00gamma1.610000025154136001glow5.79999923706054690.0010000000474974513-1.04999995231628421haze_density1.5557675468824073001haze_horizon0.331743866205215450.19915598426251790.19915598426251791lightnorm-0.761188507080078130.338737934827804570.553035855293273930max_y711.42973550362512001preset_num18star_brightness0sun_angle0.34557521343231201sunlight_color2.33999991416931150.359999984502792360.449999988079071042.3399999141693115 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%202013.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%202013.xml deleted file mode 100644 index e413b9aaf..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%202013.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.799999952316284180.367387980222702030.189999997615814210.79999995231628418blue_density0.579999983310699460.230039015412330630.370000004768371580.57999998331069946blue_horizon0.389999985694885250.389999985694885250.355937868356704710.38999998569488525cloud_color0.560000002384185790.479999989271163940.527561902999877930.56000000238418579cloud_pos_density10.719999969005584720.359999984502792360.289999991655349731cloud_pos_density20.329999983310699460.560000002384185790.0499999970197677611cloud_scale0.31000000238418579001cloud_scroll_rate10.49939994693431810.010999746491507cloud_shadow0.31999999284744263001density_multiplier9.9999997473787516e-006001distance_multiplier79.200004577636719001east_angle4.0840702056884766enable_cloud_scroll00gamma1.5399999618530273001glow9.20000076293945310.0010000000474974513-1.14999997615814211haze_density1.3299999237060547001haze_horizon0.539999961853027340.199155986309051510.199155986309051511lightnorm0.776893794536590580.27899110317230225-0.564446628093719480max_y140.80000305175781001preset_num18star_brightness0.77999997138977051sun_angle0.28274333477020264sunlight_color2.06999993324279790.479999989271163940.299999982118606570.68999999761581421 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Alien%20planet.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Alien%20planet.xml deleted file mode 100644 index ff69e157a..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Alien%20planet.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.829999983310699460.189999997615814210.209999993443489070.82999998331069946blue_density00.495000094175338750.629999995231628420.62999999523162842blue_horizon0.516750633716583250.346719682216644290.659999966621398930.65999996662139893cloud_color0.189999997615814210.07000000029802322400.18999999761581421cloud_pos_density10.689999997615814210.329999983310699460.519999980926513671cloud_pos_density20.21999999880790710.849999964237213130.129999995231628421cloud_scale0.47999998927116394001cloud_scroll_rate10.45399374929490910.026071512513319cloud_shadow0.28999999165534973001density_multiplier1.9999999494757503e-005001distance_multiplier26.80000114440918001east_angle4.5867252349853516enable_cloud_scroll00gamma0.87000000476837158001glow0.199999809265136720.0010000000474974513-0.499999970197677611haze_density2.2100000381469727001haze_horizon0.259999990463256840.199156001210212710.199156001210212711lightnorm-0.869396686553955080.481753766536712650.109830379486083980max_y394.39999389648437001preset_num18star_brightness1.1000000238418579sun_angle2.6389377117156982sunlight_color1.43999993801116941.830000042915344233 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20An%20incongruent%20truth.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20An%20incongruent%20truth.xml deleted file mode 100644 index a780e5d96..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20An%20incongruent%20truth.xml +++ /dev/null @@ -1 +0,0 @@ -ambient000.449999988079071040.44999998807907104blue_density0.139975394440892130.386657924784614690.773322942521957660.95108884837904384blue_horizon00.228766843676567080.2900182306766510.31999999284744263cloud_color0.259999990463256840.288832098245620730.289943695068359380.28999999165534973cloud_pos_density10.179999992251396180.509999990463256840.919999957084655761cloud_pos_density20.50.50.0799999982118606571cloud_scale0.25001cloud_scroll_rate10.43610451752829210.032009389655741cloud_shadow0.34000000357627869001density_multiplier0.0002899999963119626001distance_multiplier1.3000000715255737001east_angle2.2619466781616211enable_cloud_scroll00gamma1.5399999618530273001glow4.00000095367431640.0010000000474974513-0.749999940395355221haze_density0.12999999523162842001haze_horizon0.149999991059303280.199156001210212710.199156001210212711lightnorm-0.746306180953979490.24868990480899811-0.617398142814636230max_y394.39999389648437001preset_num18star_brightness0.44999998807907104sun_angle0.25132742524147034sunlight_color2.69999980926513672.34900021553039551.40400028228759770.89999997615814209 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Anime%20Ciel.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Anime%20Ciel.xml deleted file mode 100644 index 41275af40..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Anime%20Ciel.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.330000013113021850.330000013113021850.779999971389770510.77999997138977051blue_density0.0979999974370002750.28000000119209290.560000002384185790.56000000238418579blue_horizon0.119999997317790990.350942999124526980.610000014305114750.61000001430511475cloud_color0.58999997377395630.790000021457672120.800000011920928961cloud_pos_density10.50.511cloud_pos_density20.50.50.0700000002980232241cloud_scale0.32999998331069946001cloud_scroll_rate9.930000305175781310.199999809265137cloud_shadow0.31999999284744263001density_multiplier0.00013000000035390258001distance_multiplier6001east_angle3.1415927410125732enable_cloud_scroll00gamma1.6100000143051147001glow3.80000114440917970.0010000000474974513-0.499999970197677611haze_density0.20999999344348907001haze_horizon0.199999988079071040.199156001210212710.199156001210212711lightnorm6.6002361555513294e-0151-7.5497901264043321e-0080max_y1380.300048828125001preset_num18star_brightness0sun_angle1.5707962512969971sunlight_color1.25999999046325681.25999999046325681.25999999046325680.41999998688697815 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Anwar.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Anwar.xml deleted file mode 100644 index 9f9bf4b87..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Anwar.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.289999991655349730.351273000240325930.478086709976196290.50999999046325684blue_density00.719999969005584720.569999992847442630.71999996900558472blue_horizon0.229999989271163940.199999988079071040.119999997317790990.22999998927116394cloud_color0.179999992251396180.179999992251396180.179999992251396180.17999999225139618cloud_pos_density10.639999985694885250.50.649999976158142091cloud_pos_density20.349999994039535520.50.089999996125698091cloud_scale0.29999998211860657001cloud_scroll_rate10.49939990868460910.010999908119629cloud_shadow0.17000000178813934001density_multiplier0.00020999999833293259001distance_multiplier12.800000190734863001east_angle2.8902652263641357enable_cloud_scroll00gamma1.0699999332427979001glow10.3999996185302730.0010000000474974513-0.749999940395355221haze_density2.1299998760223389001haze_horizon0.229999989271163940.199156001210212710.199156001210212711lightnorm0.24819916486740112-0.0627906322479248050.966671884059906010max_y281.70001220703125001preset_num18star_brightness1.0231049060821533sun_angle3.2044246196746826sunlight_color1.74383580684661872.219427108764648433 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Apts.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Apts.xml deleted file mode 100644 index 2032fcfd1..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Apts.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.38999998569488525 - 0.17115989327430725 - 0.17727270722389221 - 0.12999999523162842 - - blue_density - - 0.69999998807907104 - 0.2439369410276413 - 0.48787873983383179 - 0.34999999403953552 - - blue_horizon - - 0 - 0.54652589559555054 - 0.63999998569488525 - 0.74000000953674316 - - cloud_color - - 0.61000001430511475 - 0 - 0 - 0.61000001430511475 - - cloud_pos_density1 - - 0.53999996185302734 - 0.50999999046325684 - 0.23999999463558197 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.059999998658895493 - 1 - - cloud_scale - - 0.2800000011920929 - 0 - 0 - 1 - - cloud_scroll_rate - - 20 - 20 - - cloud_shadow - - 0.11999999731779099 - 0 - 0 - 1 - - density_multiplier - - 0.00011999999696854502 - 0 - 0 - 1 - - distance_multiplier - - 4.0999999046325684 - 0 - 0 - 1 - - east_angle - 3.7070791721343994 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.7599999904632568 - 0 - 0 - 1 - - glow - - 0.59999942779541016 - 0.0010000000474974513 - -0.59999996423721313 - 1 - - haze_density - - 2.3499999046325684 - 0 - 0 - 1 - - haze_horizon - - 0.37999999523162842 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.47588729858398438 - 0.45957952737808228 - 0.74987858533859253 - 1 - - max_y - - 832 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 2 - sun_angle - 5.8056635856628418 - sunlight_color - - 2.0399999618530273 - 0.58285719156265259 - 0.30600005388259888 - 0.68000000715255737 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Arid%20nestler.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Arid%20nestler.xml deleted file mode 100644 index 1eff3afa7..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Arid%20nestler.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.054342277348041534 - 0.249813511967659 - 0.34000000357627869 - 0.34000000357627869 - - blue_density - - 0.4699999988079071 - 0.4699999988079071 - 0.4699999988079071 - 0.4699999988079071 - - blue_horizon - - 0.2799564003944397 - 0.2199999988079071 - 0.64999997615814209 - 0.64999997615814209 - - cloud_color - - 0.34000000357627869 - 0.16604645550251007 - 0.16918087005615234 - 0.34000000357627869 - - cloud_pos_density1 - - 0.26999998092651367 - 0.099999994039535522 - 1 - 1 - - cloud_pos_density2 - - 0.32999998331069946 - 0.52999997138977051 - 0.059999998658895493 - 1 - - cloud_scale - - 0.41999998688697815 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.644780158996582 - 10.423800468444824 - - cloud_shadow - - 0.31000000238418579 - 0 - 0 - 1 - - density_multiplier - - 5.999999848427251e-005 - 0 - 0 - 1 - - distance_multiplier - - 15.40000057220459 - 0 - 0 - 1 - - east_angle - 0.18849556148052216 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.5399999618530273 - 0 - 0 - 1 - - glow - - 5 - 0.0010000000474974513 - -0.24999998509883881 - 1 - - haze_density - - 0.66999995708465576 - 0 - 0 - 1 - - haze_horizon - - 0.15999999642372131 - 0.13210900127887726 - 0.13210900127887726 - 1 - - lightnorm - - 0.18643523752689362 - 0.10036152601242065 - -0.97732770442962646 - 0 - - max_y - - 737 - 0 - 0 - 1 - - preset_num - 3 - star_brightness - 0.62999999523162842 - sun_angle - 3.0410618782043457 - sunlight_color - - 2.2200000286102295 - 2.2200000286102295 - 2.2200000286102295 - 0.74000000953674316 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Arrakissed%20variation.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Arrakissed%20variation.xml deleted file mode 100644 index 490f3d0dc..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Arrakissed%20variation.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.17999999225139618 - 0.14482758939266205 - 0.14999999105930328 - 0.21000000834465027 - - blue_density - - 0 - 0.22999770939350128 - 0.45999997854232788 - 0.65999996662139893 - - blue_horizon - - 0 - 0.54652589559555054 - 0.63999998569488525 - 0.31999999284744263 - - cloud_color - - 0.61000001430511475 - 0 - 0 - 0.61000001430511475 - - cloud_pos_density1 - - 0.53999996185302734 - 0.50999999046325684 - 0.23999999463558197 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.059999998658895493 - 1 - - cloud_scale - - 0.2800000011920929 - 0 - 0 - 1 - - cloud_scroll_rate - - 20 - 20 - - cloud_shadow - - 0.11999999731779099 - 0 - 0 - 1 - - density_multiplier - - 0.00022000000171829015 - 0 - 0 - 1 - - distance_multiplier - - 0 - 0 - 0 - 1 - - east_angle - 3.7070791721343994 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.7599999904632568 - 0 - 0 - 1 - - glow - - 0.39999961853027344 - 0.0010000000474974513 - -0.74999994039535522 - 1 - - haze_density - - 2.679999828338623 - 0 - 0 - 1 - - haze_horizon - - 0.40999999642372131 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.49942854046821594 - 0.36227551102638245 - -0.78697365522384644 - 1 - - max_y - - 1128 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0.68000000715255737 - sun_angle - 3.5123007297515869 - sunlight_color - - 2.0999999046325684 - 0.59999978542327881 - 0.31500005722045898 - 0.69999998807907104 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Arrakissed.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Arrakissed.xml deleted file mode 100644 index 66dfef5fb..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Arrakissed.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.17999999225139618 - 0.14482758939266205 - 0.14999999105930328 - 0.21000000834465027 - - blue_density - - 0 - 0.22999770939350128 - 0.45999997854232788 - 0.65999996662139893 - - blue_horizon - - 0 - 0.54652589559555054 - 0.63999998569488525 - 0.31999999284744263 - - cloud_color - - 0.61000001430511475 - 0 - 0 - 0.61000001430511475 - - cloud_pos_density1 - - 0.53999996185302734 - 0.50999999046325684 - 0.23999999463558197 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.059999998658895493 - 1 - - cloud_scale - - 0.2800000011920929 - 0 - 0 - 1 - - cloud_scroll_rate - - 20 - 20 - - cloud_shadow - - 0.11999999731779099 - 0 - 0 - 1 - - density_multiplier - - 0.00022000000171829015 - 0 - 0 - 1 - - distance_multiplier - - 0 - 0 - 0 - 1 - - east_angle - 2.8274333477020264 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.7599999904632568 - 0 - 0 - 1 - - glow - - 0.39999961853027344 - 0.0010000000474974513 - -0.74999994039535522 - 1 - - haze_density - - 2.679999828338623 - 0 - 0 - 1 - - haze_horizon - - 0.40999999642372131 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.30239814519882202 - 0.20586305856704712 - -0.93068563938140869 - 1 - - max_y - - 1128 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0.68000000715255737 - sun_angle - 3.3489382266998291 - sunlight_color - - 2.0999999046325684 - 0.59999978542327881 - 0.31500005722045898 - 0.69999998807907104 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Asian%20red%20dawn.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Asian%20red%20dawn.xml deleted file mode 100644 index 39813c203..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Asian%20red%20dawn.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.0399999991059303280.02999999932944774600.039999999105930328blue_density00.259999990463256840.50.5blue_horizon0000cloud_color0.25999999046325684000.25999999046325684cloud_pos_density10.689999997615814210.689999997615814210.51cloud_pos_density20.519999980926513670.810000002384185790.109999999403953551cloud_scale0.34999999403953552001cloud_scroll_rate2020cloud_shadow0.34999999403953552001density_multiplier0.00019999999494757503001distance_multiplier22.100000381469727001east_angle1.5707963705062866enable_cloud_scroll00gamma1.2099999189376831001glow200.001000000047497451301haze_density0.0099999997764825821001haze_horizon00.199156001210212710.199156001210212711lightnorm0.998026728630065920.0627904608845710754.362513550404401e-0080max_y1014.1000366210937001preset_num18star_brightness0.75999999046325684sun_angle3.0787608623504639sunlight_color1.6199998855590821.26900005340576170.918000042438507080.53999996185302734 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Awwyeah.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Awwyeah.xml deleted file mode 100644 index 8dc68fcb1..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Awwyeah.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0 - 0 - 0.68999993801116943 - 0.22999998927116394 - - blue_density - - 0.23400001227855682 - 0.41999998688697815 - 1.2999999523162842 - 0.64999997615814209 - - blue_horizon - - 0.4346749484539032 - 0.46184208989143372 - 0.77999997138977051 - 0.38999998569488525 - - cloud_color - - 0.27569431066513062 - 0.44999998807907104 - 0.38830187916755676 - 0.44999998807907104 - - cloud_pos_density1 - - 0.79999995231628418 - 0.59999996423721313 - 0.75999999046325684 - 1 - - cloud_pos_density2 - - 0.47999998927116394 - 0.32999998331069946 - 0.19999998807907104 - 1 - - cloud_scale - - 0.14000000059604645 - 0 - 0 - 1 - - cloud_scroll_rate - - 20 - 20 - - cloud_shadow - - 0.35999998450279236 - 0 - 0 - 1 - - density_multiplier - - 9.9999997473787516e-006 - 0 - 0 - 1 - - distance_multiplier - - 54.700000762939453 - 0 - 0 - 1 - - east_angle - 4.5238933563232422 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.2799999713897705 - 0 - 0 - 1 - - glow - - 4.2000007629394531 - 0.0010000000474974513 - -1.5499999523162842 - 1 - - haze_density - - 1.6200000047683716 - 0 - 0 - 1 - - haze_horizon - - 0.5899999737739563 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.94987320899963379 - 0.25477075576782227 - -0.18119806051254272 - 0 - - max_y - - 2792 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 0.34000000357627869 - sun_angle - 0.25761061906814575 - sunlight_color - - 2.0099997520446777 - 1.5476992130279541 - 0.76379972696304321 - 0.66999995708465576 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Azure%20desertation%202.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Azure%20desertation%202.xml deleted file mode 100644 index 2edb92918..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Azure%20desertation%202.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.029999999329447746000.029999999329447746blue_density0.0979999974370002750.280000001192092911blue_horizon0.119999997317790990.3509429991245269811cloud_color0.489999979734420780.790000021457672120.800000011920928961cloud_pos_density10.489999979734420780.50.189999997615814211cloud_pos_density20.389999985694885250.50.259999990463256841cloud_scale0.37000000476837158001cloud_scroll_rate9.930000482148898310.199999788063906cloud_shadow0.28999999165534973001density_multiplier0.00021999998716637492001distance_multiplier4001east_angle3.2044246196746826enable_cloud_scroll00gamma1.5399999618530273001glow3.80000103319798650.001000000059761974-0.499999966884985271haze_density0.20999999344348907001haze_horizon0.0499999970197677610.199156001210212710.199156001210212711lightnorm-0.0627596452832221980.0314109213650226590.997534275054931640max_y676.10003662109375001preset_num18star_brightness0.44999998807907104sun_angle3.1101765632629395sunlight_color1.79999995231628421.40999996662139891.01999998092651371.7999999523162842 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Azure%20desertation.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Azure%20desertation.xml deleted file mode 100644 index 4ee81152d..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Azure%20desertation.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.029999999329447746000.029999999329447746blue_density0.0979999974370002750.280000001192092911blue_horizon0.119999997317790990.3509429991245269811cloud_color0.489999979734420780.790000021457672120.800000011920928961cloud_pos_density10.539999961853027340.50.399999976158142091cloud_pos_density20.389999985694885250.50.089999996125698091cloud_scale0.34999999403953552001cloud_scroll_rate9.930000482148898310.199999788063906cloud_shadow0.31000000238418579001density_multiplier0.00021999998716637492001distance_multiplier4001east_angle3.2044246196746826enable_cloud_scroll00gamma1.5399999618530273001glow3.80000103319798650.001000000059761974-0.499999966884985271haze_density0.20999999344348907001haze_horizon0.0499999970197677610.199156001210212710.199156001210212711lightnorm0.0568146631121635440.42577928304672241-0.903041601181030270max_y676.10003662109375001preset_num18star_brightness0.44999998807907104sun_angle0.4398229718208313sunlight_color1.79999995231628421.40999996662139891.01999998092651371.7999999523162842 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Baffin.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Baffin.xml deleted file mode 100644 index 7694fbfc6..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Baffin.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.28000000119209290.0881695970892906190.119999997317790990.2800000011920929blue_density0.0599999986588954930.399996995925903320.800001978874206541blue_horizon0.229999989271163940.213486999273300170.250.25cloud_color0.449999988079071040.424038678407669070.393749952316284180.44999998807907104cloud_pos_density10.50.50.899999976158142091cloud_pos_density20.50.50.1251cloud_scale0.31999999284744263001cloud_scroll_rate9.80000019073486338.9899997711181641cloud_shadow0.2199999988079071001density_multiplier0.00046999999904073775001distance_multiplier2001east_angle3.2044246196746826enable_cloud_scroll00gamma1.6100000143051147001glow17.6000003814697270.0010000000474974513-0.399999976158142091haze_density0.74000000953674316001haze_horizon0.129999995231628420.199156001210212710.199156001210212711lightnorm0.062511965632438660.094108313322067261-0.993597447872161870max_y553001preset_num18star_brightness0sun_angle0.094247780740261078sunlight_color32.83857011795043952.83857011795043953 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Bangko.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Bangko.xml deleted file mode 100644 index 50387ff66..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Bangko.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0000blue_density0.0499999970197677610.2999999821186065711blue_horizon0.119999997317790990.6700000166893005411cloud_color0.55000001192092896000.55000001192092896cloud_pos_density10.610000014305114750.829999983310699460.189999997615814211cloud_pos_density20.479999989271163940.689999997615814210.149999991059303281cloud_scale0.37000000476837158001cloud_scroll_rate2020cloud_shadow0.25999999046325684001density_multiplier0.00018999999156221747001distance_multiplier16.100000381469727001east_angle4.2725663185119629enable_cloud_scroll00gamma1.6100000143051147001glow1.20000123977661130.0010000000474974513-0.749999940395355221haze_density0.099999994039535522001haze_horizon0.239999994635581970.199156001210212710.199156001210212711lightnorm-0.90438067913055420.0314109213650226590.425568908452987670max_y732.4000244140625001preset_num18star_brightness0.37000000476837158sun_angle3.1101765632629395sunlight_color1.68000006675720211.31600010395050050.952000021934509280.56000000238418579 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Bangko2.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Bangko2.xml deleted file mode 100644 index 837981bdd..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Bangko2.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0000blue_density0.0499999970197677610.2999999821186065711blue_horizon0.119999997317790990.6700000166893005411cloud_color0.55000001192092896000.55000001192092896cloud_pos_density10.649999976158142090.810000002384185790.189999997615814211cloud_pos_density20.479999989271163940.689999997615814210.149999991059303281cloud_scale0.37000000476837158001cloud_scroll_rate2020cloud_shadow0.34999999403953552001density_multiplier0.00018999999156221747001distance_multiplier16.100000381469727001east_angle1.5707963705062866enable_cloud_scroll00gamma1.6100000143051147001glow1.20000123977661130.0010000000474974513-0.749999940395355221haze_density0.099999994039535522001haze_horizon0.239999994635581970.199156001210212710.199156001210212711lightnorm0.999506533145904540.0314109213650226594.3689819761993931e-0080max_y732.4000244140625001preset_num18star_brightness0.37000000476837158sun_angle3.1101765632629395sunlight_color1.68000006675720211.31600010395050050.952000021934509280.56000000238418579 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Barcelon%20variation%202.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Barcelon%20variation%202.xml deleted file mode 100644 index ca17be5c6..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Barcelon%20variation%202.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.32999998331069946 - 0.106283999979496 - 0.14465400576591492 - 0.32999998331069946 - - blue_density - - 0.14522500336170197 - 0.39999699592590332 - 0.80000197887420654 - 1 - - blue_horizon - - 0.56000000238418579 - 0.30000001192092896 - 0.35131001472473145 - 0.56000000238418579 - - cloud_color - - 0.51999998092651367 - 0.41999998688697815 - 0.71999996900558472 - 0.71999996900558472 - - cloud_pos_density1 - - 0.50999999046325684 - 0.47999998927116394 - 0.68999999761581421 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.039999999105930328 - 1 - - cloud_scale - - 0.38999998569488525 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.32999998331069946 - 0 - 0 - 1 - - density_multiplier - - 0.00014000000373926014 - 0 - 0 - 1 - - distance_multiplier - - 25.5 - 0 - 0 - 1 - - east_angle - 2.5132739543914795 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.6100000143051147 - 0 - 0 - 1 - - glow - - 4.2000007629394531 - 0.0010000000474974513 - -0.59999996423721313 - 1 - - haze_density - - 0.53999996185302734 - 0 - 0 - 1 - - haze_horizon - - 0.34999999403953552 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.4798322319984436 - 0.57757276296615601 - -0.66043221950531006 - 0 - - max_y - - 632 - 0 - 0 - 1 - - preset_num - 21 - star_brightness - 0.059999998658895493 - sun_angle - 0.61575222015380859 - sunlight_color - - 2.0099997520446777 - 1.3500000238418579 - 1.3500000238418579 - 2.0099997520446777 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Barcelon%20variation.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Barcelon%20variation.xml deleted file mode 100644 index 761fe19a6..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Barcelon%20variation.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.149999991059303280.1062839999794960.144654005765914920.14999999105930328blue_density0.145225003361701970.399996995925903320.800001978874206541blue_horizon0.129999995231628420.300000011920928960.351310014724731451cloud_color0.419999986886978150.419999986886978150.719999969005584720.71999996900558472cloud_pos_density10.50.50.689999997615814211cloud_pos_density20.50.50.1251cloud_scale0.38999998569488525001cloud_scroll_rate10.4994001388549810.01099967956543cloud_shadow0.32999998331069946001density_multiplier0.00031000000308267772001distance_multiplier25.5001east_angle2.5132739543914795enable_cloud_scroll00gamma1.6100000143051147001glow4.60000038146972660.0010000000474974513-0.499999970197677611haze_density0.53999996185302734001haze_horizon0.349999994039535520.199156001210212710.199156001210212711lightnorm-0.580548763275146480.15643446147441864-0.79905652999877930max_y632001preset_num21star_brightness0.059999998658895493sun_angle0.15707962214946747sunlight_color1.52999997138977051.35000002384185791.35000002384185791.5299999713897705 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Beautiful%20again.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Beautiful%20again.xml deleted file mode 100644 index 4020b0420..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Beautiful%20again.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.75 - 0 - 0.43269237875938416 - 0.25 - - blue_density - - 0.45999997854232788 - 0.38665792346000671 - 0.7733229398727417 - 0.81999999284744263 - - blue_horizon - - 0.39999997615814209 - 0.22876684367656708 - 0.290018230676651 - 0.39999997615814209 - - cloud_color - - 0.25999999046325684 - 0.28883209824562073 - 0.28994369506835938 - 0.28999999165534973 - - cloud_pos_density1 - - 0.17999999225139618 - 0.50999999046325684 - 0.91999995708465576 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.079999998211860657 - 1 - - cloud_scale - - 0.25 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.436104517528292 - 10 - - cloud_shadow - - 0.34000000357627869 - 0 - 0 - 1 - - density_multiplier - - 0.00017999998817685992 - 0 - 0 - 1 - - distance_multiplier - - 26.80000114440918 - 0 - 0 - 1 - - east_angle - 1.8849555253982544 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.6699999570846558 - 0 - 0 - 1 - - glow - - 9.0000009536743164 - 0.0010000000474974513 - -0.69999998807907104 - 1 - - haze_density - - 0.45999997854232788 - 0 - 0 - 1 - - haze_horizon - - 0.070000000298023224 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.93839412927627563 - 0.16263717412948608 - -0.30490267276763916 - 0 - - max_y - - 395 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.3999999761581421 - sun_angle - 0.16336283087730408 - sunlight_color - - 2.3399999141693115 - 1.5422734022140503 - 0.92181861400604248 - 0.77999997138977051 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Blue%20skies%20LOL.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Blue%20skies%20LOL.xml deleted file mode 100644 index 184fb1c50..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Blue%20skies%20LOL.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.14999999105930328 - 0.14999999105930328 - 0.14999999105930328 - 0.049999997019767761 - - blue_density - - 1.059999942779541 - 0.12189874798059464 - 0.34980008006095886 - 0.52999997138977051 - - blue_horizon - - 1.0199999809265137 - 0.32410264015197754 - 0.37953504920005798 - 0.50999999046325684 - - cloud_color - - 0 - 0 - 1 - 1 - - cloud_pos_density1 - - 0.53999996185302734 - 0.50999999046325684 - 0.17999999225139618 - 1 - - cloud_pos_density2 - - 0.5 - 0.45999997854232788 - 0.23999999463558197 - 1 - - cloud_scale - - 0.31000000238418579 - 0 - 0 - 1 - - cloud_scroll_rate - - 20 - 20 - - cloud_shadow - - 0.34999999403953552 - 0 - 0 - 1 - - density_multiplier - - 0.00041000000783242285 - 0 - 0 - 1 - - distance_multiplier - - 8.1000003814697266 - 0 - 0 - 1 - - east_angle - 3.8955750465393066 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.7599999904632568 - 0 - 0 - 1 - - glow - - 0.19999980926513672 - 0.0010000000474974513 - -0.39999997615814209 - 1 - - haze_density - - 2.0799999237060547 - 0 - 0 - 1 - - haze_horizon - - 0.42999997735023499 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.67242199182510376 - 0.18738171458244324 - -0.71605640649795532 - 1 - - max_y - - 1 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 2 - sun_angle - 3.3300886154174805 - sunlight_color - - 3 - 0.59999984502792358 - 0.3150000274181366 - 1 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Breaking%20firmament.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Breaking%20firmament.xml deleted file mode 100644 index ff874745c..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Breaking%20firmament.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.059999998658895493000.059999998658895493blue_density0.319999992847442630.319999992847442630.829999983310699460.82999998331069946blue_horizon0.50.359999984502792360.50.59999996423721313cloud_color0.140000000596046450.140000000596046450.140000000596046450.14000000059604645cloud_pos_density10.819999992847442630.939999997615814210.751cloud_pos_density20.449999988079071040.359999984502792360.0199999995529651641cloud_scale0.17999999225139618001cloud_scroll_rate2020cloud_shadow0.37000000476837158001density_multiplier0.00016999999934341758001distance_multiplier0001east_angle3.0787608623504639enable_cloud_scroll00gamma1.809999942779541001glow7.59999990463256840.0010000000474974513-0.649999976158142091haze_density0.22999998927116394001haze_horizon0.189999997615814210.199156001210212710.199156001210212711lightnorm-0.0620174035429954530.15643446147441864-0.985739350318908690max_y253.5001preset_num24star_brightness0.39999997615814209sun_angle0.15707962214946747sunlight_color2.03999996185302732.03999996185302732.03999996185302730.68000000715255737 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Bridge%20opera%202.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Bridge%20opera%202.xml deleted file mode 100644 index c23911d16..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Bridge%20opera%202.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0011blue_density00.511blue_horizon1111cloud_color0.370000004768371580.259999990463256840.0399999991059303280.37000000476837158cloud_pos_density10.519999980926513670.389999985694885250.689999997615814211cloud_pos_density20001cloud_scale0.17000000178813934001cloud_scroll_rate10.4994001388549810.01099967956543cloud_shadow0.5001density_multiplier0.00089999998454004526001distance_multiplier100001east_angle0.12566371262073517enable_cloud_scroll00gamma1.1499999761581421001glow11.6000003814697270.0010000000474974513-1.49999988079071041haze_density0.0099999997764825821001haze_horizon00.199156001210212710.199156001210212711lightnorm-0.104970097541809080.546394407749176030.830923855304718020max_y4001preset_num18star_brightness0sun_angle0.57805311679840088sunlight_color30.959999978542327880.569999992847442631 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Bridge%20opera.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Bridge%20opera.xml deleted file mode 100644 index 6b359eba7..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Bridge%20opera.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0000blue_density00.354996472597122190.709999978542327880.70999997854232788blue_horizon00.8000000119209289611cloud_color0.370000004768371580.259999990463256840.0399999991059303280.37000000476837158cloud_pos_density10.519999980926513670.389999985694885250.689999997615814211cloud_pos_density20001cloud_scale0.17000000178813934001cloud_scroll_rate10.4994001388549810.01099967956543cloud_shadow0.5001density_multiplier0.00089999998454004526001distance_multiplier14.100000381469727001east_angle0.18849556148052216enable_cloud_scroll00gamma1.0900000333786011001glow11.6000003814697270.0010000000474974513-1.49999988079071041haze_density0.43999999761581421001haze_horizon0.179999992251396180.199156001210212710.199156001210212711lightnorm-0.161286965012550350.5090414285659790.845495879650115970max_y1001preset_num18star_brightness0sun_angle0.53407078981399536sunlight_color30.840000033378601070.449999988079071043 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Brillianter%20sunset.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Brillianter%20sunset.xml deleted file mode 100644 index 5e9a17fb5..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Brillianter%20sunset.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.329999983310699460.0734746605157852170.0999999940395355220.32999998331069946blue_density0.132517471909523010.364996343851089480.729999959468841550.72999995946884155blue_horizon0.163667514920234680.324500262737274170.379999995231628420.37999999523162842cloud_color0.239999994635581970.175086960196495060.175086960196495060.23999999463558197cloud_pos_density10.799999952316284180.759999990463256840.740000009536743161cloud_pos_density20.449999988079071040.359999984502792360.0799999982118606571cloud_scale0.28999999165534973001cloud_scroll_rate10.4994001388549810.01099967956543cloud_shadow0.32999998331069946001density_multiplier0.00032999998074956238001distance_multiplier2.7000000476837158001east_angle3.0787608623504639enable_cloud_scroll00gamma1.5999999046325684001glow7.59999990463256840.0010000000474974513-2.251haze_density0.079999998211860657001haze_horizon0.0499999970197677610.199156001210212710.199156001210212711lightnorm-0.062511794269084930.094108313322067261-0.993597447872161870max_y605001preset_num24star_brightness0.12999999523162842sun_angle0.094247780740261078sunlight_color2.06999993324279792.00249981880187991.59749996662139890.68999999761581421 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Brouhatta%20charme.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Brouhatta%20charme.xml deleted file mode 100644 index c307fdbd8..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Brouhatta%20charme.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.42999997735023499 - 0.0085999993607401848 - 0 - 0.42999997735023499 - - blue_density - - 0 - 0 - 0 - 0 - - blue_horizon - - 0 - 0 - 0 - 0 - - cloud_color - - 0.14999999105930328 - 0.14999999105930328 - 0.14999999105930328 - 0.14999999105930328 - - cloud_pos_density1 - - 0.5899999737739563 - 0.53999996185302734 - 0.25999999046325684 - 1 - - cloud_pos_density2 - - 0 - 0 - 0.019999999552965164 - 1 - - cloud_scale - - 0.28999999165534973 - 0 - 0 - 1 - - cloud_scroll_rate - - 10 - 10 - - cloud_shadow - - 0.32999998331069946 - 0 - 0 - 1 - - density_multiplier - - 0.00026000000070780516 - 0 - 0 - 1 - - distance_multiplier - - 10.100000381469727 - 0 - 0 - 1 - - east_angle - 3.0787608623504639 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.5999999046325684 - 0 - 0 - 1 - - glow - - 14.40000057220459 - 0.0010000000474974513 - -1.3999999761581421 - 1 - - haze_density - - 0.40999999642372131 - 0 - 0 - 1 - - haze_horizon - - 0.08999999612569809 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.053434345871210098 - 0.52517437934875488 - 0.84931540489196777 - 0 - - max_y - - 632 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0.75 - sun_angle - 2.5886726379394531 - sunlight_color - - 3 - 2.0099997520446777 - 1.2721519470214844 - 1 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Bubble%20sun%20severance.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Bubble%20sun%20severance.xml deleted file mode 100644 index 2d10b90d2..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Bubble%20sun%20severance.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.289999991655349730.0999999940395355220.199999988079071040.31000000238418579blue_density00.399996995925903320.800001978874206541blue_horizon0.0516844764351844790.102473765611648560.119999997317790990.11999999731779099cloud_color0.632312536239624020.649999976158142090.649999976158142090.64999997615814209cloud_pos_density10.509999990463256840.459999978542327880.829999983310699461cloud_pos_density20.489999979734420780.50.0799999982118606571cloud_scale0.32999998331069946001cloud_scroll_rate10.4994001388549810.01099967956543cloud_shadow0.25999999046325684001density_multiplier0.00041999999666586518001distance_multiplier16.80000114440918001east_angle6.2203531265258789enable_cloud_scroll00gamma1.7300000190734863001glow50.0010000000474974513-0.599999964237213131haze_density0.40999999642372131001haze_horizon0.21999999880790710.199156001210212710.199156001210212711lightnorm0.0627598613500595090.0314107611775398250.997534215450286870max_y605001preset_num18star_brightness0.14000000059604645sun_angle0.031415928155183792sunlight_color2.61000013351440432.61000013351440432.61000013351440430.87000000476837158 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Buccaneers%20of%20the%20coast.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Buccaneers%20of%20the%20coast.xml deleted file mode 100644 index 9bf2ee74a..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Buccaneers%20of%20the%20coast.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.57999998331069946000.57999998331069946blue_density0.0499999970197677610.246400013566017150.879999995231628420.87999999523162842blue_horizon0.919999957084655760.649999976158142090.879999995231628420.91999995708465576cloud_color0.389999985694885250.444374948740005490.449999988079071040.47999998927116394cloud_pos_density10.50.50.329999983310699461cloud_pos_density20.340000003576278690.429999977350234990.0799999982118606571cloud_scale0.2800000011920929001cloud_scroll_rate9.93000033925018510.199999625297616cloud_shadow0.23999999463558197001density_multiplier0.00020999999833293259001distance_multiplier23.5001east_angle1.8849555253982544enable_cloud_scroll00gamma1.4800000190734863001glow9.40000057220458980.0010000000474974513-3.05000019073486331haze_density1.1799999475479126001haze_horizon0.389999985694885250.199156001210212710.199156001210212711lightnorm0.950587272644042970.0314109213650226590.308864444494247440max_y563.4000244140625001preset_num18star_brightness0.68999999761581421sun_angle3.1101765632629395sunlight_color2.3699998855590821.38926446437835691.00499987602233892.369999885559082 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20CGAtrope.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20CGAtrope.xml deleted file mode 100644 index a9b627a7a..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20CGAtrope.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.17999999225139618 - 0 - 0.80999994277954102 - 0.26999998092651367 - - blue_density - - 0.81170719861984253 - 0.59317070245742798 - 1.2799999713897705 - 0.63999998569488525 - - blue_horizon - - 0.29999998211860657 - 1.1200000047683716 - 0.39999997615814209 - 1.1200000047683716 - - cloud_color - - 0.77999997138977051 - 0.25999999046325684 - 0.1794000118970871 - 0.77999997138977051 - - cloud_pos_density1 - - 0.66999995708465576 - 0.93999999761581421 - 0.79999995231628418 - 1 - - cloud_pos_density2 - - 0.44999998807907104 - 0.35999998450279236 - 0.049999997019767761 - 1 - - cloud_scale - - 0.15999999642372131 - 0 - 0 - 1 - - cloud_scroll_rate - - 20 - 20 - - cloud_shadow - - 0.34000000357627869 - 0 - 0 - 1 - - density_multiplier - - 0.00016999999934341758 - 0 - 0 - 1 - - distance_multiplier - - 0.40000000596046448 - 0 - 0 - 1 - - east_angle - 3.6442475318908691 - enable_cloud_scroll - - 0 - 0 - - gamma - - 2.1599998474121094 - 0 - 0 - 1 - - glow - - 4.2000007629394531 - 0.0010000000474974513 - -1.3999999761581421 - 1 - - haze_density - - 1.0799999237060547 - 0 - 0 - 1 - - haze_horizon - - 0.19999998807907104 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.28804293274879456 - 0.80156701803207397 - -0.523948073387146 - 1 - - max_y - - 197.19999694824219 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 0.44999998807907104 - sun_angle - 4.0715041160583496 - sunlight_color - - 2.0099997520446777 - 1.8300000429153442 - 1.5899999141693115 - 2.0099997520446777 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Canyon%20dreams%20red.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Canyon%20dreams%20red.xml deleted file mode 100644 index b30b9b43b..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Canyon%20dreams%20red.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.53999996185302734 - 0.16758941113948822 - 0.22809243202209473 - 0.53999996185302734 - - blue_density - - 0.20125001668930054 - 0.13999846577644348 - 0.2800000011920929 - 0.14000000059604645 - - blue_horizon - - 1.4599999189376831 - 0.086663313210010529 - 0.10148517787456512 - 0.72999995946884155 - - cloud_color - - 0.30382978916168213 - 0.29659572243690491 - 0.34000000357627869 - 0.34000000357627869 - - cloud_pos_density1 - - 0.37999999523162842 - 0.74000000953674316 - 0.22999998927116394 - 1 - - cloud_pos_density2 - - 0.35999998450279236 - 0.31000000238418579 - 0.08999999612569809 - 1 - - cloud_scale - - 0.35999998450279236 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.644780158996582 - 10.219999775290489 - - cloud_shadow - - 0.28999999165534973 - 0 - 0 - 1 - - density_multiplier - - 8.9999994088429958e-005 - 0 - 0 - 1 - - distance_multiplier - - 16.899999618530273 - 0 - 0 - 1 - - east_angle - 5.8433623313903809 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.4900000095367432 - 0 - 0 - 1 - - glow - - 7.4000000953674316 - 0.0013735899701714516 - -0.55000001192092896 - 1 - - haze_density - - 0.48999997973442078 - 0 - 0 - 1 - - haze_horizon - - 0.2199999988079071 - 0.13210900127887726 - 0.13210900127887726 - 1 - - lightnorm - - 0.41920709609985352 - 0.17502307891845703 - 0.89086043834686279 - 0 - - max_y - - 483 - 0 - 0 - 1 - - preset_num - 5 - star_brightness - 0.69999998807907104 - sun_angle - 0.17592920362949371 - sunlight_color - - 1.9499999284744263 - 1.4444441795349121 - 0.86235499382019043 - 1.9499999284744263 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Canyon%20dreams.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Canyon%20dreams.xml deleted file mode 100644 index 2e7d08d5b..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Canyon%20dreams.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.50999999046325684 - 0.16758941113948822 - 0.22809243202209473 - 0.17000000178813934 - - blue_density - - 0.079999998211860657 - 0.31999650597572327 - 0.63999998569488525 - 0.31999999284744263 - - blue_horizon - - 0.69999998807907104 - 0.092599160969257355 - 0.10843620449304581 - 0.69999998807907104 - - cloud_color - - 0.30382978916168213 - 0.29659572243690491 - 0.34000000357627869 - 0.34000000357627869 - - cloud_pos_density1 - - 0.37999999523162842 - 0.74000000953674316 - 0.22999998927116394 - 1 - - cloud_pos_density2 - - 0.35999998450279236 - 0.31000000238418579 - 0.08999999612569809 - 1 - - cloud_scale - - 0.35999998450279236 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.644780158996582 - 10.219999775290489 - - cloud_shadow - - 0.35999998450279236 - 0 - 0 - 1 - - density_multiplier - - 0.00013000000035390258 - 0 - 0 - 1 - - distance_multiplier - - 30.399999618530273 - 0 - 0 - 1 - - east_angle - 5.8433623313903809 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.4900000095367432 - 0 - 0 - 1 - - glow - - 7.4000000953674316 - 0.0013735899701714516 - -0.55000001192092896 - 1 - - haze_density - - 0.42999997735023499 - 0 - 0 - 1 - - haze_horizon - - 0.19999998807907104 - 0.13210900127887726 - 0.13210900127887726 - 1 - - lightnorm - - 0.41920709609985352 - 0.17502307891845703 - 0.89086043834686279 - 0 - - max_y - - 671 - 0 - 0 - 1 - - preset_num - 5 - star_brightness - 0.69999998807907104 - sun_angle - 0.17592920362949371 - sunlight_color - - 1.559999942779541 - 1.4444441795349121 - 0.86235499382019043 - 0.51999998092651367 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Castle%20vain.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Castle%20vain.xml deleted file mode 100644 index 6122d61ab..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Castle%20vain.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.170000001788139340.116097562015056610.0621951185166835780.17000000178813934blue_density00.250.135000005364418030.25blue_horizon0.109613776206970210.0735465958714485170.140000000596046450.14000000059604645cloud_color0.189999997615814210.0599999986588954930.0499999970197677610.22999998927116394cloud_pos_density10.699999988079071040.370000004768371580.879999995231628421cloud_pos_density20.21999999880790710.759999990463256840.0799999982118606571cloud_scale0.47999998927116394001cloud_scroll_rate10.45399374929490910.026071512513319cloud_shadow0.29999998211860657001density_multiplier1.9999999494757503e-005001distance_multiplier37.600002288818359001east_angle3.2672562599182129enable_cloud_scroll00gamma1.2799999713897705001glow0.199999809265136720.0010000000474974513-0.499999970197677611haze_density1.2599999904632568001haze_horizon0.359999984502792360.199156001210212710.199156001210212711lightnorm-0.117923535406589510.338737964630126950.933461666107177730max_y309.89999389648437001preset_num18star_brightness1.0799999237060547sun_angle2.7960174083709717sunlight_color0.930000007152557370.446399927139282230.660300135612487790.31000000238418579 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Catastroph.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Catastroph.xml deleted file mode 100644 index 38e7f1322..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Catastroph.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1.0199999809265137 - 0.80999994277954102 - 0.80999994277954102 - 1.0199999809265137 - - blue_density - - 0.14522500336170197 - 0.39999699592590332 - 0.80000197887420654 - 1 - - blue_horizon - - 0.75999999046325684 - 0.20801298320293427 - 0.24358972907066345 - 0.37999999523162842 - - cloud_color - - 0.22615399956703186 - 0.22615399956703186 - 0.22615399956703186 - 1 - - cloud_pos_density1 - - 0.14000000059604645 - 0.09771379828453064 - 0.87999999523162842 - 1 - - cloud_pos_density2 - - 0.40999999642372131 - 0.4699999988079071 - 0.125 - 1 - - cloud_scale - - 0.41999998688697815 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.2800000011920929 - 0 - 0 - 1 - - density_multiplier - - 0.00047999998787418008 - 0 - 0 - 1 - - distance_multiplier - - 67.599998474121094 - 0 - 0 - 1 - - east_angle - 0.12566371262073517 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1 - 0 - 0 - 1 - - glow - - 3.4000015258789063 - 0.0010000000474974513 - -0.99999994039535522 - 1 - - haze_density - - 0.85999995470046997 - 0 - 0 - 1 - - haze_horizon - - 0.15999999642372131 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.12508592009544373 - 0.062790460884571075 - -0.99015700817108154 - 0 - - max_y - - 779 - 0 - 0 - 1 - - preset_num - 3 - star_brightness - 0 - sun_angle - 3.0787608623504639 - sunlight_color - - 2.309999942779541 - 1.8554410934448242 - 1.0497889518737793 - 0.76999998092651367 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Chernoble.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Chernoble.xml deleted file mode 100644 index a309c0170..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Chernoble.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.43951213359832764 - 0.52999997138977051 - 0.43951213359832764 - 0.52999997138977051 - - blue_density - - 0.039999991655349731 - 0.45999544858932495 - 0.91999995708465576 - 0.91999995708465576 - - blue_horizon - - 0 - 0.6148415207862854 - 0.71999996900558472 - 0.71999996900558472 - - cloud_color - - 0.42999997735023499 - 0 - 0 - 0.42999997735023499 - - cloud_pos_density1 - - 0.53999996185302734 - 0.50999999046325684 - 0.2199999988079071 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.039999999105930328 - 1 - - cloud_scale - - 0.2800000011920929 - 0 - 0 - 1 - - cloud_scroll_rate - - 20 - 20 - - cloud_shadow - - 0.32999998331069946 - 0 - 0 - 1 - - density_multiplier - - 5.999999848427251e-005 - 0 - 0 - 1 - - distance_multiplier - - 8.1000003814697266 - 0 - 0 - 1 - - east_angle - 3.8327431678771973 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.57999998331069946 - 0 - 0 - 1 - - glow - - 0.39999961853027344 - 0.0010000000474974513 - -0.34999999403953552 - 1 - - haze_density - - 3.1499998569488525 - 0 - 0 - 1 - - haze_horizon - - 0.45999997854232788 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.63722282648086548 - 0.025130098685622215 - -0.77026981115341187 - 0 - - max_y - - 605 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 0.025132743641734123 - sunlight_color - - 0.89999997615814209 - 0.72000002861022949 - 0.50999999046325684 - 0.29999998211860657 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Chinese%20legacy.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Chinese%20legacy.xml deleted file mode 100644 index c1846b198..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Chinese%20legacy.xml +++ /dev/null @@ -1 +0,0 @@ -ambient000.250.25blue_density0.18999999761581421111blue_horizon0.20999999344348907000.20999999344348907cloud_color0.599999964237213130.658599972724914550.889999985694885250.88999998569488525cloud_pos_density10.859999954700469970.859999954700469970.759999990463256841cloud_pos_density20.449999988079071040.359999984502792360.0399999991059303281cloud_scale0.22999998927116394001cloud_scroll_rate2020cloud_shadow0.35999998450279236001density_multiplier0.0002899999963119626001distance_multiplier14.100000381469727001east_angle2.1991147994995117enable_cloud_scroll00gamma1.7300000190734863001glow6.60000085830688480.0010000000474974513-1.19999992847442631haze_density0.25999999046325684001haze_horizon0.509999990463256840.199156001210212710.199156001210212711lightnorm-0.639248847961425780.6129070520401001-0.46444144845008850max_y605001preset_num24star_brightness0.81999999284744263sun_angle0.65973442792892456sunlight_color2.54999995231628421.96349930763244630.968999862670898440.84999996423721313 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Chouchou%20rockets.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Chouchou%20rockets.xml deleted file mode 100644 index 4c81f044b..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Chouchou%20rockets.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.89999997615814209 - 0.15599998831748962 - 0.13407418131828308 - 0.29999998211860657 - - blue_density - - 0.76999998092651367 - 0.57340431213378906 - 1.2799999713897705 - 1.2799999713897705 - - blue_horizon - - 0.51999998092651367 - 0.31199994683265686 - 0.13000965118408203 - 0.25999999046325684 - - cloud_color - - 0.71999996900558472 - 0.2800000011920929 - 0.24674561619758606 - 0.71999996900558472 - - cloud_pos_density1 - - 0.77999997138977051 - 0.50999999046325684 - 0.079999998211860657 - 1 - - cloud_pos_density2 - - 0.43999999761581421 - 0.56999999284744263 - 0.039999999105930328 - 1 - - cloud_scale - - 0.23999999463558197 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.499370784775238 - 10.011009025563908 - - cloud_shadow - - 0.38999998569488525 - 0 - 0 - 1 - - density_multiplier - - 0.00026000000070780516 - 0 - 0 - 1 - - distance_multiplier - - 75 - 0 - 0 - 1 - - east_angle - 3.3300881385803223 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.68000000715255737 - 0 - 0 - 1 - - glow - - 10.999999046325684 - 0.0010000000474974513 - -1.5999999046325684 - 1 - - haze_density - - 1.1399999856948853 - 0 - 0 - 1 - - haze_horizon - - 0.29999998211860657 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.18119794130325317 - 0.25477075576782227 - -0.94987326860427856 - 0 - - max_y - - 430 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0.72999995946884155 - sun_angle - 0.25761061906814575 - sunlight_color - - 0.42857152223587036 - 0.95999997854232788 - 0.6158490777015686 - 0.31999999284744263 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Climacontrasty.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Climacontrasty.xml deleted file mode 100644 index 3f8483ac6..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Climacontrasty.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.84000003337860107 - 0.71999996900558472 - 0.84000003337860107 - 0.2800000011920929 - - blue_density - - 0.38399907946586609 - 0.63999354839324951 - 1.2799999713897705 - 0.63999998569488525 - - blue_horizon - - 0.31999999284744263 - 0.26181814074516296 - 0.31999999284744263 - 0.15999999642372131 - - cloud_color - - 0.2800000011920929 - 0.22615399956703186 - 0.22615399956703186 - 0.2800000011920929 - - cloud_pos_density1 - - 0.14000000059604645 - 0.09771379828453064 - 0.87000000476837158 - 1 - - cloud_pos_density2 - - 0.40999999642372131 - 0.4699999988079071 - 0.079999998211860657 - 1 - - cloud_scale - - 0.39999997615814209 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.28999999165534973 - 0 - 0 - 1 - - density_multiplier - - 0.00042999998549930751 - 0 - 0 - 1 - - distance_multiplier - - 3.4000000953674316 - 0 - 0 - 1 - - east_angle - 0.56548666954040527 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.4699999988079071 - 0 - 0 - 1 - - glow - - 6.2000012397766113 - 0.0010000000474974513 - -0.47999998927116394 - 1 - - haze_density - - 0.69999998807907104 - 0 - 0 - 1 - - haze_horizon - - 0.15999999642372131 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.53277301788330078 - 0.10661106556653976 - -0.83951592445373535 - 0 - - max_y - - 644 - 0 - 0 - 1 - - preset_num - 3 - star_brightness - 0 - sun_angle - 3.0347785949707031 - sunlight_color - - 2.5799999237060547 - 2.5799999237060547 - 2.5799999237060547 - 0.85999995470046997 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Clouds%20indifferent.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Clouds%20indifferent.xml deleted file mode 100644 index 3b6ebe94f..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Clouds%20indifferent.xml +++ /dev/null @@ -1 +0,0 @@ -ambient000.269999980926513670.26999998092651367blue_density0.344571352005004880.555142879486083980.669999957084655760.66999995708465576blue_horizon0.338888853788375850.474444389343261720.610000014305114750.61000001430511475cloud_color0.709999978542327880.7400000095367431611cloud_pos_density10.799999952316284180.909999966621398930.699999988079071041cloud_pos_density20.449999988079071040.359999984502792360.00999999977648258211cloud_scale0.14000000059604645001cloud_scroll_rate2020cloud_shadow0.35999998450279236001density_multiplier0.00049999996554106474001distance_multiplier0.10000000149011612001east_angle4.0840702056884766enable_cloud_scroll00gamma1.7400000095367432001glow13.199998855590820.0010000000474974513-1.44999992847442631haze_density0.25999999046325684001haze_horizon0.189999997615814210.199156001210212710.199156001210212711lightnorm0.805426418781280520.094108313322067261-0.585176825523376460max_y112.70000457763672001preset_num24star_brightness0.20999999344348907sun_angle0.094247780740261078sunlight_color1.04999995231628421.52999997138977051.65000009536743161.6500000953674316 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Coastal%20Sunset%20mod%202.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Coastal%20Sunset%20mod%202.xml deleted file mode 100644 index c1748a73f..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Coastal%20Sunset%20mod%202.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.449999988079071040.147872999310493470.201258003711700440.44999998807907104blue_density0.149999991059303280.320751011371612550.641508996486663821blue_horizon0.349999994039535520.107414998114109040.125786006450653080.34999999403953552cloud_color0.479999989271163940.479999989271163940.479999989271163940.47999998927116394cloud_pos_density10.379999995231628420.9799999594688415511cloud_pos_density20.50.50.159999996423721311cloud_scale0.37000000476837158001cloud_scroll_rate9.64478015899658210.423800468444824cloud_shadow0.37999999523162842001density_multiplier0.00013999998918734491001distance_multiplier13.40000057220459001east_angle0enable_cloud_scroll00gamma1.6100000143051147001glow2.99999952316284180.0013735899701714516-0.550000011920928961haze_density0.91999995708465576001haze_horizon0.149999991059303280.132109001278877260.132109001278877261lightnorm00.125333234667778020.992114722728729250max_y1521.0999755859375001preset_num5star_brightness0sun_angle0.12566371262073517sunlight_color1.34999990463256842.00999975204467771.19999992847442632.1599998474121094 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Coastal%20Sunset%20mod%203.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Coastal%20Sunset%20mod%203.xml deleted file mode 100644 index 4e6a44867..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Coastal%20Sunset%20mod%203.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.449999988079071040.147872999310493470.201258003711700440.44999998807907104blue_density0.170691266655921940.36499604582786560.729999959468841550.72999995946884155blue_horizon0.329999983310699460.101277001202106480.118598230183124540.32999998331069946cloud_color0.479999989271163940.479999989271163940.479999989271163940.47999998927116394cloud_pos_density10.379999995231628420.9799999594688415511cloud_pos_density20.50.501cloud_scale0.2199999988079071001cloud_scroll_rate9.64478015899658210.423800468444824cloud_shadow0.37999999523162842001density_multiplier0.00013999998918734491001distance_multiplier8.1000003814697266001east_angle0.18849556148052216enable_cloud_scroll00gamma1.6100000143051147001glow2.99999952316284180.0013735899701714516-0.550000011920928961haze_density0.37999999523162842001haze_horizon0.0199999995529651640.132109001278877260.132109001278877261lightnorm-0.185903757810592650.125333234667778020.974541604518890380max_y1789001preset_num5star_brightness0sun_angle0.12566371262073517sunlight_color1.34999990463256842.00999975204467771.19999992847442632.1599998474121094 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Coastal%20Sunset%20mod.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Coastal%20Sunset%20mod.xml deleted file mode 100644 index d80a89a3a..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Coastal%20Sunset%20mod.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.449999988079071040.147872999310493470.201258003711700440.44999998807907104blue_density0.149999991059303280.320751011371612550.641508996486663821blue_horizon0.349999994039535520.107414998114109040.125786006450653080.34999999403953552cloud_color000.419999986886978150.41999998688697815cloud_pos_density10.379999995231628420.9799999594688415511cloud_pos_density20.50.50.0199999995529651641cloud_scale0.37000000476837158001cloud_scroll_rate9.64478015899658210.423800468444824cloud_shadow0.32999998331069946001density_multiplier0.00013999998918734491001distance_multiplier13.40000057220459001east_angle1.3194688558578491enable_cloud_scroll00gamma1.6100000143051147001glow2.99999952316284180.0013735899701714516-0.550000011920928961haze_density0.91999995708465576001haze_horizon0.149999991059303280.132109001278877260.132109001278877261lightnorm-0.968105196952819820.0314107611775398250.248567223548889160max_y1521.0999755859375001preset_num5star_brightness0sun_angle0.031415928155183792sunlight_color2.90999984741210942.39999985694885252.39999985694885252.9099998474121094 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Cobraring%202.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Cobraring%202.xml deleted file mode 100644 index e1925f743..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Cobraring%202.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.21000000834465027 - 0 - 0 - 0.21000000834465027 - - blue_density - - 2 - 1.1000000238418579 - 1.8399999141693115 - 1 - - blue_horizon - - 0.29999998211860657 - 0.81999999284744263 - 1 - 1.1999999284744263 - - cloud_color - - 0.40999999642372131 - 0.35875001549720764 - 0.10249999910593033 - 0.40999999642372131 - - cloud_pos_density1 - - 0.51999998092651367 - 0.40999999642372131 - 0.62000000476837158 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.070000000298023224 - 1 - - cloud_scale - - 0.14999999105930328 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.44999998807907104 - 0 - 0 - 1 - - density_multiplier - - 0.00016999999934341758 - 0 - 0 - 1 - - distance_multiplier - - 29.700000762939453 - 0 - 0 - 1 - - east_angle - 4.0212388038635254 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.0099999904632568 - 0 - 0 - 1 - - glow - - 7.9999995231628418 - 0.0010000000474974513 - -0.99999994039535522 - 1 - - haze_density - - 1.2999999523162842 - 0 - 0 - 1 - - haze_horizon - - 0.17999999225139618 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.74749547243118286 - 0.2425992339849472 - -0.6183817982673645 - 0 - - max_y - - 188 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 0.24504423141479492 - sunlight_color - - 3 - 1.2299998998641968 - 0.27000004053115845 - 1 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Cobraring.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Cobraring.xml deleted file mode 100644 index e05abc6f5..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Cobraring.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0000blue_density00.354996472597122190.709999978542327880.70999997854232788blue_horizon00.7999999523162841811cloud_color0.399999976158142090.349999994039535520.0999999940395355220.39999997615814209cloud_pos_density10.519999980926513670.409999996423721310.699999988079071041cloud_pos_density20.50.50.0299999993294477461cloud_scale0.14999999105930328001cloud_scroll_rate10.4994001388549810.01099967956543cloud_shadow0.47999998927116394001density_multiplier0.00038999997195787728001distance_multiplier8.6999998092651367001east_angle0.8796459436416626enable_cloud_scroll00gamma1.0900000333786011001glow8.6000013351440430.0010000000474974513-1.19999992847442631haze_density0.71999996900558472001haze_horizon0.149999991059303280.199156001210212710.199156001210212711lightnorm-0.747495412826538090.24259923398494720.618381977081298830max_y158001preset_num18star_brightness0sun_angle0.24504423141479492sunlight_color31.25999999046325680.270000040531158453 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Colorful%20cemetary.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Colorful%20cemetary.xml deleted file mode 100644 index e4c7e760a..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Colorful%20cemetary.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.26999998092651367 - 0 - 0.21599996089935303 - 0.08999999612569809 - - blue_density - - 0.45999997854232788 - 0.38665792346000671 - 1.8600000143051147 - 1.8600000143051147 - - blue_horizon - - 0.39999997615814209 - 0.22876684367656708 - 0.53999996185302734 - 0.53999996185302734 - - cloud_color - - 0.25999999046325684 - 0.28883209824562073 - 0.28994369506835938 - 0.28999999165534973 - - cloud_pos_density1 - - 0.17999999225139618 - 0.50999999046325684 - 0.91999995708465576 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.079999998211860657 - 1 - - cloud_scale - - 0.25 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.436104517528292 - 10 - - cloud_shadow - - 0.34000000357627869 - 0 - 0 - 1 - - density_multiplier - - 0.00047999998787418008 - 0 - 0 - 1 - - distance_multiplier - - 38.5 - 0 - 0 - 1 - - east_angle - 1.8849555253982544 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.6699999570846558 - 0 - 0 - 1 - - glow - - 9.0000009536743164 - 0.0010000000474974513 - -0.69999998807907104 - 1 - - haze_density - - 0.40999999642372131 - 0 - 0 - 1 - - haze_horizon - - 0.55000001192092896 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.95105654001235962 - 1.7484555314695172e-007 - -0.30901694297790527 - 0 - - max_y - - 456 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.3999999761581421 - sun_angle - 6.2831854820251465 - sunlight_color - - 2.3399999141693115 - 1.5422734022140503 - 2.4900000095367432 - 2.4900000095367432 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Commie%20skies.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Commie%20skies.xml deleted file mode 100644 index 83a5c0880..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Commie%20skies.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.15999999642372131000.15999999642372131blue_density0.209999993443489070.0874999985098838810.104999996721744540.20999999344348907blue_horizon00.0382499992847442630.509999990463256840.50999999046325684cloud_color0.769999980926513670.115500018000602720.17710004746913910.76999998092651367cloud_pos_density10.899999976158142090.939999997615814210.799999952316284181cloud_pos_density20.50.239999994635581970.0199999995529651641cloud_scale0.14000000059604645001cloud_scroll_rate2020cloud_shadow0.31000000238418579001density_multiplier0.00014999999257270247001distance_multiplier100001east_angle3.0787608623504639enable_cloud_scroll00gamma1.6799999475479126001glow4.20000076293945310.0010000000474974513-0.399999976158142091haze_density0.22999998927116394001haze_horizon10.199156001210212710.199156001210212711lightnorm0.062666557729244232-0.0627906322479248050.996057331562042240max_y281.70001220703125001preset_num24star_brightness0.39999997615814209sun_angle3.2044246196746826sunlight_color1.24550008773803711.40999996662139891.24550008773803710.4699999988079071 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Conciergist.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Conciergist.xml deleted file mode 100644 index 0eee7c2bb..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Conciergist.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.28000000119209290.370000004768371580.28000000119209290.37000000476837158blue_density00.0856097489595413210.389999985694885250.38999998569488525blue_horizon0000cloud_color0.560000002384185790.5500000119209289611cloud_pos_density10.799999952316284180.909999966621398930.699999988079071041cloud_pos_density20.449999988079071040.359999984502792360.00999999977648258211cloud_scale0.14000000059604645001cloud_scroll_rate2020cloud_shadow0.35999998450279236001density_multiplier9.9999997473787516e-005001distance_multiplier2.7000000476837158001east_angle2.8902652263641357enable_cloud_scroll00gamma1.809999942779541001glow7.59999990463256840.0010000000474974513-1.19999992847442631haze_density0.14999999105930328001haze_horizon0.159999996423721310.199156001210212710.199156001210212711lightnorm-0.240876853466033940.24868990480899811-0.938153326511383060max_y478.89999389648437001preset_num24star_brightness0.39999997615814209sun_angle0.25132742524147034sunlight_color2.3699998855590822.3699998855590820.539999961853027340.78999996185302734 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Coral%20reef.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Coral%20reef.xml deleted file mode 100644 index 0f2ebdb78..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Coral%20reef.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.25356096029281616 - 0.40908080339431763 - 0.65999996662139893 - 0.2199999988079071 - - blue_density - - 0.3884127140045166 - 0.63416171073913574 - 1.0199999809265137 - 0.50999999046325684 - - blue_horizon - - 0.79566740989685059 - 1.3341723680496216 - 1.5199999809265137 - 0.75999999046325684 - - cloud_color - - 0.35999998450279236 - 0.35834389925003052 - 0.35834389925003052 - 0.35999998450279236 - - cloud_pos_density1 - - 0.65999996662139893 - 0.34000000357627869 - 0.32999998331069946 - 1 - - cloud_pos_density2 - - 0.28999999165534973 - 0.84999996423721313 - 0 - 1 - - cloud_scale - - 0.32999998058761548 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.499399946934318 - 10.010999746491507 - - cloud_shadow - - 0.31999999284744263 - 0 - 0 - 1 - - density_multiplier - - 0.00045999998110346496 - 0 - 0 - 1 - - distance_multiplier - - 2 - 0 - 0 - 1 - - east_angle - 2.8274333477020264 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.3500000238418579 - 0 - 0 - 1 - - glow - - 4.2366936635580714 - 0.0010000000718780599 - -0.49272174722960926 - 1 - - haze_density - - 1.2699999809265137 - 0 - 0 - 1 - - haze_horizon - - 0.32999998331069946 - 0.19915598630905151 - 0.19915598630905151 - 1 - - lightnorm - - 0.2967471182346344 - 0.27899089455604553 - 0.91329360008239746 - 0 - - max_y - - 403 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 2.8588495254516602 - sunlight_color - - 0.56603914499282837 - 0.62662863731384277 - 0.77999997138977051 - 0.25999999046325684 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Cranched.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Cranched.xml deleted file mode 100644 index 986116db0..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Cranched.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.59999996423721313 - 0.35454544425010681 - 0.49999994039535522 - 0.19999998807907104 - - blue_density - - 0.93999999761581421 - 0.45999997854232788 - 0.77730768918991089 - 1.0399999618530273 - - blue_horizon - - 0.85999995470046997 - 0.67807686328887939 - 0.57884615659713745 - 0.42999997735023499 - - cloud_color - - 0.17999999225139618 - 0.29999998211860657 - 0.19215685129165649 - 0.29999998211860657 - - cloud_pos_density1 - - 0.42999997735023499 - 0.5 - 0.35999998450279236 - 1 - - cloud_pos_density2 - - 0.42999997735023499 - 0.32999998331069946 - 0 - 1 - - cloud_scale - - 0.84999996423721313 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940035411295 - 10.011000104431371 - - cloud_shadow - - 0.41999998688697815 - 0 - 0 - 1 - - density_multiplier - - 9.9999997473787516e-006 - 0 - 0 - 1 - - distance_multiplier - - 23.600000381469727 - 0 - 0 - 1 - - east_angle - 4.2725663185119629 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.6899999380111694 - 0 - 0 - 1 - - glow - - 0.19999980926513672 - 0.0010000000474974513 - -0.99999994039535522 - 1 - - haze_density - - 0.64999997615814209 - 0 - 0 - 1 - - haze_horizon - - 0.71999996900558472 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.87496930360794067 - 0.25477027893066406 - 0.41172897815704346 - 1 - - max_y - - 698 - 0 - 0 - 1 - - preset_num - 26 - star_brightness - 1.0299999713897705 - sun_angle - 6.0255751609802246 - sunlight_color - - 0.68999993801116943 - 0.64295452833175659 - 0.52344810962677002 - 0.22999998927116394 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Damage%20down.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Damage%20down.xml deleted file mode 100644 index 7fe8a5977..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Damage%20down.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 2.5199999809265137 - 0.89999997615814209 - 0 - 0.8399999737739563 - - blue_density - - 0.31999999284744263 - 0.22953487932682037 - 0.41999998688697815 - 0.5 - - blue_horizon - - 0.39999997615814209 - 0.35094299912452698 - 0.8399999737739563 - 0.87999999523162842 - - cloud_color - - 0.56049990653991699 - 0.7504999041557312 - 0.75999999046325684 - 0.75999999046325684 - - cloud_pos_density1 - - 0.10999999940395355 - 5.6909198760986328 - 0.74000000953674316 - 1 - - cloud_pos_density2 - - 0.14000000059604645 - 6.9909601211547852 - 0.079999998211860657 - 1 - - cloud_scale - - 0.35999998450279236 - 0 - 0 - 1 - - cloud_scroll_rate - - 12.40999960899353 - 10.199999809265137 - - cloud_shadow - - 0.34000000357627869 - 0 - 0 - 1 - - density_multiplier - - 0.00026999998954124749 - 0 - 0 - 1 - - distance_multiplier - - 1.3000000715255737 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.6100000143051147 - 0 - 0 - 1 - - glow - - 5 - 0.0010000000474974513 - -0.94999998807907104 - 1 - - haze_density - - 0.91999995708465576 - 0 - 0 - 1 - - haze_horizon - - 0.10999999940395355 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0 - 0.55164581537246704 - -0.83407843112945557 - 0 - - max_y - - 2228 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 0 - sun_angle - 2.5572564601898193 - sunlight_color - - 2.4600000381469727 - 1.5 - 0.89999997615814209 - 2.4600000381469727 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Dark%20came%20over.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Dark%20came%20over.xml deleted file mode 100644 index e184cdc28..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Dark%20came%20over.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.089999996125698090.0899999961256980900.08999999612569809blue_density0.105000019073486330.299999982118606570.599999964237213130.59999996423721313blue_horizon0.112209834158420560.328160434961318970.689999997615814210.68999999761581421cloud_color0.639999985694885250.566857159137725830.310857176780700680.63999998569488525cloud_pos_density10.7999999523162841810.870000004768371581cloud_pos_density20.699999988079071040.709999978542327880.0799999982118606571cloud_scale0.19999998807907104001cloud_scroll_rate9.930000305175781310.199999809265137cloud_shadow0.31999999284744263001density_multiplier0.00047999998787418008001distance_multiplier7.4000000953674316001east_angle2.6389377117156982enable_cloud_scroll00gamma1.3399999141693115001glow2.99999952316284180.0010000000474974513-0.999999940395355221haze_density0.53999996185302734001haze_horizon0.129999995231628420.199156001210212710.199156001210212711lightnorm0.475822597742080690.156434446573257450.865517854690551760max_y1971.800048828125001preset_num24star_brightness0.56000000238418579sun_angle2.9845130443572998sunlight_color0.870000004768371580.64214289188385010.420000016689300540.28999999165534973 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Das%20fog.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Das%20fog.xml deleted file mode 100644 index 3dc815f70..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Das%20fog.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 3 - 3 - 3 - 1 - - blue_density - - 0 - 0 - 0 - 0 - - blue_horizon - - 0 - 0 - 0 - 0 - - cloud_color - - 1 - 1 - 1 - 1 - - cloud_pos_density1 - - 1 - 1 - 1 - 1 - - cloud_pos_density2 - - 1 - 1 - 1 - 1 - - cloud_scale - - 1 - 0 - 0 - 1 - - cloud_scroll_rate - - 10 - 10 - - cloud_shadow - - 1 - 0 - 0 - 1 - - density_multiplier - - 0.00089999998454004526 - 0 - 0 - 1 - - distance_multiplier - - 100 - 0 - 0 - 1 - - east_angle - 6.2831854820251465 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1 - 0 - 0 - 1 - - glow - - 0.19999980926513672 - 0.0010000000474974513 - -2.5 - 1 - - haze_density - - 0.25 - 0 - 0 - 1 - - haze_horizon - - 0.14000000059604645 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -1.7484555314695172e-007 - 1.7484555314695172e-007 - 1 - 0 - - max_y - - 4000 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 2 - sun_angle - 6.2831854820251465 - sunlight_color - - 3 - 3 - 3 - 1 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Deep%20blue%20sky%202.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Deep%20blue%20sky%202.xml deleted file mode 100644 index ca416730a..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Deep%20blue%20sky%202.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.284648067493748160.459235020318146780.74091738462448120.7409173846244812blue_density0.256136158253326580.418193680840090560.67263220168956651blue_horizon0.477746507050028410.801083839831449040.912661194779673220.98532241580704749cloud_color0.527561901605793080.527561901605793080.527561901605793081cloud_pos_density10.729999959468841550.340000003576278690.329999983310699461cloud_pos_density20.289999991655349730.849999964237213130.0199999995529651641cloud_scale0.32999998058761548001cloud_scroll_rate10.49939994693431810.010999746491507cloud_shadow0.37000000476837158001density_multiplier9.9999997473787516e-006001distance_multiplier0.69999999890643494001east_angle0.9424777626991272enable_cloud_scroll00gamma1.610000025154136001glow5.79999923706054690.0010000000474974513-1.04999995231628421haze_density1.5557675468824073001haze_horizon0.331743866205215450.19915598426251790.19915598426251791lightnorm-0.761188507080078130.338737934827804570.553035855293273930max_y711.42973550362512001preset_num18star_brightness0sun_angle0.34557521343231201sunlight_color0.629947432458720870.697377759776827590.868065443913792480.28935515608276319 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Deep%20blue%20sky.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Deep%20blue%20sky.xml deleted file mode 100644 index 212da90a3..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Deep%20blue%20sky.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.284648067493748160.459235020318146780.74091738462448120.7409173846244812blue_density0.256136158253326580.418193680840090560.67263220168956651blue_horizon0.477746507050028410.801083839831449040.912661194779673220.98532241580704749cloud_color0.527561901605793080.527561901605793080.527561901605793081cloud_pos_density10.729999959468841550.340000003576278690.329999983310699461cloud_pos_density20.289999991655349730.849999964237213130.0199999995529651641cloud_scale0.32999998058761548001cloud_scroll_rate10.49939994693431810.010999746491507cloud_shadow0.25999999046325684001density_multiplier9.9999997473787516e-006001distance_multiplier0.69999999890643494001east_angle3.1415927410125732enable_cloud_scroll00gamma1.610000025154136001glow4.23669366355807140.0010000000718780599-0.492721747229609261haze_density1.5557675468824073001haze_horizon0.331743866205215450.19915598426251790.19915598426251791lightnorm-6.1817239327410789e-0080.707106769084930420.707106769084930420max_y711.42973550362512001preset_num18star_brightness0sun_angle2.3561944961547852sunlight_color0.629947432458720870.697377759776827590.868065443913792480.28935515608276319 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Defenderz%202.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Defenderz%202.xml deleted file mode 100644 index 84079ce5d..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Defenderz%202.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.21129770576953888 - 0.26412215828895569 - 0.14999999105930328 - 0.26999998092651367 - - blue_density - - 0 - 0.46666669845581055 - 1.1000000238418579 - 0.55000001192092896 - - blue_horizon - - 1.4800000190734863 - 0.5982978343963623 - 0.31489357352256775 - 0.74000000953674316 - - cloud_color - - 0.48999997973442078 - 0.5 - 1 - 1 - - cloud_pos_density1 - - 0.89999997615814209 - 0.97999995946884155 - 0.53999996185302734 - 1 - - cloud_pos_density2 - - 0.41999998688697815 - 0.23999999463558197 - 0.079999998211860657 - 1 - - cloud_scale - - 0.25999999046325684 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.993240904292179 - 10.179008409703329 - - cloud_shadow - - 0.34000000357627869 - 0 - 0 - 1 - - density_multiplier - - 0.0003499999875202775 - 0 - 0 - 1 - - distance_multiplier - - 35.799999237060547 - 0 - 0 - 1 - - east_angle - 1.6964600086212158 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.2799999713897705 - 0 - 0 - 1 - - glow - - 3.600001335144043 - 0.0010000000474974513 - -0.44999998807907104 - 1 - - haze_density - - 1.2699999809265137 - 0 - 0 - 1 - - haze_horizon - - 0.2199999988079071 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.98349088430404663 - 0.13156437873840332 - -0.12424375861883163 - 0 - - max_y - - 779 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 0.23999999463558197 - sun_angle - 0.13194690644741058 - sunlight_color - - 1.2899999618530273 - 0.95999997854232788 - 1.2899999618530273 - 1.2899999618530273 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Defenderz.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Defenderz.xml deleted file mode 100644 index be9f30a92..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Defenderz.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.21129770576953888 - 0.26412215828895569 - 0.26999998092651367 - 0.08999999612569809 - - blue_density - - 0.10807017982006073 - 0.21999964118003845 - 0.43999999761581421 - 0.2199999988079071 - - blue_horizon - - 0.93999999761581421 - 0.37999999523162842 - 0.19999998807907104 - 0.93999999761581421 - - cloud_color - - 0.39578112959861755 - 0.46432545781135559 - 0.4699999988079071 - 0.4699999988079071 - - cloud_pos_density1 - - 0.89999997615814209 - 0.93999999761581421 - 0.63999998569488525 - 1 - - cloud_pos_density2 - - 0.41999998688697815 - 0.23999999463558197 - 0.08999999612569809 - 1 - - cloud_scale - - 0.25999999046325684 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.993240904292179 - 10.179008409703329 - - cloud_shadow - - 0.32999998331069946 - 0 - 0 - 1 - - density_multiplier - - 0.00031000000308267772 - 0 - 0 - 1 - - distance_multiplier - - 50 - 0 - 0 - 1 - - east_angle - 0.8796459436416626 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.4900000095367432 - 0 - 0 - 1 - - glow - - 3.600001335144043 - 0.0010000000474974513 - -0.39999997615814209 - 1 - - haze_density - - 1.1599999666213989 - 0 - 0 - 1 - - haze_horizon - - 0.14999999105930328 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.75861984491348267 - 0.17502307891845703 - 0.62758493423461914 - 0 - - max_y - - 779 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 0.23999999463558197 - sun_angle - 0.17592920362949371 - sunlight_color - - 1.2899999618530273 - 1.2300000190734863 - 1.2899999618530273 - 1.2899999618530273 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Dullard.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Dullard.xml deleted file mode 100644 index 51ff24c1f..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Dullard.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.62999999523162842 - 0.62999999523162842 - 0.62999999523162842 - 0.20999999344348907 - - blue_density - - 0.50068968534469604 - 0.65999996662139893 - 0.59172403812408447 - 0.32999998331069946 - - blue_horizon - - 0.65999996662139893 - 0.59653842449188232 - 0.4696153998374939 - 0.32999998331069946 - - cloud_color - - 0.17000000178813934 - 0.17000000178813934 - 0.17000000178813934 - 0.17000000178813934 - - cloud_pos_density1 - - 0.89999997615814209 - 0.42999997735023499 - 1 - 1 - - cloud_pos_density2 - - 0 - 0 - 0 - 1 - - cloud_scale - - 0.42999997735023499 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.200000040817258 - 10.010999893335338 - - cloud_shadow - - 0.34000000357627869 - 0 - 0 - 1 - - density_multiplier - - 0.00014000000373926014 - 0 - 0 - 1 - - distance_multiplier - - 29.100000381469727 - 0 - 0 - 1 - - east_angle - 3.7699110507965088 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.87999999523162842 - 0 - 0 - 1 - - glow - - 9.8000001907348633 - 0.0010000000474974513 - -0.85000002384185791 - 1 - - haze_density - - 1.1599999666213989 - 0 - 0 - 1 - - haze_horizon - - 0.17999999225139618 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.42594039440155029 - 0.68911367654800415 - 0.58625686168670654 - 0 - - max_y - - 993 - 0 - 0 - 1 - - preset_num - 27 - star_brightness - 1.0799999237060547 - sun_angle - 2.3813273906707764 - sunlight_color - - 0.68526327610015869 - 0.72947371006011963 - 0.84000003337860107 - 0.2800000011920929 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Early%20warning.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Early%20warning.xml deleted file mode 100644 index 43c343a86..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Early%20warning.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.87000000476837158 - 0.54375004768371582 - 0.24468749761581421 - 0.28999999165534973 - - blue_density - - 0.31000000238418579 - 0.36606386303901672 - 0.62000000476837158 - 0.31000000238418579 - - blue_horizon - - 0.85999995470046997 - 0.35698121786117554 - 0.56792449951171875 - 0.42999997735023499 - - cloud_color - - 0.31428584456443787 - 0.55000001192092896 - 0.39285731315612793 - 0.55000001192092896 - - cloud_pos_density1 - - 0.65999996662139893 - 0.45999997854232788 - 1 - 1 - - cloud_pos_density2 - - 0.71999996900558472 - 0.41999998688697815 - 0.059999998658895493 - 1 - - cloud_scale - - 0.44999998807907104 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.200000040817258 - 10.010999893335338 - - cloud_shadow - - 0.31999999284744263 - 0 - 0 - 1 - - density_multiplier - - 0.00016999999934341758 - 0 - 0 - 1 - - distance_multiplier - - 4.7000002861022949 - 0 - 0 - 1 - - east_angle - 6.0946898460388184 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.94999998807907104 - 0 - 0 - 1 - - glow - - 7.7999997138977051 - 0.0010000000474974513 - -0.55000001192092896 - 1 - - haze_density - - 0.75999999046325684 - 0 - 0 - 1 - - haze_horizon - - 0.19999998807907104 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.17994101345539093 - 0.27899089455604553 - -0.94328433275222778 - 0 - - max_y - - 1208 - 0 - 0 - 1 - - preset_num - 22 - star_brightness - 0.95999997854232788 - sun_angle - 2.8588495254516602 - sunlight_color - - 1.2899999618530273 - 0.78157889842987061 - 0.89999997615814209 - 0.42999997735023499 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Eggdrop.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Eggdrop.xml deleted file mode 100644 index abc9fa4ba..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Eggdrop.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0 - 0 - 0.62999999523162842 - 0.20999999344348907 - - blue_density - - 0 - 0.28285416960716248 - 0.35999998450279236 - 0.17999999225139618 - - blue_horizon - - 0.97999995946884155 - 0.35104480385780334 - 0.13164177536964417 - 0.48999997973442078 - - cloud_color - - 0.66396230459213257 - 0.68999999761581421 - 0.29442691802978516 - 0.68999999761581421 - - cloud_pos_density1 - - 0.51999998092651367 - 0.62000000476837158 - 0.25999999046325684 - 1 - - cloud_pos_density2 - - 0.29999998211860657 - 0.48999997973442078 - 0.019999999552965164 - 1 - - cloud_scale - - 0.32999998331069946 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.739999771118164 - 10.600000381469727 - - cloud_shadow - - 0.34000000357627869 - 0 - 0 - 1 - - density_multiplier - - 0.00022000000171829015 - 0 - 0 - 1 - - distance_multiplier - - 50 - 0 - 0 - 1 - - east_angle - 5.026547908782959 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.89999997615814209 - 0 - 0 - 1 - - glow - - 4.8000001907348633 - 0.0010000000474974513 - -0.49999997019767761 - 1 - - haze_density - - 0.77999997138977051 - 0 - 0 - 1 - - haze_horizon - - 0.099999994039535522 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.95038086175918579 - 0.037689968943595886 - -0.30879712104797363 - 0 - - max_y - - 349 - 0 - 0 - 1 - - preset_num - 28 - star_brightness - 0.099999994039535522 - sun_angle - 3.1038937568664551 - sunlight_color - - 1.7999999523162842 - 1.3601353168487549 - 1.2612160444259644 - 1.7999999523162842 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Eno%20would%20be%20proud.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Eno%20would%20be%20proud.xml deleted file mode 100644 index dede67caa..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Eno%20would%20be%20proud.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.2800000011920929 - 0.14962118864059448 - 0.2036362886428833 - 0.2800000011920929 - - blue_density - - 0.13977900147438049 - 0.38499599695205688 - 0.93999999761581421 - 0.93999999761581421 - - blue_horizon - - 0.39999997615814209 - 0.18999999761581421 - 0.079999998211860657 - 0.41999998688697815 - - cloud_color - - 0.53999996185302734 - 0.50999999046325684 - 0.22615399956703186 - 0.53999996185302734 - - cloud_pos_density1 - - 0.51999998092651367 - 0.62000000476837158 - 0.41999998688697815 - 1 - - cloud_pos_density2 - - 0.29999998211860657 - 0.48999997973442078 - 0.079999998211860657 - 1 - - cloud_scale - - 0.20999999344348907 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.739999771118164 - 10.600000381469727 - - cloud_shadow - - 0.39999997615814209 - 0 - 0 - 1 - - density_multiplier - - 0.00038999997195787728 - 0 - 0 - 1 - - distance_multiplier - - 8.1000003814697266 - 0 - 0 - 1 - - east_angle - 0.12566371262073517 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.89999997615814209 - 0 - 0 - 1 - - glow - - 4.8000001907348633 - 0.0010000000474974513 - -0.49999997019767761 - 1 - - haze_density - - 1.2099999189376831 - 0 - 0 - 1 - - haze_horizon - - 0.10999999940395355 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.11373797059059143 - 0.42008551955223083 - -0.90032875537872314 - 0 - - max_y - - 789 - 0 - 0 - 1 - - preset_num - 28 - star_brightness - 0.099999994039535522 - sun_angle - 2.7080531120300293 - sunlight_color - - 2.1610879898071289 - 1.5523307323455811 - 2.8799998760223389 - 0.95999997854232788 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Evocrads%27lime.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Evocrads%27lime.xml deleted file mode 100644 index e62c73328..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Evocrads%27lime.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1 - 0.019999999552965164 - 0 - 1 - - blue_density - - 0.056818168610334396 - 0.13999998569488525 - 0.5 - 0.5 - - blue_horizon - - 0.28999996185302734 - 1 - 0.95652163028717041 - 1 - - cloud_color - - 0.74420297145843506 - 0.78012454509735107 - 0.78999996185302734 - 0.78999996185302734 - - cloud_pos_density1 - - 0.5899999737739563 - 0.53999996185302734 - 0.37000000476837158 - 1 - - cloud_pos_density2 - - 0 - 0 - 0 - 1 - - cloud_scale - - 0.15999999642372131 - 0 - 0 - 1 - - cloud_scroll_rate - - 10 - 10 - - cloud_shadow - - 0.34999999403953552 - 0 - 0 - 1 - - density_multiplier - - 0.00028000000747852027 - 0 - 0 - 1 - - distance_multiplier - - 10.699999809265137 - 0 - 0 - 1 - - east_angle - 4.9008846282958984 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.3999999761581421 - 0 - 0 - 1 - - glow - - 15 - 0.0010000000474974513 - -2.5 - 1 - - haze_density - - 0.32999998331069946 - 0 - 0 - 1 - - haze_horizon - - 0.15999999642372131 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.98034888505935669 - 0.062790460884571075 - -0.18701164424419403 - 0 - - max_y - - 421 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.059999942779541 - sun_angle - 3.0787608623504639 - sunlight_color - - 0.029999999329447746 - 3 - 1.2721518278121948 - 3 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Eye%20of%20Mowron.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Eye%20of%20Mowron.xml deleted file mode 100644 index bc2a005fc..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Eye%20of%20Mowron.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.42000001668930054 - 0.24705882370471954 - 0.054901961237192154 - 0.14000000059604645 - - blue_density - - 0 - 0.48558136820793152 - 0.71999996900558472 - 0.35999998450279236 - - blue_horizon - - 1.3999999761581421 - 0.030434783548116684 - 0.31956523656845093 - 0.69999998807907104 - - cloud_color - - 0.50999999046325684 - 0.35249999165534973 - 0.35249999165534973 - 0.50999999046325684 - - cloud_pos_density1 - - 0.56999999284744263 - 0.96999996900558472 - 0.20999999344348907 - 1 - - cloud_pos_density2 - - 0.20999999344348907 - 0.19999998807907104 - 0.049999997019767761 - 1 - - cloud_scale - - 0.14000000059604645 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.993240904292179 - 10.179008409703329 - - cloud_shadow - - 0.23999999463558197 - 0 - 0 - 1 - - density_multiplier - - 0.00022000000171829015 - 0 - 0 - 1 - - distance_multiplier - - 35.799999237060547 - 0 - 0 - 1 - - east_angle - 6.031857967376709 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.5499999523162842 - 0 - 0 - 1 - - glow - - 7.0000004768371582 - 0.0010000000474974513 - -1.0499999523162842 - 1 - - haze_density - - 0.26999998092651367 - 0 - 0 - 1 - - haze_horizon - - 0.19999998807907104 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.24652810394763947 - 0.13156437873840332 - 0.96016389131546021 - 0 - - max_y - - 805 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 0.95999997854232788 - sun_angle - 0.13194690644741058 - sunlight_color - - 2.1899998188018799 - 0.90804862976074219 - 0.16024389863014221 - 0.72999995946884155 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Fairytale%20glow.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Fairytale%20glow.xml deleted file mode 100644 index 576254f36..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Fairytale%20glow.xml +++ /dev/null @@ -1 +0,0 @@ -ambient10.5199999809265136701blue_density00.542142748832702640.689999997615814210.68999999761581421blue_horizon0.446284621953964230.299439787864685060.569999992847442630.56999999284744263cloud_color0.199999988079071040.199999988079071040.199999988079071040.19999998807907104cloud_pos_density10.689999997615814210.3400000035762786911cloud_pos_density20.289999991655349730.849999964237213130.0599999986588954931cloud_scale0.39999997615814209001cloud_scroll_rate10.45399374929490910.026071512513319cloud_shadow0.37000000476837158001density_multiplier9.9999997473787516e-006001distance_multiplier22.80000114440918001east_angle5.5292034149169922enable_cloud_scroll00gamma0.53999996185302734001glow200.0010000000474974513-0.399999976158142091haze_density1.9199999570846558001haze_horizon0.340000003576278690.199156001210212710.199156001210212711lightnorm-0.672421634197235110.18738129734992981-0.716056823730468750max_y816.9000244140625001preset_num18star_brightness1.1899999380111694sun_angle2.9530971050262451sunlight_color1.34999990463256841.96650266647338872.51999998092651370.8399999737739563 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Farmatronic%20sepia.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Farmatronic%20sepia.xml deleted file mode 100644 index d2b489d0b..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Farmatronic%20sepia.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0000blue_density00.0999999940395355220.119999997317790990.11999999731779099blue_horizon0.0299999993294477460.0299999993294477460.0299999993294477460.029999999329447746cloud_color0.379999995231628420.319999992847442630.229999989271163940.37999999523162842cloud_pos_density10.740000009536743160.939999997615814210.849999964237213131cloud_pos_density20.659999966621398930.529999971389770510.0399999991059303281cloud_scale0.18999999761581421001cloud_scroll_rate2020cloud_shadow0.32999998331069946001density_multiplier0.00013000000035390258001distance_multiplier1.3000000715255737001east_angle2.3247785568237305enable_cloud_scroll00gamma1.9499999284744263001glow17.3999996185302730.0010000000474974513-0.649999976158142091haze_density0.62000000476837158001haze_horizon0.209999993443489070.199156001210212710.199156001210212711lightnorm-0.723220467567443850.12533323466777802-0.679149270057678220max_y281.70001220703125001preset_num24star_brightness0.39999997615814209sun_angle0.12566371262073517sunlight_color1.58999991416931151.52999997138977051.58999991416931151.5899999141693115 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Fine%20Scottish%20day.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Fine%20Scottish%20day.xml deleted file mode 100644 index 23fc97110..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Fine%20Scottish%20day.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.211949840188026430.257002800703048710.259999990463256840.25999999046325684blue_density0.100313819944858550.28499954938888550.569999992847442630.56999999284744263blue_horizon0.158065572381019590.312111169099807740.529999971389770510.52999997138977051cloud_color0.620000004768371580.727376222610473630.736265599727630621cloud_pos_density10.899999976158142090.939999997615814210.740000009536743161cloud_pos_density20.119999997317790990.209999993443489070.0299999993294477461cloud_scale0.25999999046325684001cloud_scroll_rate9.99324090429217910.179008409703329cloud_shadow0.29999998211860657001density_multiplier0.00013000000035390258001distance_multiplier10.100000381469727001east_angle3.8955750465393066enable_cloud_scroll00gamma1.4699999094009399001glow11.4000015258789060.0010000000474974513-0.599999964237213131haze_density0.35999998450279236001haze_horizon0.119999997317790990.199156001210212710.199156001210212711lightnorm0.668061077594757080.21814323961734772-0.711412608623504640max_y789001preset_num24star_brightness0.18999999761581421sun_angle0.21991148591041565sunlight_color1.68000006675720211.25999999046325681.25999999046325681.6800000667572021 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Fog%20mystic%202.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Fog%20mystic%202.xml deleted file mode 100644 index 27f377779..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Fog%20mystic%202.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.709999978542327880.0734746605157852170.0999999940395355220.70999997854232788blue_density00.354996502399444580.709999978542327880.70999997854232788blue_horizon0.0999999940395355220.315960794687271120.370000004768371580.37000000476837158cloud_color0.109659776091575620.164489686489105220.239999994635581970.23999999463558197cloud_pos_density10.899999976158142090.759999990463256840.170000001788139341cloud_pos_density20.449999988079071040.359999984502792360.0799999982118606571cloud_scale0.20999999344348907001cloud_scroll_rate2010.01099967956543cloud_shadow0.32999998331069946001density_multiplier0.00019999999494757503001distance_multiplier0001east_angle1.6964600086212158enable_cloud_scroll00gamma1.5399999618530273001glow200.001000000047497451301haze_density0.12999999523162842001haze_horizon0.109999999403953550.199156001210212710.199156001210212711lightnorm0.974541604518890380.187381297349929810.123113214969635010max_y579001preset_num24star_brightness0.31999999284744263sun_angle2.9530971050262451sunlight_color2.06999993324279792.00249981880187991.31999993324279790.68999999761581421 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Fog%20mystic.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Fog%20mystic.xml deleted file mode 100644 index 7bd05a4e3..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Fog%20mystic.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.709999978542327880.0734746605157852170.0999999940395355220.70999997854232788blue_density00.354996502399444580.709999978542327880.70999997854232788blue_horizon0.0999999940395355220.315960794687271120.370000004768371580.37000000476837158cloud_color0.109659776091575620.164489686489105220.239999994635581970.23999999463558197cloud_pos_density10.899999976158142090.759999990463256840.299999982118606571cloud_pos_density20.449999988079071040.359999984502792360.0799999982118606571cloud_scale0.28999999165534973001cloud_scroll_rate2010.01099967956543cloud_shadow0.32999998331069946001density_multiplier0.00019999999494757503001distance_multiplier43.600002288818359001east_angle1.6964600086212158enable_cloud_scroll00gamma1.5399999618530273001glow200.001000000047497451301haze_density0.12999999523162842001haze_horizon0.109999999403953550.199156001210212710.199156001210212711lightnorm-0.216423168778419490.97591674327850342-0.0273405984044075010max_y579001preset_num24star_brightness0.31999999284744263sun_angle1.3508847951889038sunlight_color2.06999993324279792.00249981880187991.31999993324279790.68999999761581421 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Frenlite.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Frenlite.xml deleted file mode 100644 index ee50b6784..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Frenlite.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.759999990463256840.0734746605157852170.0999999940395355220.75999999046325684blue_density00.354996502399444580.709999978542327880.70999997854232788blue_horizon0.0399999991059303280.315960794687271120.370000004768371580.4699999988079071cloud_color0.109659776091575620.159999996423721310.239999994635581970.23999999463558197cloud_pos_density10.879999995231628420.759999990463256840.21999999880790711cloud_pos_density20.329999983310699460.239999994635581970.119999997317790991cloud_scale0.20999999344348907001cloud_scroll_rate2010.01099967956543cloud_shadow0.32999998331069946001density_multiplier0.00016999999934341758001distance_multiplier16.100000381469727001east_angle3.0159289836883545enable_cloud_scroll00gamma1.4099999666213989001glow7.40000009536743160.0010000000474974513-1.34999990463256841haze_density0.66999995708465576001haze_horizon0.229999989271163940.199156001210212710.199156001210212711lightnorm-0.124915324151515960.081590615212917328-0.988806903362274170max_y711001preset_num24star_brightness0.2800000011920929sun_angle0.081681415438652039sunlight_color2.57999992370605472.00249981880187991.31999993324279792.5799999237060547 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Garrigal%20moscheles%20%28remix%29.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Garrigal%20moscheles%20%28remix%29.xml deleted file mode 100644 index e5881dc38..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Garrigal%20moscheles%20%28remix%29.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.2800000011920929 - 0.088169597089290619 - 0.11999999731779099 - 0.2800000011920929 - - blue_density - - 0.029999999329447746 - 0.39999699592590332 - 0.80000197887420654 - 1 - - blue_horizon - - 0.84999996423721313 - 0.21348699927330017 - 0.25 - 0.84999996423721313 - - cloud_color - - 0.5899999737739563 - 0.34999999403953552 - 0.14999999105930328 - 0.5899999737739563 - - cloud_pos_density1 - - 0.5 - 0.5 - 0.25 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.12999999523162842 - 1 - - cloud_scale - - 0.31999999284744263 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.8000001907348633 - 8.9899997711181641 - - cloud_shadow - - 0.23999999463558197 - 0 - 0 - 1 - - density_multiplier - - 0.00026000000070780516 - 0 - 0 - 1 - - distance_multiplier - - 2 - 0 - 0 - 1 - - east_angle - 3.3929200172424316 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.6100000143051147 - 0 - 0 - 1 - - glow - - 11.400001525878906 - 0.0010000000474974513 - -0.64999997615814209 - 1 - - haze_density - - 0.53999996185302734 - 0 - 0 - 1 - - haze_horizon - - 0.099999994039535522 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.24864566326141357 - 0.01884840801358223 - 0.96841108798980713 - 0 - - max_y - - 421 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 3.1227431297302246 - sunlight_color - - 3 - 2.8385701179504395 - 2.8385701179504395 - 3 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Garrigal%20moscheles.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Garrigal%20moscheles.xml deleted file mode 100644 index 71ed8bdf6..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Garrigal%20moscheles.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.28000000119209290.0881695970892906190.119999997317790990.2800000011920929blue_density0.0299999993294477460.399996995925903320.800001978874206541blue_horizon0.849999964237213130.213486999273300170.250.84999996423721313cloud_color0.58999997377395630.349999994039535520.149999991059303280.5899999737739563cloud_pos_density10.50.50.251cloud_pos_density20.50.50.129999995231628421cloud_scale0.31999999284744263001cloud_scroll_rate9.80000019073486338.9899997711181641cloud_shadow0.23999999463558197001density_multiplier0.00026000000070780516001distance_multiplier2001east_angle3.2044246196746826enable_cloud_scroll00gamma1.6100000143051147001glow17.6000003814697270.0010000000474974513-0.399999976158142091haze_density0.53999996185302734001haze_horizon0.0999999940395355220.199156001210212710.199156001210212711lightnorm-0.0612784288823604580.218143239617347720.973990976810455320max_y421001preset_num18star_brightness0sun_angle2.9216811656951904sunlight_color32.83857011795043952.83857011795043953 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Gelatto%20.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Gelatto%20.xml deleted file mode 100644 index 7d1fd3549..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Gelatto%20.xml +++ /dev/null @@ -1 +0,0 @@ -ambient00.1599999964237213100.15999999642372131blue_density0.0199999995529651640.229997709393501280.459999978542327880.55000001192092896blue_horizon00.63192045688629150.740000009536743160.84999996423721313cloud_color1001cloud_pos_density10.539999961853027340.509999990463256840.239999994635581971cloud_pos_density20.50.50.0599999986588954931cloud_scale0.2800000011920929001cloud_scroll_rate2020cloud_shadow0.32999998331069946001density_multiplier0.00016999999934341758001distance_multiplier8.1000003814697266001east_angle3.7699110507965088enable_cloud_scroll00gamma1.5399999618530273001glow0.399999618530273440.0010000000474974513-0.499999970197677611haze_density3.2599999904632568001haze_horizon0.46999999880790710.199156001210212710.199156001210212711lightnorm0.58749508857727051-0.031410761177539825-0.808617889881134030max_y1267.5999755859375001preset_num18star_brightness0sun_angle-0.031415928155183792sunlight_color0.750.719999969005584720.378000110387802120.80999994277954102 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Gelding%20morose.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Gelding%20morose.xml deleted file mode 100644 index e486dc0ca..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Gelding%20morose.xml +++ /dev/null @@ -1 +0,0 @@ -ambient000.229999989271163940.22999998927116394blue_density0.17999999225139618111blue_horizon0000cloud_color0.631900012493133540.658599972724914550.889999985694885250.88999998569488525cloud_pos_density10.799999952316284180.909999966621398930.751cloud_pos_density20.449999988079071040.359999984502792360.00999999977648258211cloud_scale0.14000000059604645001cloud_scroll_rate2020cloud_shadow0.35999998450279236001density_multiplier0.00027999997837468982001distance_multiplier0.10000000149011612001east_angle6.1575217247009277enable_cloud_scroll00gamma1.7400000095367432001glow6.60000085830688480.0010000000474974513-0.899999976158142091haze_density0.12999999523162842001haze_horizon0.259999990463256840.199156001210212710.199156001210212711lightnorm0.113404788076877590.425779283046722410.897692263126373290max_y845.10003662109375001preset_num24star_brightness0.20999999344348907sun_angle0.4398229718208313sunlight_color2.33999991416931151.80179941654205320.889199852943420410.77999997138977051 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Gimler%20gronchi.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Gimler%20gronchi.xml deleted file mode 100644 index f866a1483..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Gimler%20gronchi.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.060322575271129608 - 0.17032258212566376 - 0.37999999523162842 - 0.37999999523162842 - - blue_density - - 0.079999998211860657 - 0.12000001221895218 - 0.59999996423721313 - 0.59999996423721313 - - blue_horizon - - 0.34999999403953552 - 0.085964903235435486 - 0.22719298303127289 - 0.34999999403953552 - - cloud_color - - 0.53225797414779663 - 0.65999996662139893 - 0.48967733979225159 - 0.65999996662139893 - - cloud_pos_density1 - - 0.50999999046325684 - 0.52999997138977051 - 0.43999999761581421 - 1 - - cloud_pos_density2 - - 0.37000000476837158 - 0.32999998331069946 - 0.20999999344348907 - 1 - - cloud_scale - - 0.39999997615814209 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.24630615924616 - 10.095008669949948 - - cloud_shadow - - 0.32999998331069946 - 0 - 0 - 1 - - density_multiplier - - 0.00023999999393709004 - 0 - 0 - 1 - - distance_multiplier - - 13.40000057220459 - 0 - 0 - 1 - - east_angle - 2.1991147994995117 - enable_cloud_scroll - - 0 - 0 - - gamma - - 2.5 - 0 - 0 - 1 - - glow - - 6.8000006675720215 - 0.0010000000474974513 - -2.4499998092651367 - 1 - - haze_density - - 0.66999995708465576 - 0 - 0 - 1 - - haze_horizon - - 0.25 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.72083926200866699 - 0.45399096608161926 - -0.52372032403945923 - 1 - - max_y - - 211 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0.87999999523162842 - sun_angle - 3.6128320693969727 - sunlight_color - - 0.47903218865394592 - 0.64950484037399292 - 1.9799998998641968 - 0.65999996662139893 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Golden%20scifi.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Golden%20scifi.xml deleted file mode 100644 index 9fab4ed72..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Golden%20scifi.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.42000001668930054 - 0.0084000006318092346 - 0 - 0.14000000059604645 - - blue_density - - 0 - 0 - 0 - 0 - - blue_horizon - - 0 - 0 - 0 - 0 - - cloud_color - - 0.14999999105930328 - 0.14999999105930328 - 0.14999999105930328 - 0.14999999105930328 - - cloud_pos_density1 - - 0.5899999737739563 - 0.53999996185302734 - 0.25999999046325684 - 1 - - cloud_pos_density2 - - 0 - 0 - 0.019999999552965164 - 1 - - cloud_scale - - 0.28999999165534973 - 0 - 0 - 1 - - cloud_scroll_rate - - 10 - 10 - - cloud_shadow - - 0.34000000357627869 - 0 - 0 - 1 - - density_multiplier - - 0.00023999999393709004 - 0 - 0 - 1 - - distance_multiplier - - 23 - 0 - 0 - 1 - - east_angle - 3.1415927410125732 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.5 - 0 - 0 - 1 - - glow - - 18.399999618530273 - 0.0010000000474974513 - -0.85000002384185791 - 1 - - haze_density - - 0.40999999642372131 - 0 - 0 - 1 - - haze_horizon - - 0.079999998211860657 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -8.5550261985645193e-008 - 0.20586241781711578 - 0.97858095169067383 - 0 - - max_y - - 537 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0.64999997615814209 - sun_angle - 2.9342477321624756 - sunlight_color - - 2.9699997901916504 - 1.989899754524231 - 1.2594300508499146 - 0.98999994993209839 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Good%20for%20marriage.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Good%20for%20marriage.xml deleted file mode 100644 index 0b5e4bde3..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Good%20for%20marriage.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.330000013113021850.330000013113021850.330000013113021851blue_density0.0979999974370002750.28000000119209290.560000002384185790.56000000238418579blue_horizon0.119999997317790990.350942999124526980.610000014305114750.61000001430511475cloud_color0.58999997377395630.790000021457672120.800000011920928961cloud_pos_density10.50.511cloud_pos_density20.50.50.0700000002980232241cloud_scale0.32999998331069946001cloud_scroll_rate9.930000305175781310.199999809265137cloud_shadow0.22999998927116394001density_multiplier0.00039000000106170774001distance_multiplier0.69999998807907104001east_angle3.1415927410125732enable_cloud_scroll11gamma1.6100000143051147001glow0.399999618530273440.0010000000474974513-5.251haze_density0.20999999344348907001haze_horizon0.199999988079071040.199156001210212710.199156001210212711lightnorm-3.8213713538458836e-01514.3711388286737929e-0080max_y1802.800048828125001preset_num18star_brightness0sun_angle1.5707963705062866sunlight_color1.25999999046325681.25999999046325681.25999999046325680.41999998688697815 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Good%20for%20warm%20sailing.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Good%20for%20warm%20sailing.xml deleted file mode 100644 index 0a16c82d9..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Good%20for%20warm%20sailing.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.83999997377395630.0907380506396293640.12348938733339310.8399999737739563blue_density0.939999997615814210.699999988079071040.250.93999999761581421blue_horizon10.599999964237213130.250018537044525151cloud_color0.659999966621398930.389999985694885250.226183548569679260.65999996662139893cloud_pos_density10.769999980926513670.5099999904632568411cloud_pos_density20.50.58999997377395630.0199999995529651641cloud_scale0.26999998092651367001cloud_scroll_rate10.49937078477523810.011009025563908cloud_shadow0.5001density_multiplier0.00019999999494757503001distance_multiplier6.7000002861022949001east_angle3.7070791721343994enable_cloud_scroll00gamma1.4800000190734863001glow0.799999237060546880.0010000000474974513-0.949999988079071041haze_density0.89999997615814209001haze_horizon0.299999982118606570.199156001210212710.199156001210212711lightnorm0.531601488590240480.12533323466777802-0.837670207023620610max_y281.70001220703125001preset_num18star_brightness1.3799999952316284sun_angle0.12566371262073517sunlight_color0.751.68000006675720211.07773590087890620.56000000238418579 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Green%20whirl.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Green%20whirl.xml deleted file mode 100644 index 7c299fe35..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Green%20whirl.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.429999977350234990.0383012928068637850.0521212108433246610.42999997735023499blue_density10.813953399658203130.370000004768371581blue_horizon10.600000023841857910.250018566846847531cloud_color0.289986103773117070.28999933600425720.289999991655349730.28999999165534973cloud_pos_density10.550000011920928960.50.899999976158142091cloud_pos_density20.21999999880790710.3799999952316284201cloud_scale0.20999999344348907001cloud_scroll_rate10.49937078477523810.011009025563908cloud_shadow0.28999999165534973001density_multiplier3.9999998989515007e-005001distance_multiplier100001east_angle2.073451042175293enable_cloud_scroll00gamma0.66999995708465576001glow0.199999809265136720.0010000000474974513-0.0999999940395355221haze_density2.0299999713897705001haze_horizon0.289999991655349730.199156001210212710.199156001210212711lightnorm-0.833417236804962160.30901697278022766-0.458174884319305420max_y647.9000244140625001preset_num18star_brightness0sun_angle0.31415924429893494sunlight_color0.717856943607330322.00999975204467771.28943383693695070.66999995708465576 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Grit%20%26%20shame.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Grit%20%26%20shame.xml deleted file mode 100644 index a9fda375e..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Grit%20%26%20shame.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.26999998092651367 - 0.22736841440200806 - 0 - 0.08999999612569809 - - blue_density - - 0.038261249661445618 - 0.43999999761581421 - 0.11478374153375626 - 0.2199999988079071 - - blue_horizon - - 0 - 0.60503017902374268 - 0.89999997615814209 - 0.44999998807907104 - - cloud_color - - 1 - 0 - 0 - 1 - - cloud_pos_density1 - - 0.53999996185302734 - 0.45999997854232788 - 0.61000001430511475 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.039999999105930328 - 1 - - cloud_scale - - 0.29999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 20 - 20 - - cloud_shadow - - 0.31999999284744263 - 0 - 0 - 1 - - density_multiplier - - 0.00014999999257270247 - 0 - 0 - 1 - - distance_multiplier - - 10.100000381469727 - 0 - 0 - 1 - - east_angle - 3.6442475318908691 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.2799999713897705 - 0 - 0 - 1 - - glow - - 0.39999961853027344 - 0.0010000000474974513 - -0.55000001192092896 - 1 - - haze_density - - 2.8599998950958252 - 0 - 0 - 1 - - haze_horizon - - 0.44999998807907104 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.48175370693206787 - 1.7484555314695172e-007 - -0.87630665302276611 - 0 - - max_y - - 886 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 6.2831854820251465 - sunlight_color - - 0.86999994516372681 - 0.71999996900558472 - 1.7699999809265137 - 1.7699999809265137 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Herr%20Gracken.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Herr%20Gracken.xml deleted file mode 100644 index ab35e756a..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Herr%20Gracken.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.68999993801116943 - 0.55225539207458496 - 0.5645453929901123 - 0.22999998927116394 - - blue_density - - 0.079999998211860657 - 0.21999964118003845 - 0.39999997615814209 - 0.39999997615814209 - - blue_horizon - - 1.1200000047683716 - 0.37999999523162842 - 0.19999998807907104 - 1.1200000047683716 - - cloud_color - - 0.55000001192092896 - 0.47999998927116394 - 0.31999999284744263 - 0.55000001192092896 - - cloud_pos_density1 - - 0.89999997615814209 - 0.94999998807907104 - 0.75999999046325684 - 1 - - cloud_pos_density2 - - 0.26999998092651367 - 0.18999999761581421 - 0.049999997019767761 - 1 - - cloud_scale - - 0.25 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.993240904292179 - 10.179008409703329 - - cloud_shadow - - 0.34999999403953552 - 0 - 0 - 1 - - density_multiplier - - 0.00022000000171829015 - 0 - 0 - 1 - - distance_multiplier - - 39.900001525878906 - 0 - 0 - 1 - - east_angle - 1.7592918872833252 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.0799999237060547 - 0 - 0 - 1 - - glow - - 3.600001335144043 - 0.0010000000474974513 - -0.39999997615814209 - 1 - - haze_density - - 1.1100000143051147 - 0 - 0 - 1 - - haze_horizon - - 0.14999999105930328 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.073992699384689331 - 0.99715888500213623 - 0.014114863239228725 - 0 - - max_y - - 456 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 0.26999998092651367 - sun_angle - 1.6461946964263916 - sunlight_color - - 1.8899999856948853 - 1.2300000190734863 - 1.2899999618530273 - 1.8899999856948853 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Hong%20Kong.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Hong%20Kong.xml deleted file mode 100644 index 6f16a1674..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Hong%20Kong.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.819999992847442630.341198533773422240.604829072952270510.81999999284744263blue_density00.542142748832702640.689999997615814210.68999999761581421blue_horizon0.328841298818588260.220639824867248540.419999986886978150.41999998688697815cloud_color0.349999994039535520.136000007390975950.170000001788139340.34999999403953552cloud_pos_density10.689999997615814210.340000003576278690.709999978542327881cloud_pos_density20.289999991655349730.849999964237213130.140000000596046451cloud_scale0.39999997615814209001cloud_scroll_rate10.45399374929490910.026071512513319cloud_shadow0.37000000476837158001density_multiplier1.9999999494757503e-005001distance_multiplier24.80000114440918001east_angle5.5292034149169922enable_cloud_scroll00gamma0.53999996185302734001glow14.8000001907348630.0010000000474974513-0.799999952316284181haze_density1.1000000238418579001haze_horizon0.289999991655349730.199156001210212710.199156001210212711lightnorm-0.684209048748016360.031410921365022659-0.728609144687652590max_y394.39999389648437001preset_num18star_brightness1.1799999475479126sun_angle3.1101765632629395sunlight_color1.24225354194641111.96650266647338872.51999998092651370.8399999737739563 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Hot%20sunset.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Hot%20sunset.xml deleted file mode 100644 index 43739f455..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Hot%20sunset.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.53999996185302734 - 0.14787299931049347 - 0.20125800371170044 - 0.53999996185302734 - - blue_density - - 0.48285713791847229 - 0.38999569416046143 - 0.77999997138977051 - 0.38999998569488525 - - blue_horizon - - 0.57999998331069946 - 0.23999999463558197 - 0.059999998658895493 - 0.57999998331069946 - - cloud_color - - 0.38999983668327332 - 0.44999998807907104 - 0.20250001549720764 - 0.44999998807907104 - - cloud_pos_density1 - - 0.37999999523162842 - 0.93000000715255737 - 0.69999998807907104 - 1 - - cloud_pos_density2 - - 0.38999998569488525 - 0.34999999403953552 - 0.10999999940395355 - 1 - - cloud_scale - - 0.59999996423721313 - 0 - 0 - 1 - - cloud_scroll_rate - - 8.9099998474121094 - 10.423800468444824 - - cloud_shadow - - 0.31999999284744263 - 0 - 0 - 1 - - density_multiplier - - 0.00011999999696854502 - 0 - 0 - 1 - - distance_multiplier - - 21.600000381469727 - 0 - 0 - 1 - - east_angle - 5.5920348167419434 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.5499999523162842 - 0 - 0 - 1 - - glow - - 6.8000006675720215 - 0.0013735899701714516 - -0.89999997615814209 - 1 - - haze_density - - 0.34999999403953552 - 0 - 0 - 1 - - haze_horizon - - 0.2199999988079071 - 0.13210900127887726 - 0.13210900127887726 - 1 - - lightnorm - - 0.63731080293655396 - 0.018848441541194916 - 0.77037632465362549 - 0 - - max_y - - 993 - 0 - 0 - 1 - - preset_num - 5 - star_brightness - 1.5 - sun_angle - 0.018849557265639305 - sunlight_color - - 1.2300000190734863 - 1.1944442987442017 - 0.71310120820999146 - 1.2300000190734863 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Impires.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Impires.xml deleted file mode 100644 index f65b765c2..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Impires.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0 - 0 - 0.14999999105930328 - 0.14999999105930328 - - blue_density - - 0.23400001227855682 - 1.2999999523162842 - 1.2999999523162842 - 0.64999997615814209 - - blue_horizon - - 0 - 0 - 0 - 0 - - cloud_color - - 0.30851507186889648 - 0.4699999988079071 - 0.43452832102775574 - 0.4699999988079071 - - cloud_pos_density1 - - 0.79999995231628418 - 0.75999999046325684 - 0.62999999523162842 - 1 - - cloud_pos_density2 - - 0.44999998807907104 - 0.35999998450279236 - 0.0099999997764825821 - 1 - - cloud_scale - - 0.14000000059604645 - 0 - 0 - 1 - - cloud_scroll_rate - - 20 - 20 - - cloud_shadow - - 0.34000000357627869 - 0 - 0 - 1 - - density_multiplier - - 9.9999997473787516e-006 - 0 - 0 - 1 - - distance_multiplier - - 60.100002288818359 - 0 - 0 - 1 - - east_angle - 3.958406925201416 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.6200000047683716 - 0 - 0 - 1 - - glow - - 4.0000009536743164 - 0.0010000000474974513 - -1.1999999284744263 - 1 - - haze_density - - 0.8399999737739563 - 0 - 0 - 1 - - haze_horizon - - 0.45999997854232788 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.68587267398834229 - 0.33873793482780457 - -0.64407706260681152 - 0 - - max_y - - 2604 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 0.4699999988079071 - sun_angle - 0.34557521343231201 - sunlight_color - - 2.6100001335144043 - 2.0096993446350098 - 0.99179989099502563 - 0.87000000476837158 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Island%20cusp.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Island%20cusp.xml deleted file mode 100644 index 66b447771..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Island%20cusp.xml +++ /dev/null @@ -1 +0,0 @@ -ambient000.189999997615814210.18999999761581421blue_density0.17999999225139618111blue_horizon0000cloud_color0.347899973392486570.529999971389770510.489999979734420780.52999997138977051cloud_pos_density10.799999952316284180.909999966621398930.599999964237213131cloud_pos_density20.449999988079071040.3599999845027923601cloud_scale0.14000000059604645001cloud_scroll_rate2020cloud_shadow0.34000000357627869001density_multiplier1.9999999494757503e-005001distance_multiplier59.700000762939453001east_angle5.4663715362548828enable_cloud_scroll00gamma1.7400000095367432001glow2.79999971389770510.0010000000474974513-1.44999992847442631haze_density0.049999997019767761001haze_horizon0.21999999880790710.199156001210212710.199156001210212711lightnorm0.677777707576751710.368124544620513920.636476039886474610max_y1921001preset_num24star_brightness0.20999999344348907sun_angle0.37699112296104431sunlight_color2.51999998092651371.94039940834045410.957599818706512450.8399999737739563 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Ivory%20flowers.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Ivory%20flowers.xml deleted file mode 100644 index 7838e49e1..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Ivory%20flowers.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.87000000476837158 - 0.69088232517242432 - 0.69088232517242432 - 0.28999999165534973 - - blue_density - - 0.63999998569488525 - 0.39999699592590332 - 0.80000197887420654 - 1 - - blue_horizon - - 0.71999996900558472 - 0.37999999523162842 - 0.39999997615814209 - 0.71999996900558472 - - cloud_color - - 0.31999999284744263 - 0.17000000178813934 - 0.22615399956703186 - 0.31999999284744263 - - cloud_pos_density1 - - 0.4699999988079071 - 0.31999999284744263 - 0.75999999046325684 - 1 - - cloud_pos_density2 - - 0.69999998807907104 - 0.35999998450279236 - 0.25 - 1 - - cloud_scale - - 0.56999999284744263 - 0 - 0 - 1 - - cloud_scroll_rate - - 5.1099996566772461 - 9.339999794960022 - - cloud_shadow - - 0.37999999523162842 - 0 - 0 - 1 - - density_multiplier - - 0.0004400000034365803 - 0 - 0 - 1 - - distance_multiplier - - 3.4000000953674316 - 0 - 0 - 1 - - east_angle - 5.4035391807556152 - enable_cloud_scroll - - 1 - 1 - - gamma - - 0.94999998807907104 - 0 - 0 - 1 - - glow - - 11.400001525878906 - 0.0010000000474974513 - -0.39999997615814209 - 1 - - haze_density - - 0.31999999284744263 - 0 - 0 - 1 - - haze_horizon - - 0.10999999940395355 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.76612204313278198 - 0.10661106556653976 - -0.63379108905792236 - 0 - - max_y - - 859 - 0 - 0 - 1 - - preset_num - 22 - star_brightness - 0.19999998807907104 - sun_angle - 3.0347785949707031 - sunlight_color - - 2.4600000381469727 - 2.4600000381469727 - 2.4600000381469727 - 0.81999999284744263 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Kyrosonatine.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Kyrosonatine.xml deleted file mode 100644 index 2223b4c4f..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Kyrosonatine.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1.2300000190734863 - 0.70285701751708984 - 0.18857140839099884 - 1.2300000190734863 - - blue_density - - 0.2800000011920929 - 0.47209301590919495 - 0.69999998807907104 - 0.34999999403953552 - - blue_horizon - - 0.41999998688697815 - 0.37999999523162842 - 0.8399999737739563 - 0.8399999737739563 - - cloud_color - - 0.31733337044715881 - 0.67199987173080444 - 0.69999998807907104 - 0.69999998807907104 - - cloud_pos_density1 - - 0.77999997138977051 - 5.6909198760986328 - 0.75999999046325684 - 1 - - cloud_pos_density2 - - 0.14000000059604645 - 0.55000001192092896 - 0.029999999329447746 - 1 - - cloud_scale - - 0.45999997854232788 - 0 - 0 - 1 - - cloud_scroll_rate - - 11.679999709129333 - 10.199999809265137 - - cloud_shadow - - 0.35999998450279236 - 0 - 0 - 1 - - density_multiplier - - 0.00031999999191612005 - 0 - 0 - 1 - - distance_multiplier - - 18.899999618530273 - 0 - 0 - 1 - - east_angle - 5.3407073020935059 - enable_cloud_scroll - - 1 - 1 - - gamma - - 0.94999998807907104 - 0 - 0 - 1 - - glow - - 4.2000007629394531 - 0.0010000000474974513 - -0.89999997615814209 - 1 - - haze_density - - 2.0299999713897705 - 0 - 0 - 1 - - haze_horizon - - 0.31999999284744263 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.80588918924331665 - 0.087850809097290039 - -0.58551245927810669 - 0 - - max_y - - 1047 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 0.35999998450279236 - sun_angle - 3.0536284446716309 - sunlight_color - - 1.7999999523162842 - 1.1699999570846558 - 0.71999996900558472 - 1.7999999523162842 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Land%20of%20rising.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Land%20of%20rising.xml deleted file mode 100644 index 265bd59b7..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Land%20of%20rising.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.870000004768371580.129999995231628420.11172848194837570.87000000476837158blue_density0.769999980926513670.573404312133789060.204787224531173710.76999998092651367blue_horizon0.669999957084655760.401999950408935550.16751243174076080.66999995708465576cloud_color0.719999969005584720.28000000119209290.246745616197586060.71999996900558472cloud_pos_density10.779999971389770510.5099999904632568411cloud_pos_density20.439999997615814210.439999997615814210.0399999991059303281cloud_scale0.22999998927116394001cloud_scroll_rate10.49937078477523810.011009025563908cloud_shadow0.43999999761581421001density_multiplier0.00011999999696854502001distance_multiplier24.200000762939453001east_angle2.5132739543914795enable_cloud_scroll00gamma0.82999998331069946001glow7.59999990463256840.0010000000474974513-1.70000004768371581haze_density0.89999997615814209001haze_horizon0.269999980926513670.199156001210212710.199156001210212711lightnorm-0.539442777633666990.39714792370796204-0.742478966712951660max_y474001preset_num18star_brightness1.3799999952316284sun_angle0.40840709209442139sunlight_color0.415178626775741580.930000007152557370.596603810787200930.31000000238418579 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Lilack.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Lilack.xml deleted file mode 100644 index 61a27973f..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Lilack.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.81391310691833496 - 0.63586956262588501 - 1.1699999570846558 - 0.38999998569488525 - - blue_density - - 0.31034484505653381 - 0.26068964600563049 - 0.35999998450279236 - 0.17999999225139618 - - blue_horizon - - 0.49230766296386719 - 0.63999998569488525 - 0.49230766296386719 - 0.31999999284744263 - - cloud_color - - 0.48999997973442078 - 0.48999997973442078 - 0.45999997854232788 - 0.48999997973442078 - - cloud_pos_density1 - - 0.35999998450279236 - 0.38999998569488525 - 0.31999999284744263 - 1 - - cloud_pos_density2 - - 0.38999998569488525 - 0.070000000298023224 - 0.40999999642372131 - 1 - - cloud_scale - - 0.84999996423721313 - 0 - 0 - 1 - - cloud_scroll_rate - - 13.139999628067017 - 7.8799998760223389 - - cloud_shadow - - 0.2800000011920929 - 0 - 0 - 1 - - density_multiplier - - 0.00015999999595806003 - 0 - 0 - 1 - - distance_multiplier - - 10.800000190734863 - 0 - 0 - 1 - - east_angle - 2.8274333477020264 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.0799999237060547 - 0 - 0 - 1 - - glow - - 7.2000002861022949 - 0.0010000000474974513 - -0.85000002384185791 - 1 - - haze_density - - 0.049999997019767761 - 0 - 0 - 1 - - haze_horizon - - 0.35999998450279236 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.10101395100355148 - 0.94506311416625977 - -0.31088891625404358 - 1 - - max_y - - 1611 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0.10999999940395355 - sun_angle - 4.3793802261352539 - sunlight_color - - 0.75698345899581909 - 0.65999996662139893 - 0.93000000715255737 - 0.95999997854232788 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Liz%20gluft.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Liz%20gluft.xml deleted file mode 100644 index 2c5b7f824..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Liz%20gluft.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.239999994635581970.30314102768898010.306676268577575680.32999998331069946blue_density0.100313819944858550.28499954938888550.569999992847442630.56999999284744263blue_horizon0.158065602183341980.312111139297485350.529999971389770510.52999997138977051cloud_color0.620000004768371580.727376222610473630.736265599727630621cloud_pos_density10.899999976158142090.939999997615814210.969999969005584721cloud_pos_density20.419999986886978150.239999994635581970.0299999993294477461cloud_scale0.29999998211860657001cloud_scroll_rate9.99324090429217910.179008409703329cloud_shadow0.31000000238418579001density_multiplier0.00018000000272877514001distance_multiplier6.7000002861022949001east_angle2.1362831592559814enable_cloud_scroll00gamma1.5399999618530273001glow3.6000013351440430.0010000000474974513-0.149999991059303281haze_density0.74000000953674316001haze_horizon0.189999997615814210.199156001210212710.199156001210212711lightnorm-0.829372465610504150.187381312251091-0.52633595466613770max_y1105001preset_num24star_brightness0.18999999761581421sun_angle0.18849556148052216sunlight_color1.25999999046325681.25999999046325681.25999999046325680.41999998688697815 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Lollitudes.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Lollitudes.xml deleted file mode 100644 index b296f2016..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Lollitudes.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.89999997615814209 - 0.52901691198348999 - 0.55500000715255737 - 0.29999998211860657 - - blue_density - - 2 - 0.93022572994232178 - 1.8604696989059448 - 1 - - blue_horizon - - 0.30380001664161682 - 0.62000000476837158 - 0.21699997782707214 - 0.31000000238418579 - - cloud_color - - 0.75999999046325684 - 0.29971826076507568 - 0.47098594903945923 - 0.75999999046325684 - - cloud_pos_density1 - - 0.14000000059604645 - 0.09771379828453064 - 1 - 1 - - cloud_pos_density2 - - 0.4699999988079071 - 0.5 - 0.059999998658895493 - 1 - - cloud_scale - - 0.37999999523162842 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.6399997770786285 - 10.423800468444824 - - cloud_shadow - - 0.2800000011920929 - 0 - 0 - 1 - - density_multiplier - - 0.00089999998454004526 - 0 - 0 - 1 - - distance_multiplier - - 70.300003051757813 - 0 - 0 - 1 - - east_angle - 1.6964600086212158 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.40999999642372131 - 0 - 0 - 1 - - glow - - 5 - 0.0010000000474974513 - -0.33000001311302185 - 1 - - haze_density - - 4 - 0 - 0 - 1 - - haze_horizon - - 0.65999996662139893 - 0.13210900127887726 - 0.13210900127887726 - 1 - - lightnorm - - 0.62758243083953857 - 0.77450281381607056 - 0.079282082617282867 - 0 - - max_y - - 322 - 0 - 0 - 1 - - preset_num - 3 - star_brightness - 0 - sun_angle - 2.2556638717651367 - sunlight_color - - 0.2879999577999115 - 0.53999996185302734 - 0.62999999523162842 - 0.65999996662139893 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Lonely%20cyberpunks.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Lonely%20cyberpunks.xml deleted file mode 100644 index e3281cf25..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Lonely%20cyberpunks.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.14999999105930328 - 0.051724139600992203 - 0.10344827920198441 - 0.049999997019767761 - - blue_density - - 0 - 0.39999699592590332 - 0.80000197887420654 - 1 - - blue_horizon - - 0.051684476435184479 - 0.31999999284744263 - 0.11999999731779099 - 0.31999999284744263 - - cloud_color - - 0.63231253623962402 - 0.64999997615814209 - 0.64999997615814209 - 0.64999997615814209 - - cloud_pos_density1 - - 0.50999999046325684 - 0.45999997854232788 - 0.68000000715255737 - 1 - - cloud_pos_density2 - - 0.48999997973442078 - 0.5 - 0.079999998211860657 - 1 - - cloud_scale - - 0.32999998331069946 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.23999999463558197 - 0 - 0 - 1 - - density_multiplier - - 0.00031999999191612005 - 0 - 0 - 1 - - distance_multiplier - - 49.299999237060547 - 0 - 0 - 1 - - east_angle - 5.9690260887145996 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.7300000190734863 - 0 - 0 - 1 - - glow - - 4.2000007629394531 - 0.0010000000474974513 - -0.79999995231628418 - 1 - - haze_density - - 0.69999998807907104 - 0 - 0 - 1 - - haze_horizon - - 0.2199999988079071 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.30879738926887512 - 0.037690185010433197 - 0.95038080215454102 - 0 - - max_y - - 940 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0.14000000059604645 - sun_angle - 0.03769911453127861 - sunlight_color - - 0.95999997854232788 - 0.6731034517288208 - 0.95999997854232788 - 0.31999999284744263 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Lunar%20kuwang.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Lunar%20kuwang.xml deleted file mode 100644 index a7398e0a1..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Lunar%20kuwang.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.899999976158142090.2299999892711639401blue_density0.261333376169204710.226285681128501890.479999989271163940.47999998927116394blue_horizon0.524999976158142090.245155349373817440.599999964237213130.59999996423721313cloud_color0.0351000018417835240.0215999968349933620.269999980926513670.26999998092651367cloud_pos_density10.259999990463256840.310000002384185790.289999991655349731cloud_pos_density20.189999997615814210.899999976158142090.0399999991059303281cloud_scale0.14000000059604645001cloud_scroll_rate10.45399374929490910.026071512513319cloud_shadow0.34999999403953552001density_multiplier3.9999998989515007e-005001distance_multiplier30.899999618530273001east_angle4.2097339630126953enable_cloud_scroll00gamma1.0299999713897705001glow16.4000015258789060.0010000000474974513-1.85000002384185791haze_density1.2300000190734863001haze_horizon0.669999957084655760.199156001210212710.199156001210212711lightnorm-0.871882140636444090.100361526012420650.479321479797363280max_y763001preset_num18star_brightness0.37999999523162842sun_angle3.0410618782043457sunlight_color1.27199983596801760.944914221763610842.39999985694885250.79999995231628418 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Lydian%20dinosaurs.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Lydian%20dinosaurs.xml deleted file mode 100644 index 2f7828e9a..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Lydian%20dinosaurs.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.049999997019767761000.049999997019767761blue_density0.239999994635581970.0999999940395355220.119999997317790990.23999999463558197blue_horizon00.0299999993294477460.399999976158142090.39999997615814209cloud_color0.779999971389770510.117000006139278410.17940001189708710.77999997138977051cloud_pos_density10.899999976158142090.939999997615814210.799999952316284181cloud_pos_density20.449999988079071040.359999984502792360.0199999995529651641cloud_scale0.18999999761581421001cloud_scroll_rate2020cloud_shadow0.34999999403953552001density_multiplier0.00016999999934341758001distance_multiplier0.40000000596046448001east_angle3.0787608623504639enable_cloud_scroll00gamma1.9499999284744263001glow7.59999990463256840.0010000000474974513-0.649999976158142091haze_density0.22999998927116394001haze_horizon0.189999997615814210.199156001210212710.199156001210212711lightnorm-0.0620174035429954530.15643446147441864-0.985739350318908690max_y197.19999694824219001preset_num24star_brightness0.39999997615814209sun_angle0.15707962214946747sunlight_color1.58999991416931151.79999995231628421.58999991416931151.7999999523162842 diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio9.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20MIDDAY%20%2D%20Why%20so%20blue%253F%201.xml similarity index 65% rename from indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio9.xml rename to indra/newview/app_settings/windlight/skies/%5BTOR%5D%20MIDDAY%20%2D%20Why%20so%20blue%253F%201.xml index 198ff7e61..e2d59e6be 100644 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio9.xml +++ b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20MIDDAY%20%2D%20Why%20so%20blue%253F%201.xml @@ -9,68 +9,68 @@ blue_density - 0.72533315420150757 - 0.995555579662323 - 1.2799999713897705 - 0.63999998569488525 + 0.11593805998563766 + 0.21255312860012054 + 0.74000000953674316 + 0.74000000953674316 blue_horizon - 0.19999998807907104 - 0.2199999988079071 - 0.23999999463558197 - 0.23999999463558197 + 0.52645158767700195 + 0.52645158767700195 + 0.8399999737739563 + 0.8399999737739563 cloud_color - 0.39999997615814209 - 0.40999999642372131 - 0.40999999642372131 - 0.40999999642372131 + 0.68000000715255737 + 0.32800003886222839 + 0.32800003886222839 + 0.68000000715255737 cloud_pos_density1 - 1 - 1 - 0.29999998211860657 + 0.90999996662139893 + 0.45999997854232788 + 0.40999999642372131 1 cloud_pos_density2 - 0.29999998211860657 - 0.29999998211860657 - 0.08999999612569809 + 0.63999998569488525 + 0.38999998569488525 + 0 1 cloud_scale - 0.69999998807907104 + 0.36999997496604919 0 0 1 cloud_scroll_rate - 10.069999776780605 - 10.069999776780605 + 10.050000190734863 + 9.9200000762939453 cloud_shadow - 0 + 0.19999998807907104 0 0 1 density_multiplier - 0.00011000000085914508 + 0.00011999999696854502 0 0 1 distance_multiplier - 15.5 + 1 0 0 1 @@ -84,37 +84,37 @@ gamma - 1.2200000286102295 + 0.93999999761581421 0 0 1 glow - 12 + 6.1999988555908203 0.0010000000474974513 - -0.89999997615814209 + -0.55000001192092896 1 haze_density - 0.26999998092651367 + 0.34999999403953552 0 0 1 haze_horizon - 0 + 0.19999998807907104 0.19915600121021271 0.19915600121021271 1 lightnorm - -0 - 0.84094464778900146 - 0.54112118482589722 + 0 + 0.77450281381607056 + -0.63257044553756714 0 max_y @@ -127,15 +127,15 @@ preset_num 22 star_brightness - 0 + 0.039999999105930328 sun_angle - 0.99902653694152832 + 2.2556638717651367 sunlight_color - 0.65999996662139893 - 0.65999996662139893 - 0.65999996662139893 - 0.2199999988079071 + 1.2899999618530273 + 0.88457131385803223 + 0.51599997282028198 + 0.42999997735023499 diff --git a/indra/newview/app_settings/windlight/skies/Rouge%206.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20MIDDAY%20%2D%20Why%20so%20blue%253F%202.xml similarity index 60% rename from indra/newview/app_settings/windlight/skies/Rouge%206.xml rename to indra/newview/app_settings/windlight/skies/%5BTOR%5D%20MIDDAY%20%2D%20Why%20so%20blue%253F%202.xml index c36da85aa..9606495c4 100644 --- a/indra/newview/app_settings/windlight/skies/Rouge%206.xml +++ b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20MIDDAY%20%2D%20Why%20so%20blue%253F%202.xml @@ -2,81 +2,81 @@ ambient - 0.77999997138977051 0.29999998211860657 0.29999998211860657 - 0.77999997138977051 + 0.29999998211860657 + 0.099999994039535522 blue_density - 0.65999996662139893 - 0.58384609222412109 - 0.58384609222412109 - 0.32999998331069946 + 0.07937999814748764 + 0.22679997980594635 + 1.6200000047683716 + 0.81000000238418579 blue_horizon - 0.37999999523162842 - 0.34000000357627869 - 0.35999998450279236 - 0.37999999523162842 + 0.16684222221374512 + 0.33368346095085144 + 0.57999998331069946 + 0.28999999165534973 cloud_color - 0 - 0 - 0 - 0 + 0.56000000238418579 + 0.56000000238418579 + 0.56000000238418579 + 0.56000000238418579 cloud_pos_density1 - 0.74000000953674316 - 0.93999999761581421 - 0.19999998807907104 + 2.8148899078369141 + 0.78999996185302734 + 0.59999996423721313 1 cloud_pos_density2 - 0.65999996662139893 - 0.69999998807907104 - 0 + 5.9584097862243652 + 0.85999995470046997 + 0.059999998658895493 1 cloud_scale - 0.070000000298023224 + 0.32999998331069946 0 0 1 cloud_scroll_rate - 2.8600001335144043 - 17.589999675750732 + 11.679999351501465 + 10.359999656677246 cloud_shadow - 0.42999997735023499 + 0.11999999731779099 0 0 1 density_multiplier - 0.00015999999595806003 + 0.00031000000308267772 0 0 1 distance_multiplier - 2.1000001430511475 + 0.60000002384185791 0 0 1 east_angle - 3.7699110507965088 + 0 enable_cloud_scroll 1 @@ -84,42 +84,42 @@ gamma - 1.1100000143051147 + 1.3500000238418579 0 0 1 glow - 14.000000953674316 + 8.8000011444091797 0.0010000000474974513 - -0.89999997615814209 + -0.74999994039535522 1 haze_density - 0.82999998331069946 + 0.029999999329447746 0 0 1 haze_horizon - 0.2800000011920929 + 0.32999998331069946 0.19915600121021271 0.19915600121021271 1 lightnorm - 0.58778512477874756 0 - -0.80901706218719482 + 1 + -4.3711388286737929e-008 0 max_y - 276 + 1181 0 0 1 @@ -127,15 +127,15 @@ preset_num 24 star_brightness - 1.1699999570846558 + 0.11999999731779099 sun_angle - 0 + 1.5707963705062866 sunlight_color - 0.29999998211860657 - 0.29999998211860657 - 0.29999998211860657 - 0.099999994039535522 + 1.3499999046325684 + 1.0799999237060547 + 1.0799999237060547 + 0.44999998807907104 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Maldives.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Maldives.xml deleted file mode 100644 index 7b0012e4f..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Maldives.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.32999998331069946 - 0.32999998331069946 - 0.32999998331069946 - 0.10999999940395355 - - blue_density - - 0.16449999809265137 - 0.4699999988079071 - 0.85999995470046997 - 0.85999995470046997 - - blue_horizon - - 0.17547200620174408 - 0.35094299912452698 - 0.8399999737739563 - 0.8399999737739563 - - cloud_color - - 0.65637487173080444 - 0.8788750171661377 - 0.88999998569488525 - 0.88999998569488525 - - cloud_pos_density1 - - 0.10999999940395355 - 5.6909198760986328 - 1 - 1 - - cloud_pos_density2 - - 0.14000000059604645 - 6.9909601211547852 - 0.029999999329447746 - 1 - - cloud_scale - - 0.39999997615814209 - 0 - 0 - 1 - - cloud_scroll_rate - - 12.40999960899353 - 10.199999809265137 - - cloud_shadow - - 0.34999999403953552 - 0 - 0 - 1 - - density_multiplier - - 0.00039999998989515007 - 0 - 0 - 1 - - distance_multiplier - - 2 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.6100000143051147 - 0 - 0 - 1 - - glow - - 5 - 0.0010000000474974513 - -1.1599999666213989 - 1 - - haze_density - - 0.23999999463558197 - 0 - 0 - 1 - - haze_horizon - - 0.099999994039535522 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0 - 0.53051102161407471 - -0.84767806529998779 - 0 - - max_y - - 2201 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 0 - sun_angle - 2.5823893547058105 - sunlight_color - - 1.5 - 1.5 - 1.5 - 0.5 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Malts.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Malts.xml deleted file mode 100644 index 257d57cf5..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Malts.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.15812495350837708 - 0.10834565013647079 - 0.32999998331069946 - 0.32999998331069946 - - blue_density - - 0 - 0.37999701499938965 - 0.75999999046325684 - 0.75999999046325684 - - blue_horizon - - 0.62999999523162842 - 0.38867554068565369 - 0.54294925928115845 - 0.62999999523162842 - - cloud_color - - 0.35522451996803284 - 0.41691544651985168 - 0.41999998688697815 - 0.41999998688697815 - - cloud_pos_density1 - - 0.5 - 0.5 - 0.93999999761581421 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.039999999105930328 - 1 - - cloud_scale - - 0.31000000238418579 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.33593833803161 - 10.065257411083678 - - cloud_shadow - - 0.32999998331069946 - 0 - 0 - 1 - - density_multiplier - - 0.00022999999055173248 - 0 - 0 - 1 - - distance_multiplier - - 45.600002288818359 - 0 - 0 - 1 - - east_angle - 2.7646017074584961 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.2200000286102295 - 0 - 0 - 1 - - glow - - 7.0000004768371582 - 0.0010000000474974513 - -0.55000001192092896 - 1 - - haze_density - - 0.66999995708465576 - 0 - 0 - 1 - - haze_horizon - - 0.22999998927116394 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.3642871081829071 - 0.14401055872440338 - 0.92008471488952637 - 0 - - max_y - - 1500 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.7699999809265137 - sun_angle - 2.997079610824585 - sunlight_color - - 1.3512499332427979 - 1.4099999666213989 - 1.4099999666213989 - 0.4699999988079071 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Martian%20meat.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Martian%20meat.xml deleted file mode 100644 index 0454e04dd..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Martian%20meat.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.6200000047683715800.286537349224090580.62000000476837158blue_density0.90999996662139893000.90999996662139893blue_horizon100.0999999940395355221cloud_color0.299999982118606570.162499994039535520.204992488026618960.29999998211860657cloud_pos_density10.50.50.789999961853027341cloud_pos_density20.50.50.170000001788139341cloud_scale0.19999998807907104001cloud_scroll_rate10.07290822297227410.152564609237686cloud_shadow0.34000000357627869001density_multiplier0.00017999998817685992001distance_multiplier2001east_angle0.37699112296104431enable_cloud_scroll00gamma1.4699999094009399001glow4.1011770117987680.0010000000397674888-0.494980372517707321haze_density0.099999994039535522001haze_horizon0.310000002384185790.199156001210212710.199156001210212711lightnorm0.350107252597808840.30901703238487244-0.884269952774047850max_y1500001preset_num18star_brightness0sun_angle2.8274333477020264sunlight_color31.68998980522155761.68998980522155761 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Melon%20chapterhouse.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Melon%20chapterhouse.xml deleted file mode 100644 index 3a1143414..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Melon%20chapterhouse.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1.0799999237060547 - 0.26999998092651367 - 0.43636363744735718 - 1.0799999237060547 - - blue_density - - 0.81999999284744263 - 0.35999998450279236 - 1.1799999475479126 - 1.1799999475479126 - - blue_horizon - - 0.43999999761581421 - 0.23999999463558197 - 0.35999998450279236 - 0.43999999761581421 - - cloud_color - - 0.10488371551036835 - 0.40999999642372131 - 0 - 0.40999999642372131 - - cloud_pos_density1 - - 0.89999997615814209 - 0.42999997735023499 - 0.38999998569488525 - 1 - - cloud_pos_density2 - - 1 - 0.2800000011920929 - 0.0099999997764825821 - 1 - - cloud_scale - - 0.32999998331069946 - 0 - 0 - 1 - - cloud_scroll_rate - - 7.4499998092651367 - 10.01099967956543 - - cloud_shadow - - 0.37999999523162842 - 0 - 0 - 1 - - density_multiplier - - 0.00059999997029080987 - 0 - 0 - 1 - - distance_multiplier - - 47.299999237060547 - 0 - 0 - 1 - - east_angle - 3.5814156532287598 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.94999998807907104 - 0 - 0 - 1 - - glow - - 10.199999809265137 - 0.0010000000474974513 - -0.59999996423721313 - 1 - - haze_density - - 0.53999996185302734 - 0 - 0 - 1 - - haze_horizon - - 0.19999998807907104 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.41370069980621338 - 0.23649881780147552 - 0.87915873527526855 - 0 - - max_y - - 779 - 0 - 0 - 1 - - preset_num - 27 - star_brightness - 0.98999994993209839 - sun_angle - 2.9028317928314209 - sunlight_color - - 1.6863635778427124 - 1.6545454263687134 - 2.0999999046325684 - 2.0999999046325684 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Metal%20Gear%20Solid.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Metal%20Gear%20Solid.xml deleted file mode 100644 index 073db6c0f..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Metal%20Gear%20Solid.xml +++ /dev/null @@ -1 +0,0 @@ -ambient00.05999999865889549300.059999998658895493blue_density0.0835041627287864690.229997709393501280.459999978542327880.45999997854232788blue_horizon0.318719565868377690.63192045688629150.740000009536743160.74000000953674316cloud_color10.479999989271163940.699999988079071041cloud_pos_density10.50.50.229999989271163941cloud_pos_density20.50.501cloud_scale0.28999999165534973001cloud_scroll_rate2020cloud_shadow0.38999998569488525001density_multiplier0.00016999999934341758001distance_multiplier10.699999809265137001east_angle3.4557521343231201enable_cloud_scroll00gamma1.5399999618530273001glow6.60000085830688480.0010000000474974513-0.899999976158142091haze_density3.2599999904632568001haze_horizon0.46999999880790710.199156001210212710.199156001210212711lightnorm0.309017211198806760-0.951056420803070070max_y1267.5999755859375001preset_num18star_brightness0sun_angle0sunlight_color0.378000110387802120.840000033378601070.378000110387802120.2800000011920929 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Midnight%20rider.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Midnight%20rider.xml deleted file mode 100644 index 66d3db390..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Midnight%20rider.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.648889005184173580.269999980926513670.478618204593658450.71833342313766479blue_density00.479285687208175660.610000014305114750.61000001430511475blue_horizon0.319999992847442630.21470762789249420.408707737922668460.42444443702697754cloud_color0.0499999970197677610.0799999982118606570.0999999940395355220.099999994039535522cloud_pos_density10.689999997615814210.340000003576278690.799999952316284181cloud_pos_density20.21999999880790710.849999964237213130.140000000596046451cloud_scale0.39999997615814209001cloud_scroll_rate10.45399374929490910.026071512513319cloud_shadow0.17000000178813934001density_multiplier1.9999999494757503e-005001distance_multiplier13.40000057220459001east_angle2.3247785568237305enable_cloud_scroll00gamma1.2799999713897705001glow9.80000019073486330.0010000000474974513-1.751haze_density1.1799999475479126001haze_horizon0.310000002384185790.199156001210212710.199156001210212711lightnorm0.725733458995819090.0941082611680030820.681509077548980710max_y309.89999389648437001preset_num18star_brightness0.68000000715255737sun_angle3.0473449230194092sunlight_color1.04999995231628421.66216289997100832.12999987602233892.1299998760223389 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Military%20camo.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Military%20camo.xml deleted file mode 100644 index 91f36dfcf..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Military%20camo.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.310000002384185790.6599999666213989300.66999995708465576blue_density00.408571422100067140.519999980926513670.89999997615814209blue_horizon0.422796010971069340.283679693937301640.539999961853027340.53999996185302734cloud_color0.0968749895691871640.269999980926513670.489999979734420780.48999997973442078cloud_pos_density10.849999964237213130.509999990463256840.751cloud_pos_density20.319999992847442630.489999979734420780.140000000596046451cloud_scale0.44999998807907104001cloud_scroll_rate10.45399374929490910.026071512513319cloud_shadow0.25999999046325684001density_multiplier9.9999997473787516e-006001distance_multiplier17.399999618530273001east_angle6.2831854820251465enable_cloud_scroll00gamma0.93999999761581421001glow0.199999809265136720.0010000000474974513-0.149999991059303281haze_density3.7400000095367432001haze_horizon0.239999994635581970.199156001210212710.199156001210212711lightnorm9.8277809001956484e-0080.82708048820495605-0.562083542346954350max_y253.5001preset_num18star_brightness1.0799999237060547sun_angle2.1676990985870361sunlight_color1.43999993801116940.717817962169647221.40999996662139891.4399999380111694 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Mint%20teahouse.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Mint%20teahouse.xml deleted file mode 100644 index 5500abafe..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Mint%20teahouse.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.0099999997764825821000.0099999997764825821blue_density0.680000007152557370.4999950528144836411blue_horizon0.0700000002980232240.8539465665817260711cloud_color0.539621353149414060.539621353149414060.539621353149414061cloud_pos_density10.50.50.695692241191864011cloud_pos_density20.50.50.1251cloud_scale0.10999999195337296001cloud_scroll_rate10.4994001388549810.01099967956543cloud_shadow0.3765256404876709001density_multiplier0.0004099999787285924001distance_multiplier12.800000190734863001east_angle2.8274333477020264enable_cloud_scroll11gamma1.4800000190734863001glow5.39999961853027340.0010000000474974513-0.399999976158142091haze_density2.9500000476837158001haze_horizon0.459999978542327880.199156001210212710.199156001210212711lightnorm-0.0579039901494979860.98228728771209717-0.178210139274597170max_y1352.0999755859375001preset_num10star_brightness0sun_angle1.382300853729248sunlight_color0.779999971389770511.23000001907348631.23000001907348630.40999999642372131 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Moon%20berries.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Moon%20berries.xml deleted file mode 100644 index 864933b93..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Moon%20berries.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.0799999982118606570.07000000029802322400.099999994039535522blue_density0.131250023841857910.3750.750.75blue_horizon0.121967218816280360.356696128845214840.750.75cloud_color0.699999988079071040.620000004768371580.340000003576278690.77999997138977051cloud_pos_density10.79999995231628418111cloud_pos_density20.699999988079071040.709999978542327880.109999999403953551cloud_scale0.20999999344348907001cloud_scroll_rate9.930000305175781310.199999809265137cloud_shadow0.31000000238418579001density_multiplier0.00036000000545755029001distance_multiplier7.4000000953674316001east_angle2.7017695903778076enable_cloud_scroll00gamma1.5399999618530273001glow4.00000095367431640.0010000000474974513-0.899999976158142091haze_density0.14999999105930328001haze_horizon0.239999994635581970.199156001210212710.199156001210212711lightnorm-0.359497427940368650.53582680225372314-0.763970732688903810max_y2084.5001preset_num24star_brightness0.68000000715255737sun_angle0.56548666954040527sunlight_color1.25999999046325680.930000007152557370.899999976158142091.2599999904632568 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Moon%20goons.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Moon%20goons.xml deleted file mode 100644 index b6a434804..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Moon%20goons.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.14999999105930328 - 0.14999999105930328 - 0.14999999105930328 - 0.049999997019767761 - - blue_density - - 1.9399999380111694 - 0.22309774160385132 - 0.64020013809204102 - 0.96999996900558472 - - blue_horizon - - 1.5199999809265137 - 0.48297649621963501 - 0.5655815601348877 - 0.75999999046325684 - - cloud_color - - 0.40529406070709229 - 0.51999998092651367 - 0 - 0.51999998092651367 - - cloud_pos_density1 - - 0.53999996185302734 - 0.50999999046325684 - 0.25999999046325684 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.10999999940395355 - 1 - - cloud_scale - - 0.26999998092651367 - 0 - 0 - 1 - - cloud_scroll_rate - - 20 - 20 - - cloud_shadow - - 0.42999997735023499 - 0 - 0 - 1 - - density_multiplier - - 0.00023999999393709004 - 0 - 0 - 1 - - distance_multiplier - - 6.0999999046325684 - 0 - 0 - 1 - - east_angle - 3.7070791721343994 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.5499999523162842 - 0 - 0 - 1 - - glow - - 0.39999961853027344 - 0.0010000000474974513 - -0.69999998807907104 - 1 - - haze_density - - 2.7000000476837158 - 0 - 0 - 1 - - haze_horizon - - 0.35999998450279236 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.49942854046821594 - 0.36227551102638245 - -0.78697365522384644 - 1 - - max_y - - 1 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 2 - sun_angle - 3.5123007297515869 - sunlight_color - - 3 - 0.59999984502792358 - 0.31500005722045898 - 1 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Moony.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Moony.xml deleted file mode 100644 index 259325656..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Moony.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.26999998092651367 - 0.26999998092651367 - 0.26999998092651367 - 0.08999999612569809 - - blue_density - - 0 - 0.42428570985794067 - 0.53999996185302734 - 0.62000000476837158 - - blue_horizon - - 0.67334175109863281 - 0.45178604125976563 - 0.85999995470046997 - 0.42999997735023499 - - cloud_color - - 0.2800000011920929 - 0.22400000691413879 - 0.2800000011920929 - 0.2800000011920929 - - cloud_pos_density1 - - 0.66999995708465576 - 0.34000000357627869 - 0.71999996900558472 - 1 - - cloud_pos_density2 - - 0.17000000178813934 - 0.68000000715255737 - 0.10999999940395355 - 1 - - cloud_scale - - 0.45999997854232788 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.453993749294909 - 10.026071512513319 - - cloud_shadow - - 0.44999998807907104 - 0 - 0 - 1 - - density_multiplier - - 1.9999999494757503e-005 - 0 - 0 - 1 - - distance_multiplier - - 41.200000762939453 - 0 - 0 - 1 - - east_angle - 1.6964600086212158 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.1399999856948853 - 0 - 0 - 1 - - glow - - 17.200000762939453 - 0.0010000000474974513 - -1.1499999761581421 - 1 - - haze_density - - 1.2699999809265137 - 0 - 0 - 1 - - haze_horizon - - 0.25 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.96397018432617188 - 0.23649881780147552 - 0.1217777207493782 - 0 - - max_y - - 376 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.0799999237060547 - sun_angle - 2.9028317928314209 - sunlight_color - - 1.1501694917678833 - 1.3578230142593384 - 1.7400000095367432 - 0.57999998331069946 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Morally%20satisfied.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Morally%20satisfied.xml deleted file mode 100644 index 2c8ec12fb..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Morally%20satisfied.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.45999208092689514 - 0.45999497175216675 - 0.45999997854232788 - 0.45999997854232788 - - blue_density - - 0.18153256177902222 - 0.49999594688415527 - 1 - 1 - - blue_horizon - - 0.34822934865951538 - 0.57446801662445068 - 1 - 1 - - cloud_color - - 0.47915497422218323 - 0.53999996185302734 - 0.47915497422218323 - 0.53999996185302734 - - cloud_pos_density1 - - 0.62999999523162842 - 0.44999998807907104 - 0.71999996900558472 - 1 - - cloud_pos_density2 - - 0.50999999046325684 - 0.43999999761581421 - 0.070000000298023224 - 1 - - cloud_scale - - 0.2800000011920929 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.26999998092651367 - 0 - 0 - 1 - - density_multiplier - - 9.9999997473787516e-005 - 0 - 0 - 1 - - distance_multiplier - - 0 - 0 - 0 - 1 - - east_angle - 1.5707963705062866 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.5399999618530273 - 0 - 0 - 1 - - glow - - 2.5999999046325684 - 0.0010000000474974513 - -0.49999997019767761 - 1 - - haze_density - - 0.91999995708465576 - 0 - 0 - 1 - - haze_horizon - - 0.14999999105930328 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.35053443908691406 - 0.9365498423576355 - 1.5322347834967331e-008 - 0 - - max_y - - 1237 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0.79999995231628418 - sun_angle - 1.9289380311965942 - sunlight_color - - 1.0499999523162842 - 0.55851072072982788 - 0.80425530672073364 - 0.34999999403953552 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Morphirizon.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Morphirizon.xml deleted file mode 100644 index dcf553877..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Morphirizon.xml +++ /dev/null @@ -1 +0,0 @@ -ambient000.209999993443489070.20999999344348907blue_density0.0687819346785545350.189998239278793330.379999995231628420.37999999523162842blue_horizon10.529999971389770510.689999997615814211cloud_color0.429999977350234990.389999985694885250.289943695068359380.42999997735023499cloud_pos_density10.179999992251396180.5099999904632568411cloud_pos_density20.50.50.0399999991059303281cloud_scale0.18999999761581421001cloud_scroll_rate10.43610451752829210.032009389655741cloud_shadow0.2800000011920929001density_multiplier9.0000001364387572e-005001distance_multiplier34.900001525878906001east_angle2.0106194019317627enable_cloud_scroll00gamma1.9499999284744263001glow4.80000019073486330.0010000000474974513-1.04999995231628421haze_density0.14999999105930328001haze_horizon0.170000001788139340.199156001210212710.199156001210212711lightnorm-0.732020437717437740.58778524398803711-0.344462782144546510max_y366.20001220703125001preset_num18star_brightness0.44999998807907104sun_angle0.62831848859786987sunlight_color31.94999992847442631.58999991416931153 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20My%20noon.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20My%20noon.xml deleted file mode 100644 index aadda34a1..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20My%20noon.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.330000013113021850.330000013113021850.330000013113021851blue_density0.0979999974370002750.28000000119209290.560000002384185790.56000000238418579blue_horizon0.119999997317790990.350942999124526980.610000014305114750.61000001430511475cloud_color0.58999997377395630.790000021457672120.800000011920928961cloud_pos_density12.81488990783691415.690919876098632811cloud_pos_density25.95840978622436526.99096012115478520.0700000002980232241cloud_scale0.32999998331069946001cloud_scroll_rate9.930000305175781310.199999809265137cloud_shadow0.22999998927116394001density_multiplier0.00039000000106170774001distance_multiplier0.69999998807907104001east_angle3.1415927410125732enable_cloud_scroll11gamma1.5399999618530273001glow3.80000114440917970.0010000000474974513-0.499999970197677611haze_density0.20999999344348907001haze_horizon0.199999988079071040.199156001210212710.199156001210212711lightnorm6.6002361555513294e-0151-7.5497901264043321e-0080max_y1802.800048828125001preset_num24star_brightness0sun_angle1.5707962512969971sunlight_color0.959999978542327880.959999978542327880.959999978542327880.31999999284744263 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Namob%20islet.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Namob%20islet.xml deleted file mode 100644 index 237e3bbc4..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Namob%20islet.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.2800000011920929 - 0.29999998211860657 - 0.5 - 0.5 - - blue_density - - 0.0099999997764825821 - 0.38499599695205688 - 0.48999997973442078 - 0.48999997973442078 - - blue_horizon - - 0.27428573369979858 - 0.47999998927116394 - 0 - 0.47999998927116394 - - cloud_color - - 0.4715094268321991 - 0.48999997973442078 - 0.20908577740192413 - 0.48999997973442078 - - cloud_pos_density1 - - 0.51999998092651367 - 0.62000000476837158 - 0.35999998450279236 - 1 - - cloud_pos_density2 - - 0.29999998211860657 - 0.48999997973442078 - 0.049999997019767761 - 1 - - cloud_scale - - 0.19999998807907104 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.739999771118164 - 10.600000381469727 - - cloud_shadow - - 0.39999997615814209 - 0 - 0 - 1 - - density_multiplier - - 0.00035999997635371983 - 0 - 0 - 1 - - distance_multiplier - - 6 - 0 - 0 - 1 - - east_angle - 0.12566371262073517 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.89999997615814209 - 0 - 0 - 1 - - glow - - 4.8000001907348633 - 0.0010000000474974513 - -0.39999997615814209 - 1 - - haze_density - - 1.3299999237060547 - 0 - 0 - 1 - - haze_horizon - - 0.10999999940395355 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.11167273670434952 - 0.45399037003517151 - -0.88398075103759766 - 0 - - max_y - - 684 - 0 - 0 - 1 - - preset_num - 28 - star_brightness - 0.099999994039535522 - sun_angle - 2.670353889465332 - sunlight_color - - 1.4393758773803711 - 1.0718748569488525 - 2.9399998188018799 - 0.97999995946884155 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20New%20romantic.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20New%20romantic.xml deleted file mode 100644 index ea424dde3..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20New%20romantic.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1.1699999570846558 - 0.17482754588127136 - 0.15025554597377777 - 0.38999998569488525 - - blue_density - - 0.76999998092651367 - 0.57340431213378906 - 0.20478722453117371 - 0.76999998092651367 - - blue_horizon - - 0.51999998092651367 - 0.40199995040893555 - 0.1675124317407608 - 0.51999998092651367 - - cloud_color - - 0.14567166566848755 - 0.40059700608253479 - 0.61000001430511475 - 0.61000001430511475 - - cloud_pos_density1 - - 0.77999997138977051 - 0.50999999046325684 - 1 - 1 - - cloud_pos_density2 - - 0.43999999761581421 - 0.43999999761581421 - 0.039999999105930328 - 1 - - cloud_scale - - 0.22999998927116394 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.499370784775238 - 10.011009025563908 - - cloud_shadow - - 0.31000000238418579 - 0 - 0 - 1 - - density_multiplier - - 0.00014999999257270247 - 0 - 0 - 1 - - distance_multiplier - - 29.700000762939453 - 0 - 0 - 1 - - east_angle - 2.5132739543914795 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.68000000715255737 - 0 - 0 - 1 - - glow - - 10.399999618530273 - 0.0010000000474974513 - -1.25 - 1 - - haze_density - - 0.89999997615814209 - 0 - 0 - 1 - - haze_horizon - - 0.26999998092651367 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.53944271802902222 - 0.39714792370796204 - -0.74247896671295166 - 0 - - max_y - - 474 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.3799999952316284 - sun_angle - 0.40840709209442139 - sunlight_color - - 0.41517862677574158 - 0.93000000715255737 - 0.59660381078720093 - 0.31000000238418579 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Night%20flyer.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Night%20flyer.xml deleted file mode 100644 index 1f0e1ca92..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Night%20flyer.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.648889005184173580.269999980926513670.478618204593658450.71833342313766479blue_density00.479285687208175660.610000014305114750.61000001430511475blue_horizon0.319999992847442630.21470762789249420.408707737922668460.42444443702697754cloud_color0.0499999970197677610.0799999982118606570.0999999940395355220.099999994039535522cloud_pos_density10.689999997615814210.340000003576278690.799999952316284181cloud_pos_density20.21999999880790710.849999964237213130.140000000596046451cloud_scale0.39999997615814209001cloud_scroll_rate10.45399374929490910.026071512513319cloud_shadow0.17000000178813934001density_multiplier4.9999998736893758e-005001distance_multiplier20.100000381469727001east_angle1.2566369771957397enable_cloud_scroll00gamma1.2799999713897705001glow7.64444637298583980.0010000000474974513-0.799999952316284181haze_density1.2300000190734863001haze_horizon00.199156001210212710.199156001210212711lightnorm0.946835696697235110.094108261168003082-0.307645648717880250max_y366.20001220703125001preset_num18star_brightness0.68000000715255737sun_angle3.0473449230194092sunlight_color1.04999995231628421.66216289997100832.12999987602233892.1299998760223389 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Non%2Dgeneric%20fantasy%20landscape.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Non%2Dgeneric%20fantasy%20landscape.xml deleted file mode 100644 index 6ca9b1934..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Non%2Dgeneric%20fantasy%20landscape.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.170000001788139340.599999964237213130.144654005765914920.59999996423721313blue_density0.145225003361701970.349999994039535520.800001978874206541blue_horizon0.539999961853027340.859999954700469970.351310014724731450.85999995470046997cloud_color0.379999995231628420.283137261867523190.579999983310699460.57999998331069946cloud_pos_density10.46999999880790710.5399999618530273411cloud_pos_density20.50.501cloud_scale0.2199999988079071001cloud_scroll_rate10.4994001388549810.01099967956543cloud_shadow0.31000000238418579001density_multiplier0.00015999999595806003001distance_multiplier1.3000000715255737001east_angle0enable_cloud_scroll00gamma1.0299999713897705001glow50.0010000000474974513-0.330000013113021851haze_density0.2800000011920929001haze_horizon0.370000004768371580.199156001210212710.199156001210212711lightnorm00.535826683044433590.844327986240386961max_y316001preset_num21star_brightness0sun_angle3.7070791721343994sunlight_color1.91999995708465580.420000016689300541.35000002384185791.9199999570846558 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Noxumic.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Noxumic.xml deleted file mode 100644 index 3471ed21a..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Noxumic.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.40799996256828308 - 0.42000001668930054 - 0.26400002837181091 - 0.14000000059604645 - - blue_density - - 0.17045657336711884 - 0.77999997138977051 - 0.529285728931427 - 0.38999998569488525 - - blue_horizon - - 0.69882345199584961 - 0.71999996900558472 - 0.58235287666320801 - 0.35999998450279236 - - cloud_color - - 0.25999999046325684 - 0.28999999165534973 - 0.57999998331069946 - 0.57999998331069946 - - cloud_pos_density1 - - 0.4699999988079071 - 0.32999998331069946 - 0.77999997138977051 - 1 - - cloud_pos_density2 - - 0.26999998092651367 - 0.15999999642372131 - 0.08999999612569809 - 1 - - cloud_scale - - 0.34000000357627869 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.069999776780605 - 9.6399997770786285 - - cloud_shadow - - 0.2800000011920929 - 0 - 0 - 1 - - density_multiplier - - 0.00019999999494757503 - 0 - 0 - 1 - - distance_multiplier - - 7.4000000953674316 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.0099999904632568 - 0 - 0 - 1 - - glow - - 13.399999618530273 - 0.0010000000474974513 - -0.39999997615814209 - 1 - - haze_density - - 1.2400000095367432 - 0 - 0 - 1 - - haze_horizon - - 0.31999999284744263 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0 - 0.23649881780147552 - -0.97163176536560059 - 0 - - max_y - - 725 - 0 - 0 - 1 - - preset_num - 22 - star_brightness - 0 - sun_angle - 2.9028317928314209 - sunlight_color - - 1.3499999046325684 - 1.3240385055541992 - 1.2201924324035645 - 0.44999998807907104 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Ominox.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Ominox.xml deleted file mode 100644 index e4048261c..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Ominox.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1.1999999284744263 - 0.80999994277954102 - 0.80999988317489624 - 1.3199999332427979 - - blue_density - - 0.17790013551712036 - 0.48999509215354919 - 0.97999995946884155 - 0.48999997973442078 - - blue_horizon - - 0 - 0 - 0 - 0 - - cloud_color - - 0.77999997138977051 - 0.3986666202545166 - 0.3986666202545166 - 0.77999997138977051 - - cloud_pos_density1 - - 0.61000001430511475 - 0.61000001430511475 - 1 - 1 - - cloud_pos_density2 - - 0.35999998450279236 - 0.049999997019767761 - 0 - 1 - - cloud_scale - - 0.56000000238418579 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.359999775886536 - 10.219999775290489 - - cloud_shadow - - 0.34000000357627869 - 0 - 0 - 1 - - density_multiplier - - 0.00054999999701976776 - 0 - 0 - 1 - - distance_multiplier - - 6.0999999046325684 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.87999999523162842 - 0 - 0 - 1 - - glow - - 7.0000004768371582 - 0.0010000000474974513 - -0.74999994039535522 - 1 - - haze_density - - 1.2200000286102295 - 0 - 0 - 1 - - haze_horizon - - 0.20999999344348907 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0 - 0.10661106556653976 - -0.99430078268051147 - 0 - - max_y - - 483 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 0 - sun_angle - 3.0347785949707031 - sunlight_color - - 2.7300000190734863 - 1.6500000953674316 - 0.71999996900558472 - 2.7300000190734863 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Oriental%20delight%202.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Oriental%20delight%202.xml deleted file mode 100644 index 7ed71f9c6..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Oriental%20delight%202.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.89999997615814209 - 0.22999998927116394 - 0 - 0.89999997615814209 - - blue_density - - 0.5444445013999939 - 0.4714285135269165 - 0.59999996423721313 - 0.59999996423721313 - - blue_horizon - - 0.62999999523162842 - 0.29418638348579407 - 0.20999999344348907 - 0.62999999523162842 - - cloud_color - - 0.11999999731779099 - 0.071999996900558472 - 0.011999999172985554 - 0.11999999731779099 - - cloud_pos_density1 - - 0.25 - 0.31000000238418579 - 0.52999997138977051 - 1 - - cloud_pos_density2 - - 0.18999999761581421 - 0.89999997615814209 - 0.070000000298023224 - 1 - - cloud_scale - - 0.39999997615814209 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.453993749294909 - 10.026071512513319 - - cloud_shadow - - 0.34000000357627869 - 0 - 0 - 1 - - density_multiplier - - 3.9999998989515007e-005 - 0 - 0 - 1 - - distance_multiplier - - 4.7000002861022949 - 0 - 0 - 1 - - east_angle - 3.0787608623504639 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.4699999094009399 - 0 - 0 - 1 - - glow - - 16.600000381469727 - 0.0010000000474974513 - -1.2999999523162842 - 1 - - haze_density - - 0.87000000476837158 - 0 - 0 - 1 - - haze_horizon - - 0.53999996185302734 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.05894353985786438 - 0.34464260935783386 - 0.93688160181045532 - 0 - - max_y - - 366.20001220703125 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.1200000047683716 - sun_angle - 2.7897346019744873 - sunlight_color - - 1.5899999141693115 - 1.1811429262161255 - 0.95783114433288574 - 0.52999997138977051 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Oriental%20delight.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Oriental%20delight.xml deleted file mode 100644 index 679b9e805..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Oriental%20delight.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.899999976158142090.2299999892711639400.89999997615814209blue_density0.54444450139999390.47142851352691650.599999964237213130.59999996423721313blue_horizon0.629999995231628420.294186383485794070.209999993443489070.62999999523162842cloud_color0.129999995231628420.07999999821186065700.12999999523162842cloud_pos_density10.259999990463256840.310000002384185790.529999971389770511cloud_pos_density20.189999997615814210.899999976158142090.0700000002980232241cloud_scale0.41999998688697815001cloud_scroll_rate10.45399374929490910.026071512513319cloud_shadow0.32999998331069946001density_multiplier3.9999998989515007e-005001distance_multiplier4.7000002861022949001east_angle3.5185837745666504enable_cloud_scroll00gamma0.93999999761581421001glow18.5999984741210940.0010000000474974513-1.251haze_density0.87000000476837158001haze_horizon0.539999961853027340.199156001210212710.199156001210212711lightnorm-0.350107252597808840.309017032384872440.884269952774047850max_y366.20001220703125001preset_num18star_brightness0.37999999523162842sun_angle2.8274333477020264sunlight_color1.58999991416931151.18114292621612550.957831144332885740.52999997138977051 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Our%20night%20together.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Our%20night%20together.xml deleted file mode 100644 index 1ee2df7e4..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Our%20night%20together.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.15812495350837708 - 0.10834565013647079 - 0.32999998331069946 - 0.32999998331069946 - - blue_density - - 0 - 0.22842106223106384 - 0.56000000238418579 - 0.56000000238418579 - - blue_horizon - - 0.34999999403953552 - 0.21593084931373596 - 0.30163845419883728 - 0.34999999403953552 - - cloud_color - - 0.68507599830627441 - 0.80405128002166748 - 0.81000000238418579 - 0.81000000238418579 - - cloud_pos_density1 - - 0.5 - 0.5 - 0.20999999344348907 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.11999999731779099 - 1 - - cloud_scale - - 0.31000000238418579 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.33593833803161 - 10.065257411083678 - - cloud_shadow - - 0.37999999523162842 - 0 - 0 - 1 - - density_multiplier - - 0.00026000000070780516 - 0 - 0 - 1 - - distance_multiplier - - 43 - 0 - 0 - 1 - - east_angle - 2.7646017074584961 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.8600000143051147 - 0 - 0 - 1 - - glow - - 8.8000011444091797 - 0.0010000000474974513 - -1.0499999523162842 - 1 - - haze_density - - 1.4900000095367432 - 0 - 0 - 1 - - haze_horizon - - 0.14999999105930328 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.36322319507598877 - 0.16263668239116669 - 0.91739749908447266 - 1 - - max_y - - 1474 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.6499999761581421 - sun_angle - 6.1198229789733887 - sunlight_color - - 1.9799998998641968 - 1.3627382516860962 - 1.1429417133331299 - 0.65999996662139893 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Pale%20incabon.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Pale%20incabon.xml deleted file mode 100644 index 26d7e9215..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Pale%20incabon.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1.6500000953674316 - 1.2899999618530273 - 0.50416672229766846 - 0.55000001192092896 - - blue_density - - 0.37837836146354675 - 0.3405405580997467 - 0.69999998807907104 - 0.34999999403953552 - - blue_horizon - - 0.35999998450279236 - 0.2199999988079071 - 0.57999998331069946 - 0.57999998331069946 - - cloud_color - - 0.42999997735023499 - 0.79000002145767212 - 0.34999999403953552 - 1 - - cloud_pos_density1 - - 2.8148899078369141 - 0.77999997138977051 - 1 - 1 - - cloud_pos_density2 - - 5.9584097862243652 - 0.65999996662139893 - 0.070000000298023224 - 1 - - cloud_scale - - 0.41999998688697815 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.1999998092651367 - 7.8799998760223389 - - cloud_shadow - - 0.25999999046325684 - 0 - 0 - 1 - - density_multiplier - - 0.00011999999696854502 - 0 - 0 - 1 - - distance_multiplier - - 20.30000114440918 - 0 - 0 - 1 - - east_angle - 4.0840702056884766 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.6100000143051147 - 0 - 0 - 1 - - glow - - 5 - 0.0010000000474974513 - -1.1599999666213989 - 1 - - haze_density - - 1.0299999713897705 - 0 - 0 - 1 - - haze_horizon - - 0.2199999988079071 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.80901682376861572 - 0 - 0.58778548240661621 - 0 - - max_y - - 1584 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 0 - sun_angle - 3.2044248580932617 - sunlight_color - - 1.6800000667572021 - 1.2599999904632568 - 1.2599999904632568 - 1.6800000667572021 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Patriotix.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Patriotix.xml deleted file mode 100644 index 567835a1b..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Patriotix.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.75 - 0.25828894972801208 - 0.3515343964099884 - 0.25 - - blue_density - - 0 - 0.8399999737739563 - 0.66499984264373779 - 0.41999998688697815 - - blue_horizon - - 0.41999998688697815 - 0.10769230872392654 - 0.23153845965862274 - 0.20999999344348907 - - cloud_color - - 0.91228073835372925 - 1 - 0.7894737720489502 - 1 - - cloud_pos_density1 - - 0.72999995946884155 - 0.38999998569488525 - 0.56999999284744263 - 1 - - cloud_pos_density2 - - 0.14999999105930328 - 0.75999999046325684 - 0 - 1 - - cloud_scale - - 0.31000000238418579 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.499399908684609 - 10.010999908119629 - - cloud_shadow - - 0.19999998807907104 - 0 - 0 - 1 - - density_multiplier - - 0.00032999998074956238 - 0 - 0 - 1 - - distance_multiplier - - 31.100000381469727 - 0 - 0 - 1 - - east_angle - 6.1575217247009277 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.2099999189376831 - 0 - 0 - 1 - - glow - - 10.399999618530273 - 0.0010000000474974513 - -0.94999998807907104 - 1 - - haze_density - - 1.6200000047683716 - 0 - 0 - 1 - - haze_horizon - - 0.22999998927116394 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.12533064186573029 - 0.0062829158268868923 - -0.99209511280059814 - 0 - - max_y - - 698 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.4599999189376831 - sun_angle - 3.1353096961975098 - sunlight_color - - 0 - 3 - 3 - 3 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Peach%20Peche.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Peach%20Peche.xml deleted file mode 100644 index 97863f31c..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Peach%20Peche.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.689999997615814210.0881820544600486760.120010815560817720.68999999761581421blue_density0.859999954700469970.699999988079071040.250.85999995470046997blue_horizon10.599999964237213130.250018537044525151cloud_color0.226172730921348370.22618303060642120.226183545590060931cloud_pos_density10.50.511cloud_pos_density20.50.50.124997167587295621cloud_scale0.22999998927116394001cloud_scroll_rate10.49937078477523810.011009025563908cloud_shadow0.26999998092651367001density_multiplier0.00042999998549930751001distance_multiplier71.099998474121094001east_angle0enable_cloud_scroll00gamma1.4800000190734863001glow200.0010000000474974513-0.749999940395355221haze_density0.35999998450279236001haze_horizon0.310000002384185790.199156001210212710.199156001210212711lightnorm00.1873813122510910.982287228107452390max_y591.5001preset_num18star_brightness2sun_angle0.18849556148052216sunlight_color0.599999964237213131.68000006675720211.07773590087890620.56000000238418579 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Pevensie.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Pevensie.xml deleted file mode 100644 index eadbc940e..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Pevensie.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.329999983310699460.149999991059303280.177281439304351810.32999998331069946blue_density0.132343501643594760.367265552607499050.734536946470186080.87998175686065849blue_horizon0.21999999880790710.250980705022811890.348196744918823240.89362019300460815cloud_color0.325399808882579580.379953569066330490.382681253823861311cloud_pos_density10.46999999880790710.511cloud_pos_density20.50.50.109997719607582311cloud_scale0.32999997875838005001cloud_scroll_rate10.34408547857856310.062553115316632cloud_shadow0.22999998927116394001density_multiplier0.00049000000581145287001distance_multiplier5.4000000953674316001east_angle0.37699112296104431enable_cloud_scroll00gamma1.2799999713897705001glow2.40000009536743160.0010000000474974513-0.499999970197677611haze_density0.25999999046325684001haze_horizon0.170000001788139340.199156001210212710.199156001210212711lightnorm0.367398142814636230.062790460884571075-0.927941799163818360max_y1026001preset_num18star_brightness0.2199999988079071sun_angle3.0787608623504639sunlight_color2.54999995231628422.40798544883728032.40798544883728032.5499999523162842 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Phlogiston.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Phlogiston.xml deleted file mode 100644 index e995e6f9e..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Phlogiston.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0000blue_density00.424285709857940670.539999961853027340.53999996185302734blue_horizon0.438455134630203250.294186383485794070.560000002384185790.56000000238418579cloud_color0.0499999970197677610.0399999991059303280.0499999970197677610.049999997019767761cloud_pos_density10.620000004768371580.349999994039535520.799999952316284181cloud_pos_density20.21999999880790710.849999964237213130.170000001788139341cloud_scale0.47999998927116394001cloud_scroll_rate10.45399374929490910.026071512513319cloud_shadow0.2800000011920929001density_multiplier1.9999999494757503e-005001distance_multiplier26.80000114440918001east_angle5.2778754234313965enable_cloud_scroll00gamma1.0900000333786011001glow0.199999809265136720.0010000000474974513-0.599999964237213131haze_density1.2599999904632568001haze_horizon0.359999984502792360.199156001210212710.199156001210212711lightnorm-0.726748704910278320.50904130935668945-0.461208492517471310max_y309.89999389648437001preset_num18star_brightness1.0799999237060547sun_angle2.6075220108032227sunlight_color1.65000009536743161.439999938011169433 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Pink%20sink.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Pink%20sink.xml deleted file mode 100644 index bb266cfa3..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Pink%20sink.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1.0799999237060547 - 0.85764694213867188 - 0.85764694213867188 - 0.35999998450279236 - - blue_density - - 0.5 - 0.51999998092651367 - 0.51999998092651367 - 0.51999998092651367 - - blue_horizon - - 0.57999998331069946 - 0.35999998450279236 - 0.34000000357627869 - 0.57999998331069946 - - cloud_color - - 0.22615399956703186 - 0.19999998807907104 - 0.22615399956703186 - 0.22999998927116394 - - cloud_pos_density1 - - 0.82999998331069946 - 0.93999999761581421 - 0.77999997138977051 - 1 - - cloud_pos_density2 - - 0.31999999284744263 - 0.19999998807907104 - 0.039999999105930328 - 1 - - cloud_scale - - 0.35999998450279236 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.31000000238418579 - 0 - 0 - 1 - - density_multiplier - - 0.00041000000783242285 - 0 - 0 - 1 - - distance_multiplier - - 10.100000381469727 - 0 - 0 - 1 - - east_angle - 0.25132742524147034 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.87999999523162842 - 0 - 0 - 1 - - glow - - 9.4000005722045898 - 0.0010000000474974513 - -0.44999998807907104 - 1 - - haze_density - - 0.88999998569488525 - 0 - 0 - 1 - - haze_horizon - - 0.17000000178813934 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.24727256596088409 - 0.10661106556653976 - -0.96306300163269043 - 0 - - max_y - - 779 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 0.26999998092651367 - sun_angle - 3.0347785949707031 - sunlight_color - - 2.3999998569488525 - 2.3999998569488525 - 2.7599997520446777 - 2.7599997520446777 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Planet%20Xmas.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Planet%20Xmas.xml deleted file mode 100644 index 389e064f5..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Planet%20Xmas.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.429999977350234990.0383012928068637850.0521212108433246610.42999997735023499blue_density10.813953399658203130.370000004768371581blue_horizon10.600000023841857910.250018566846847531cloud_color0.879999995231628420.28999933600425720.289999991655349730.87999999523162842cloud_pos_density10.550000011920928960.50.899999976158142091cloud_pos_density20.21999999880790710.3799999952316284201cloud_scale0.20999999344348907001cloud_scroll_rate10.49937078477523810.011009025563908cloud_shadow0.28999999165534973001density_multiplier3.9999998989515007e-005001distance_multiplier100001east_angle5.5292034149169922enable_cloud_scroll00gamma0.66999995708465576001glow0.199999809265136720.0010000000474974513-0.0999999940395355221haze_density2.0299999713897705001haze_horizon0.289999991655349730.199156001210212710.199156001210212711lightnorm0.651042759418487550.309016972780227660.69329059123992920max_y647.9000244140625001preset_num18star_brightness0sun_angle0.31415924429893494sunlight_color0.717856943607330322.00999975204467771.28943383693695070.66999995708465576 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Polaron%20charge%20II.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Polaron%20charge%20II.xml deleted file mode 100644 index 254772690..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Polaron%20charge%20II.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.84000003337860107 - 0.2892836332321167 - 0.39371848106384277 - 0.2800000011920929 - - blue_density - - 0 - 0.85999995470046997 - 0.68083322048187256 - 0.85999995470046997 - - blue_horizon - - 0.77999997138977051 - 0.19999998807907104 - 0.42999997735023499 - 0.77999997138977051 - - cloud_color - - 0.51999998092651367 - 0.56999999284744263 - 0.44999998807907104 - 0.62999999523162842 - - cloud_pos_density1 - - 0.5899999737739563 - 0.37000000476837158 - 0.57999998331069946 - 1 - - cloud_pos_density2 - - 0.14999999105930328 - 0.84999996423721313 - 0 - 1 - - cloud_scale - - 0.31999999284744263 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.499399908684609 - 10.010999908119629 - - cloud_shadow - - 0.17999999225139618 - 0 - 0 - 1 - - density_multiplier - - 0.00033999999868683517 - 0 - 0 - 1 - - distance_multiplier - - 17.600000381469727 - 0 - 0 - 1 - - east_angle - 3.0159289836883545 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.1999999284744263 - 0 - 0 - 1 - - glow - - 9.2000007629394531 - 0.0010000000474974513 - -0.85000002384185791 - 1 - - haze_density - - 1.7799999713897705 - 0 - 0 - 1 - - haze_horizon - - 0.2800000011920929 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.12533320486545563 - 0 - 0.99211472272872925 - 0 - - max_y - - 537 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0.63999998569488525 - sun_angle - 3.1604423522949219 - sunlight_color - - 0.90927821397781372 - 2.9399998188018799 - 1.6367011070251465 - 0.97999995946884155 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Polaron%20charge.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Polaron%20charge.xml deleted file mode 100644 index 58297c5a8..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Polaron%20charge.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.810000002384185790.351273000240325930.478086709976196290.81000000238418579blue_density00.859999954700469970.680833220481872560.85999995470046997blue_horizon0.250.199999988079071040.429999977350234990.42999997735023499cloud_color0.519999980926513670.519999980926513670.519999980926513670.51999998092651367cloud_pos_density10.58999997377395630.370000004768371580.759999990463256841cloud_pos_density20.149999991059303280.849999964237213130.119999997317790991cloud_scale0.32999998331069946001cloud_scroll_rate10.49939990868460910.010999908119629cloud_shadow0.17999999225139618001density_multiplier0.00018999999156221747001distance_multiplier40.900001525878906001east_angle3.0159289836883545enable_cloud_scroll00gamma1.1399999856948853001glow9.20000076293945310.0010000000474974513-0.799999952316284181haze_density1.6200000047683716001haze_horizon0.229999989271163940.199156001210212710.199156001210212711lightnorm0.12508587539196014-0.0627906322479248050.990157008171081540max_y422.5001preset_num18star_brightness0.62999999523162842sun_angle3.2044246196746826sunlight_color0.899999976158142092.219427108764648433 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Port%20skies.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Port%20skies.xml deleted file mode 100644 index ad9da4c70..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Port%20skies.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.31552365422248840.389609873294830320.509999990463256840.50999999046325684blue_density00.283834755420684810.669999957084655760.66999995708465576blue_horizon0.167765960097312930.467978656291961670.829999983310699460.82999998331069946cloud_color0.483320534229278560.584920108318328860.58999997377395630.5899999737739563cloud_pos_density10.159999996423721310.489999979734420780.649999976158142091cloud_pos_density20.50.50.0700000002980232241cloud_scale0.32999998676715947001cloud_scroll_rate10.15778121546060210.12439288725875cloud_shadow0.25999999046325684001density_multiplier4.9999998736893758e-005001distance_multiplier4.7000002861022949001east_angle3.7070791721343994enable_cloud_scroll00gamma1.4699999094009399001glow3.96001529693603520.0010000000474974513-0.499999970197677611haze_density0.84999996423721313001haze_horizon0.0599999986588954930.199156001210212710.199156001210212711lightnorm-0.378886669874191280.707106769084930420.597030043601989750max_y184001preset_num18star_brightness0sun_angle2.3561944961547852sunlight_color1.31999993324279790.925970315933227541.14268696308135990.43999999761581421 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Posture%20eyes.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Posture%20eyes.xml deleted file mode 100644 index f9c84c14a..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Posture%20eyes.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1.5899999141693115 - 0.53999996185302734 - 0 - 0.52999997138977051 - - blue_density - - 0.3599998950958252 - 0.56000000238418579 - 0.39999997615814209 - 0.56000000238418579 - - blue_horizon - - 0.70519989728927612 - 1.059999942779541 - 0.81999999284744263 - 1.059999942779541 - - cloud_color - - 0 - 0 - 0 - 0 - - cloud_pos_density1 - - 0 - 0 - 0 - 1 - - cloud_pos_density2 - - 0 - 0 - 0 - 1 - - cloud_scale - - 0.0099999997764825821 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.55000001192092896 - 0 - 0 - 1 - - density_multiplier - - 0.00082999997539445758 - 0 - 0 - 1 - - distance_multiplier - - 72.300003051757813 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.26999998092651367 - 0 - 0 - 1 - - glow - - 11.600000381469727 - 0.0010000000474974513 - -1.4999998807907104 - 1 - - haze_density - - 0 - 0 - 0 - 1 - - haze_horizon - - 0 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0 - 0 - 1 - 0 - - max_y - - 9 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 0 - sunlight_color - - 0.12980769574642181 - 0.14999999105930328 - 0.054807685315608978 - 0.049999997019767761 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Purple%20wisps%20and%20egg%20yolk.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Purple%20wisps%20and%20egg%20yolk.xml deleted file mode 100644 index 79ada31c2..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Purple%20wisps%20and%20egg%20yolk.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.17652176320552826 - 0.17021737992763519 - 0.35999998450279236 - 0.35999998450279236 - - blue_density - - 0.22321934998035431 - 0.12344463169574738 - 0.62999999523162842 - 0.62999999523162842 - - blue_horizon - - 0.56999999284744263 - 0.3174683153629303 - 0.187594935297966 - 0.56999999284744263 - - cloud_color - - 0.32999998331069946 - 0.088846154510974884 - 0.28769227862358093 - 0.32999998331069946 - - cloud_pos_density1 - - 0.68000000715255737 - 0.57999998331069946 - 0.22999998927116394 - 1 - - cloud_pos_density2 - - 0.5 - 0.23999999463558197 - 0.059999998658895493 - 1 - - cloud_scale - - 0.25999999046325684 - 0 - 0 - 1 - - cloud_scroll_rate - - 15.029999732971191 - 10.423800468444824 - - cloud_shadow - - 0.37000000476837158 - 0 - 0 - 1 - - density_multiplier - - 3.9999998989515007e-005 - 0 - 0 - 1 - - distance_multiplier - - 13.40000057220459 - 0 - 0 - 1 - - east_angle - 3.1415927410125732 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.89999997615814209 - 0 - 0 - 1 - - glow - - 12 - 0.0013735899701714516 - -1.4999998807907104 - 1 - - haze_density - - 1.2099999189376831 - 0 - 0 - 1 - - haze_horizon - - 0.28999999165534973 - 0.13210900127887726 - 0.13210900127887726 - 1 - - lightnorm - - -7.0402265350821835e-008 - 0.59285664558410645 - 0.80530798435211182 - 0 - - max_y - - 737 - 0 - 0 - 1 - - preset_num - 5 - star_brightness - 0.39999997615814209 - sun_angle - 2.5069911479949951 - sunlight_color - - 2.0961902141571045 - 1.6566663980484009 - 1.2300000190734863 - 0.70999997854232788 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Railingz%202.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Railingz%202.xml deleted file mode 100644 index f25dcf1be..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Railingz%202.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.44999998807907104 - 0.14787299931049347 - 0.20125800371170044 - 0.44999998807907104 - - blue_density - - 0.039999999105930328 - 0.31999650597572327 - 0.63999998569488525 - 0.31999999284744263 - - blue_horizon - - 0.5 - 0.092599146068096161 - 0.1084362119436264 - 0.25 - - cloud_color - - 0.2894594669342041 - 0.075810812413692474 - 0.50999999046325684 - 0.50999999046325684 - - cloud_pos_density1 - - 0.37999999523162842 - 0.97999995946884155 - 0.19999998807907104 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.39999997615814209 - 1 - - cloud_scale - - 0.35999998450279236 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.644780158996582 - 10.423800468444824 - - cloud_shadow - - 0.32999998331069946 - 0 - 0 - 1 - - density_multiplier - - 0.00014000000373926014 - 0 - 0 - 1 - - distance_multiplier - - 27 - 0 - 0 - 1 - - east_angle - 5.4663715362548828 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.6100000143051147 - 0 - 0 - 1 - - glow - - 2.9999995231628418 - 0.0013735899701714516 - -0.55000001192092896 - 1 - - haze_density - - 0.45999997854232788 - 0 - 0 - 1 - - haze_horizon - - 0.18999999761581421 - 0.13210900127887726 - 0.13210900127887726 - 1 - - lightnorm - - 0.72614991664886475 - 0.087851203978061676 - 0.68190062046051025 - 0 - - max_y - - 725 - 0 - 0 - 1 - - preset_num - 5 - star_brightness - 0 - sun_angle - 0.087964601814746857 - sunlight_color - - 1.619999885559082 - 1.5 - 0.89552247524261475 - 1.619999885559082 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Railingz.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Railingz.xml deleted file mode 100644 index 56469116b..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Railingz.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.44999998807907104 - 0.14787299931049347 - 0.20125800371170044 - 0.44999998807907104 - - blue_density - - 0.19641187787055969 - 0.41999536752700806 - 0.8399999737739563 - 0.41999998688697815 - - blue_horizon - - 0.57999998331069946 - 0.10741499811410904 - 0.12578600645065308 - 0.57999998331069946 - - cloud_color - - 0.20250001549720764 - 0.44999998807907104 - 0.20250001549720764 - 0.44999998807907104 - - cloud_pos_density1 - - 0.37999999523162842 - 0.97999995946884155 - 1 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.15999999642372131 - 1 - - cloud_scale - - 0.39999997615814209 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.644780158996582 - 10.423800468444824 - - cloud_shadow - - 0.37999999523162842 - 0 - 0 - 1 - - density_multiplier - - 0.00011999999696854502 - 0 - 0 - 1 - - distance_multiplier - - 12.800000190734863 - 0 - 0 - 1 - - east_angle - 5.4663715362548828 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.6100000143051147 - 0 - 0 - 1 - - glow - - 2.9999995231628418 - 0.0013735899701714516 - -0.55000001192092896 - 1 - - haze_density - - 0.81000000238418579 - 0 - 0 - 1 - - haze_horizon - - 0.15999999642372131 - 0.13210900127887726 - 0.13210900127887726 - 1 - - lightnorm - - 0.72614991664886475 - 0.087851203978061676 - 0.68190062046051025 - 0 - - max_y - - 1342 - 0 - 0 - 1 - - preset_num - 5 - star_brightness - 0 - sun_angle - 0.087964601814746857 - sunlight_color - - 1.619999885559082 - 1.5 - 0.89552247524261475 - 1.619999885559082 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rainbowtek.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rainbowtek.xml deleted file mode 100644 index 2404710e6..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rainbowtek.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.16695043444633484 - 0.19838158786296844 - 0.26999998092651367 - 0.08999999612569809 - - blue_density - - 0.77999997138977051 - 0.42999571561813354 - 0.85999995470046997 - 0.85999995470046997 - - blue_horizon - - 0.10767599940299988 - 0.079999998211860657 - 0.25 - 0.25999999046325684 - - cloud_color - - 0.69999998807907104 - 0.24999998509883881 - 0.44999992847442627 - 0.69999998807907104 - - cloud_pos_density1 - - 0.51999998092651367 - 0.40999999642372131 - 0.31999999284744263 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0 - 1 - - cloud_scale - - 0.14999999105930328 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.37000000476837158 - 0 - 0 - 1 - - density_multiplier - - 0.00046000001020729542 - 0 - 0 - 1 - - distance_multiplier - - 2.7000000476837158 - 0 - 0 - 1 - - east_angle - 3.7070791721343994 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.6100000143051147 - 0 - 0 - 1 - - glow - - 3.4000015258789063 - 0.0010000000474974513 - -1.4499999284744263 - 1 - - haze_density - - 0.69999998807907104 - 0 - 0 - 1 - - haze_horizon - - 0.15999999642372131 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.53582668304443359 - 0 - -0.84432798624038696 - 0 - - max_y - - 562.5 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 0 - sunlight_color - - 3 - 1.7100000381469727 - 0.50999999046325684 - 3 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Ramshagguld.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Ramshagguld.xml deleted file mode 100644 index b13be3e88..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Ramshagguld.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.0099999997764825821 - 0.0099999997764825821 - 0.0099999997764825821 - 0.0099999997764825821 - - blue_density - - 0.3137931227684021 - 0.25999739766120911 - 0.51999998092651367 - 0.51999998092651367 - - blue_horizon - - 0.42999997735023499 - 0.32999998331069946 - 0.20999999344348907 - 0.42999997735023499 - - cloud_color - - 1 - 1 - 1 - 1 - - cloud_pos_density1 - - 0 - 0 - 0 - 1 - - cloud_pos_density2 - - 0 - 0 - 0 - 1 - - cloud_scale - - 0.0099999997764825821 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.8000001907348633 - 8.9899997711181641 - - cloud_shadow - - 0 - 0 - 0 - 1 - - density_multiplier - - 0.00020999999833293259 - 0 - 0 - 1 - - distance_multiplier - - 24.200000762939453 - 0 - 0 - 1 - - east_angle - 3.1415927410125732 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.31999999284744263 - 0 - 0 - 1 - - glow - - 12.799999237060547 - 0.0010000000474974513 - -0.64999997615814209 - 1 - - haze_density - - 0.56000000238418579 - 0 - 0 - 1 - - haze_horizon - - 0.2199999988079071 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -8.0872823104982672e-008 - 0.37977889180183411 - 0.92507725954055786 - 0 - - max_y - - 632 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 2.75203537940979 - sunlight_color - - 3 - 2.8385703563690186 - 2.8385703563690186 - 1 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Ravenelle%27s%20choice.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Ravenelle%27s%20choice.xml deleted file mode 100644 index 08ff9e8e1..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Ravenelle%27s%20choice.xml +++ /dev/null @@ -1 +0,0 @@ -ambient10.199999988079071040.229999989271163941blue_density00.989999949932098390.783749818801879880.98999994993209839blue_horizon0.409999996423721310.1400000005960464500.53999996185302734cloud_color0.399999976158142090.459999978542327880.479999989271163940.47999998927116394cloud_pos_density10.620000004768371580.370000004768371580.789999961853027341cloud_pos_density20.149999991059303280.849999964237213130.119999997317790991cloud_scale0.31000000238418579001cloud_scroll_rate10.49939990868460910.010999908119629cloud_shadow0.15999999642372131001density_multiplier0.00018999999156221747001distance_multiplier40.900001525878906001east_angle3.3929200172424316enable_cloud_scroll00gamma0.74000000953674316001glow7.79999971389770510.0010000000474974513-1.04999995231628421haze_density1.5899999141693115001haze_horizon0.21999999880790710.199156001210212710.199156001210212711lightnorm-0.24819910526275635-0.0627906322479248050.966671884059906010max_y169001preset_num18star_brightness0.44999998807907104sun_angle3.2044246196746826sunlight_color32.009999752044677703 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Raylanta.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Raylanta.xml deleted file mode 100644 index ea7b8ee9e..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Raylanta.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.989999949932098390.0881820544600486760.120010815560817720.98999994993209839blue_density10.813953518867492680.290697693824768071blue_horizon10.600000023841857910.250018566846847531cloud_color0.226172730921348370.22618303060642120.226183545590060931cloud_pos_density10.50.511cloud_pos_density20.50.50.124997167587295621cloud_scale0.22999998927116394001cloud_scroll_rate10.49937078477523810.011009025563908cloud_shadow0.26999998092651367001density_multiplier7.9999997979030013e-005001distance_multiplier89.900001525878906001east_angle2.2619466781616211enable_cloud_scroll00gamma0.81000000238418579001glow10.599999427795410.0010000000474974513-101haze_density2.7699999809265137001haze_horizon0.349999994039535520.199156001210212710.199156001210212711lightnorm-0.732801675796508790.30901697278022766-0.606226205825805660max_y704.20001220703125001preset_num18star_brightness0sun_angle0.31415924429893494sunlight_color0.910714149475097662.54999995231628421.63584899902343750.84999996423721313 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rebranded%20skies.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rebranded%20skies.xml deleted file mode 100644 index 8a94ff8ea..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rebranded%20skies.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.84000003337860107 - 0.84000003337860107 - 0.84000003337860107 - 0.2800000011920929 - - blue_density - - 0.21596308052539825 - 0.39593231678009033 - 0.89999997615814209 - 0.44999998807907104 - - blue_horizon - - 0.41088902950286865 - 0.41088902950286865 - 0.68000000715255737 - 0.34000000357627869 - - cloud_color - - 0.47999998927116394 - 0.47999998927116394 - 0.47999998927116394 - 0.47999998927116394 - - cloud_pos_density1 - - 0.52999997138977051 - 0.43999999761581421 - 0.88999998569488525 - 1 - - cloud_pos_density2 - - 0.52999997138977051 - 0.23999999463558197 - 0.059999998658895493 - 1 - - cloud_scale - - 0.41999999237537178 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.069999776780605 - 10.149999767541885 - - cloud_shadow - - 0.31000000238418579 - 0 - 0 - 1 - - density_multiplier - - 0.00016999999934341758 - 0 - 0 - 1 - - distance_multiplier - - 0.80000001235008633 - 0 - 0 - 1 - - east_angle - 0.37699112296104431 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.1899999380111694 - 0 - 0 - 1 - - glow - - 5 - 0.0010000000474974513 - -0.59999996423721313 - 1 - - haze_density - - 0.69999998764991744 - 0 - 0 - 1 - - haze_horizon - - 0.18999999454975031 - 0.19915600071018602 - 0.19915600071018602 - 1 - - lightnorm - - 0.19332973659038544 - 0.85099434852600098 - -0.48829516768455505 - 0 - - max_y - - 1604.9999921321869 - 0 - 0 - 1 - - preset_num - 22 - star_brightness - 0 - sun_angle - 2.1237168312072754 - sunlight_color - - 0.70916664600372314 - 0.86333346366882324 - 1.1100000143051147 - 0.37000000476837158 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Red%20city.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Red%20city.xml deleted file mode 100644 index 924c2b628..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Red%20city.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1 - 0.019999999552965164 - 0 - 1 - - blue_density - - 0.099999994039535522 - 0.24640001356601715 - 0.87999999523162842 - 0.87999999523162842 - - blue_horizon - - 1 - 0.70652174949645996 - 0.95652180910110474 - 1 - - cloud_color - - 0.59800004959106445 - 0.68137490749359131 - 0.68999999761581421 - 0.68999999761581421 - - cloud_pos_density1 - - 0.5899999737739563 - 0.53999996185302734 - 0.37000000476837158 - 1 - - cloud_pos_density2 - - 0 - 0 - 0 - 1 - - cloud_scale - - 0.20999999344348907 - 0 - 0 - 1 - - cloud_scroll_rate - - 10 - 10 - - cloud_shadow - - 0.28999999165534973 - 0 - 0 - 1 - - density_multiplier - - 0.00026000000070780516 - 0 - 0 - 1 - - distance_multiplier - - 10.100000381469727 - 0 - 0 - 1 - - east_angle - 4.9008846282958984 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.3999999761581421 - 0 - 0 - 1 - - glow - - 15 - 0.0010000000474974513 - -2.5 - 1 - - haze_density - - 0.40999999642372131 - 0 - 0 - 1 - - haze_horizon - - 0.08999999612569809 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.98180252313613892 - 0.031410444527864456 - -0.18728893995285034 - 0 - - max_y - - 632 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.059999942779541 - sun_angle - 3.1101770401000977 - sunlight_color - - 3 - 2.0099997520446777 - 1.2721518278121948 - 1 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rendez%2Dvous.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rendez%2Dvous.xml deleted file mode 100644 index c3cf0868f..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rendez%2Dvous.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.019999999552965164 - 0 - 0 - 0.019999999552965164 - - blue_density - - 0.35000002384185791 - 0.28999707102775574 - 0.57999998331069946 - 0.57999998331069946 - - blue_horizon - - 0.56000000238418579 - 0.42976745963096619 - 0.2734883725643158 - 0.56000000238418579 - - cloud_color - - 0 - 0 - 0 - 0 - - cloud_pos_density1 - - 0 - 0 - 0 - 1 - - cloud_pos_density2 - - 0 - 0 - 0 - 1 - - cloud_scale - - 0.0099999997764825821 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.8000001907348633 - 8.9899997711181641 - - cloud_shadow - - 0 - 0 - 0 - 1 - - density_multiplier - - 0.00020999999833293259 - 0 - 0 - 1 - - distance_multiplier - - 24.200000762939453 - 0 - 0 - 1 - - east_angle - 3.2672562599182129 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.37000000476837158 - 0 - 0 - 1 - - glow - - 12.799999237060547 - 0.0010000000474974513 - -0.49999997019767761 - 1 - - haze_density - - 0.56000000238418579 - 0 - 0 - 1 - - haze_horizon - - 0.2199999988079071 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.1176544651389122 - 0.34464260935783386 - 0.9313318133354187 - 0 - - max_y - - 632 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0.52999997138977051 - sun_angle - 2.7897346019744873 - sunlight_color - - 2.1599998474121094 - 2.0437705516815186 - 2.0437705516815186 - 0.71999996900558472 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rezzable%20Hallucinogen.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rezzable%20Hallucinogen.xml deleted file mode 100644 index 107fe1742..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rezzable%20Hallucinogen.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.48999997973442078 - 0 - 0 - 0.48999997973442078 - - blue_density - - 0.15999999642372131 - 0.49999496340751648 - 1 - 1 - - blue_horizon - - 0.4699999988079071 - 0.80000001192092896 - 1 - 1 - - cloud_color - - 0.22999998927116394 - 0.1616215854883194 - 0.024864867329597473 - 0.22999998927116394 - - cloud_pos_density1 - - 0.51999998092651367 - 0.34999999403953552 - 0.68999999761581421 - 1 - - cloud_pos_density2 - - 0 - 0 - 0.15999999642372131 - 1 - - cloud_scale - - 0.17000000178813934 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.25999999046325684 - 0 - 0 - 1 - - density_multiplier - - 0.00089999998454004526 - 0 - 0 - 1 - - distance_multiplier - - 14.800000190734863 - 0 - 0 - 1 - - east_angle - 6.1575217247009277 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.6699999570846558 - 0 - 0 - 1 - - glow - - 12.200000762939453 - 0.0010000000474974513 - -1.5499999523162842 - 1 - - haze_density - - 0.62000000476837158 - 0 - 0 - 1 - - haze_horizon - - 0.44999998807907104 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.11272525787353516 - 0.43711581826210022 - 0.89231318235397339 - 0 - - max_y - - 1 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 0.45238938927650452 - sunlight_color - - 2.0099997520446777 - 0.89361709356307983 - 0.47872340679168701 - 2.0099997520446777 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rightvision.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rightvision.xml deleted file mode 100644 index 928d88b02..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rightvision.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0 - 0 - 0 - 0 - - blue_density - - 0 - 1 - 1 - 1 - - blue_horizon - - 0 - 1 - 0 - 1 - - cloud_color - - 0 - 0 - 0 - 0 - - cloud_pos_density1 - - 0 - 0 - 0 - 1 - - cloud_pos_density2 - - 0 - 0 - 0 - 1 - - cloud_scale - - 0.0099999997764825821 - 0 - 0 - 1 - - cloud_scroll_rate - - 20 - 20 - - cloud_shadow - - 0.25999999046325684 - 0 - 0 - 1 - - density_multiplier - - 0.00089999998454004526 - 0 - 0 - 1 - - distance_multiplier - - 100 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 0 - 0 - - gamma - - 5 - 0 - 0 - 1 - - glow - - 20 - 0.0010000000474974513 - 0 - 1 - - haze_density - - 4 - 0 - 0 - 1 - - haze_horizon - - 0 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0 - 0 - 1 - 0 - - max_y - - 26 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 2 - sun_angle - 0 - sunlight_color - - 0 - 0 - 0 - 0 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rimmerthal.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rimmerthal.xml deleted file mode 100644 index c68af7ce0..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rimmerthal.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.39999997615814209 - 0.073474660515785217 - 0.099999994039535522 - 0.39999997615814209 - - blue_density - - 0 - 0.25499752163887024 - 0.50999999046325684 - 0.50999999046325684 - - blue_horizon - - 0.029999999329447746 - 0.36719763278961182 - 0.42999997735023499 - 0.4699999988079071 - - cloud_color - - 0.29699531197547913 - 0.44549298286437988 - 0.64999997615814209 - 0.64999997615814209 - - cloud_pos_density1 - - 0.91999995708465576 - 0.75999999046325684 - 0.14999999105930328 - 1 - - cloud_pos_density2 - - 0.43999999761581421 - 0.34000000357627869 - 0 - 1 - - cloud_scale - - 0.20999999344348907 - 0 - 0 - 1 - - cloud_scroll_rate - - 20 - 10.01099967956543 - - cloud_shadow - - 0.34999999403953552 - 0 - 0 - 1 - - density_multiplier - - 0.00013000000035390258 - 0 - 0 - 1 - - distance_multiplier - - 5.4000000953674316 - 0 - 0 - 1 - - east_angle - 4.6495571136474609 - enable_cloud_scroll - - 0 - 0 - - gamma - - 4.0399999618530273 - 0 - 0 - 1 - - glow - - 20 - 0.0010000000474974513 - 0 - 1 - - haze_density - - 0.0099999997764825821 - 0 - 0 - 1 - - haze_horizon - - 0.74000000953674316 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.98762339353561401 - 0.14401097595691681 - -0.062136013060808182 - 1 - - max_y - - 500 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 0.23999999463558197 - sun_angle - 3.2861061096191406 - sunlight_color - - 2.6399998664855957 - 2.0024998188018799 - 1.3199999332427979 - 2.6399998664855957 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sad%20purple.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sad%20purple.xml deleted file mode 100644 index 74bb07fb5..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sad%20purple.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.80999994277954102 - 0.80999994277954102 - 0.80999994277954102 - 0.26999998092651367 - - blue_density - - 0.50068968534469604 - 0.65999996662139893 - 0.59172403812408447 - 0.32999998331069946 - - blue_horizon - - 0.77999997138977051 - 0.45999997854232788 - 0.74000000953674316 - 0.85999995470046997 - - cloud_color - - 0.40999999642372131 - 0.40999999642372131 - 0.40999999642372131 - 0.40999999642372131 - - cloud_pos_density1 - - 0.89999997615814209 - 0.42999997735023499 - 1 - 1 - - cloud_pos_density2 - - 0 - 0 - 0 - 1 - - cloud_scale - - 0.42999997735023499 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.200000040817258 - 10.010999893335338 - - cloud_shadow - - 0.38999998569488525 - 0 - 0 - 1 - - density_multiplier - - 0.00014000000373926014 - 0 - 0 - 1 - - distance_multiplier - - 19.600000381469727 - 0 - 0 - 1 - - east_angle - 2.8274333477020264 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.87999999523162842 - 0 - 0 - 1 - - glow - - 8.3999996185302734 - 0.0010000000474974513 - -0.64999997615814209 - 1 - - haze_density - - 1.6499999761581421 - 0 - 0 - 1 - - haze_horizon - - 0.17999999225139618 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.2330765426158905 - 0.65658563375473022 - 0.71733576059341431 - 0 - - max_y - - 1826 - 0 - 0 - 1 - - preset_num - 27 - star_brightness - 1.0799999237060547 - sun_angle - 2.4253096580505371 - sunlight_color - - 0.7342105507850647 - 0.78157895803451538 - 0.89999997615814209 - 0.29999998211860657 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sailor%20moon.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sailor%20moon.xml deleted file mode 100644 index c052bd31e..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sailor%20moon.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.659999966621398930.149999991059303280.149999991059303280.65999996662139893blue_density0.569999992847442630.424285709857940670.539999961853027340.56999999284744263blue_horizon0.560000002384185790.294186383485794070.209999993443489070.56000000238418579cloud_color0.0799999982118606570.07999999821186065700.079999998211860657cloud_pos_density10.289999991655349730.310000002384185790.859999954700469971cloud_pos_density20.21999999880790710.849999964237213130.149999991059303281cloud_scale0.48999997973442078001cloud_scroll_rate10.45399374929490910.026071512513319cloud_shadow0.17999999225139618001density_multiplier3.9999998989515007e-005001distance_multiplier43001east_angle2.2619466781616211enable_cloud_scroll00gamma1.1399999856948853001glow11.4000015258789060.0010000000474974513-1.14999997615814211haze_density0.87000000476837158001haze_horizon0.569999992847442630.199156001210212710.199156001210212711lightnorm0.732801675796508790.309017032384872440.606226205825805660max_y450.70001220703125001preset_num18star_brightness1.0799999237060547sun_angle2.8274333477020264sunlight_color31.04999995231628421.68000006675720213 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Scanning%20aliens.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Scanning%20aliens.xml deleted file mode 100644 index bff9ca184..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Scanning%20aliens.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0 - 0 - 0.71999996900558472 - 0.23999999463558197 - - blue_density - - 0 - 0.74000000953674316 - 0.22962112724781036 - 0.74000000953674316 - - blue_horizon - - 0.66666674613952637 - 1.1000000238418579 - 0.66666674613952637 - 1.1000000238418579 - - cloud_color - - 0.37000000476837158 - 0.25999999046325684 - 0.039999999105930328 - 0.37000000476837158 - - cloud_pos_density1 - - 0.51999998092651367 - 0.38999998569488525 - 0.68999999761581421 - 1 - - cloud_pos_density2 - - 0 - 0 - 0 - 1 - - cloud_scale - - 0.17000000178813934 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.5 - 0 - 0 - 1 - - density_multiplier - - 0.00089999998454004526 - 0 - 0 - 1 - - distance_multiplier - - 100 - 0 - 0 - 1 - - east_angle - 0.12566371262073517 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.94999998807907104 - 0 - 0 - 1 - - glow - - 11.600000381469727 - 0.0010000000474974513 - -1.4999998807907104 - 1 - - haze_density - - 0 - 0 - 0 - 1 - - haze_horizon - - 0 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.10497009009122849 - 0.54639440774917603 - 0.83092385530471802 - 0 - - max_y - - 1 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 0.57805311679840088 - sunlight_color - - 2.369999885559082 - 0.75839990377426147 - 0.45029997825622559 - 0.78999996185302734 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Shilarto.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Shilarto.xml deleted file mode 100644 index a1f740f7c..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Shilarto.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0 - 0.53999996185302734 - 0.95999997854232788 - 0.95999997854232788 - - blue_density - - 0.079999998211860657 - 0.21999964118003845 - 0.39999997615814209 - 0.39999997615814209 - - blue_horizon - - 1.1200000047683716 - 0.37999999523162842 - 0.19999998807907104 - 1.1200000047683716 - - cloud_color - - 0.40999999642372131 - 0.47999998927116394 - 0.31999999284744263 - 0.48999997973442078 - - cloud_pos_density1 - - 0.87999999523162842 - 0.94999998807907104 - 0.81999999284744263 - 1 - - cloud_pos_density2 - - 0.56999999284744263 - 0.19999998807907104 - 0.029999999329447746 - 1 - - cloud_scale - - 0.23999999463558197 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.993240904292179 - 10.179008409703329 - - cloud_shadow - - 0.34999999403953552 - 0 - 0 - 1 - - density_multiplier - - 0.00026000000070780516 - 0 - 0 - 1 - - distance_multiplier - - 6.0999999046325684 - 0 - 0 - 1 - - east_angle - 1.382300853729248 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.0799999237060547 - 0 - 0 - 1 - - glow - - 5.3999996185302734 - 0.0010000000474974513 - -0.55000001192092896 - 1 - - haze_density - - 1.1100000143051147 - 0 - 0 - 1 - - haze_horizon - - 0.14999999105930328 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.8293725848197937 - 0.53582686185836792 - 0.15821120142936707 - 0 - - max_y - - 376 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 1.1899999380111694 - sun_angle - 0.56548672914505005 - sunlight_color - - 2.8799998760223389 - 1.2300000190734863 - 1.2899999618530273 - 2.8799998760223389 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Shine%20on%20my%20friends.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Shine%20on%20my%20friends.xml deleted file mode 100644 index dce858ede..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Shine%20on%20my%20friends.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.629999995231628420.109999999403953550.550000011920928960.62999999523162842blue_density0.189999997615814210.259998291730880740.519999980926513670.51999998092651367blue_horizon0.209999993443489070.207604348659515380.310000002384185790.31000000238418579cloud_color0.193940460681915280.179999992251396180.46999999880790710.4699999988079071cloud_pos_density10.669999957084655760.289999991655349730.779999971389770511cloud_pos_density20.340000003576278690.550000011920928960.269999980926513671cloud_scale0.37000000476837158001cloud_scroll_rate10.2463061592461610.095008669949948cloud_shadow0.25999999046325684001density_multiplier0.00020999999833293259001distance_multiplier4001east_angle0.4398229718208313enable_cloud_scroll00gamma1.4800000190734863001glow3.19999933242797850.0010000000474974513-0.399999976158142091haze_density0.25999999046325684001haze_horizon0.620000004768371580.199156001210212710.199156001210212711lightnorm0.425569206476211550.031410921365022659-0.904380559921264650max_y281.70001220703125001preset_num18star_brightness0.5sun_angle3.1101765632629395sunlight_color30.719999969005584720.0599999986588954933 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Silhouetta.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Silhouetta.xml deleted file mode 100644 index dc944d93e..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Silhouetta.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.140000000596046450.140000000596046450.140000000596046450.14000000059604645blue_density0.10490005463361740.2899973988533020.579999983310699460.57999998331069946blue_horizon0.0183986090123653410.0799999982118606570.0505263172090053560.079999998211860657cloud_color0.253124624490737920.253333330154418950.28000000119209290.2800000011920929cloud_pos_density10.509999990463256840.449999988079071040.479999989271163941cloud_pos_density20.50.50.140000000596046451cloud_scale0.32999997501177347001cloud_scroll_rate10.41961754068142910.037481519676703cloud_shadow0.15999999642372131001density_multiplier0.00046999999904073775001distance_multiplier6001east_angle4.4610614776611328enable_cloud_scroll00gamma1.5399999618530273001glow5.79999923706054690.0010000000474974513-1.751haze_density0.91999995708465576001haze_horizon0.109999999403953550.199156001210212710.199156001210212711lightnorm-0.96667182445526123-0.0627906322479248050.248199239373207090max_y947001preset_num18star_brightness0sun_angle3.2044246196746826sunlight_color32.61738491058349612.61738491058349611 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sky%20as%20canvas.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sky%20as%20canvas.xml deleted file mode 100644 index 9bdaa7ef7..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sky%20as%20canvas.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0 - 0.36799997091293335 - 0.91999995708465576 - 0.91999995708465576 - - blue_density - - 0.11999999731779099 - 1 - 0 - 1 - - blue_horizon - - 0.11999999731779099 - 0.079999998211860657 - 0 - 0.14999999105930328 - - cloud_color - - 0 - 0 - 0.039999999105930328 - 0.039999999105930328 - - cloud_pos_density1 - - 0 - 0 - 1 - 1 - - cloud_pos_density2 - - 0 - 0 - 0 - 1 - - cloud_scale - - 0.63999998569488525 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.644780158996582 - 10.423800468444824 - - cloud_shadow - - 0.28999999165534973 - 0 - 0 - 1 - - density_multiplier - - 0.00020999999833293259 - 0 - 0 - 1 - - distance_multiplier - - 9.4000005722045898 - 0 - 0 - 1 - - east_angle - 2.7646017074584961 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.5399999618530273 - 0 - 0 - 1 - - glow - - 0.79999923706054688 - 0.0010000000474974513 - -1.4499999284744263 - 1 - - haze_density - - 0.48999997973442078 - 0 - 0 - 1 - - haze_horizon - - 0.23999999463558197 - 0.13210900127887726 - 0.13210900127887726 - 1 - - lightnorm - - -0.32479292154312134 - 0.47070392966270447 - -0.82033365964889526 - 0 - - max_y - - 211 - 0 - 0 - 1 - - preset_num - 3 - star_brightness - 0.5899999737739563 - sun_angle - 0.49008846282958984 - sunlight_color - - 0.87000000476837158 - 0.059999998658895493 - 0 - 0.28999999165534973 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Slips%20through%20walls%202.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Slips%20through%20walls%202.xml deleted file mode 100644 index 35f1e6a7e..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Slips%20through%20walls%202.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.074200198054313660.0881695970892906190.119999997317790991blue_density0.145225003361701970.399996995925903320.800001978874206541blue_horizon0.107675999402999880.213486999273300170.251cloud_color0.226153999567031860.226153999567031860.226153999567031861cloud_pos_density10.50.511cloud_pos_density20.50.50.1251cloud_scale0.32999998331069946001cloud_scroll_rate10.4994001388549810.01099967956543cloud_shadow0.43999999761581421001density_multiplier0.00046000001020729542001distance_multiplier2.7000000476837158001east_angle2.8902652263641357enable_cloud_scroll00gamma1.6100000143051147001glow0.599999427795410160.0010000000474974513-1.34999990463256841haze_density0.69999998807907104001haze_horizon0.159999996423721310.199156001210212710.199156001210212711lightnorm-0.248199164867401120.062790520489215851-0.966671884059906010max_y562.5001preset_num18star_brightness0sun_angle0.062831856310367584sunlight_color32.15999984741210940.269999980926513673 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Slips%20through%20walls%203.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Slips%20through%20walls%203.xml deleted file mode 100644 index cd9a2b6e4..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Slips%20through%20walls%203.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.0599999986588954930.0881695970892906190.119999997317790990.14999999105930328blue_density0.119999997317790990.399996995925903320.800001978874206541blue_horizon0.0999999940395355220.213486999273300170.251cloud_color0.226153999567031860.226153999567031860.226153999567031861cloud_pos_density10.50.511cloud_pos_density20.50.50.0700000002980232241cloud_scale0.32999998331069946001cloud_scroll_rate10.4994001388549810.01099967956543cloud_shadow0.43999999761581421001density_multiplier0.00082999997539445758001distance_multiplier50.299999237060547001east_angle6.2831854820251465enable_cloud_scroll00gamma1.5399999618530273001glow0.599999427795410160.0010000000474974513-1.34999990463256841haze_density1.0299999713897705001haze_horizon0.159999996423721310.199156001210212710.199156001210212711lightnorm-1.7450054201617604e-0070.0627905204892158510.998026728630065920max_y619.70001220703125001preset_num18star_brightness0sun_angle0.062831856310367584sunlight_color32.15999984741210940.269999980926513673 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Slips%20through%20walls%204.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Slips%20through%20walls%204.xml deleted file mode 100644 index d821b547c..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Slips%20through%20walls%204.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.074200198054313660.0881695970892906190.119999997317790991blue_density0.145225003361701970.399996995925903320.800001978874206541blue_horizon0.107675999402999880.213486999273300170.251cloud_color0.419999986886978150.199999988079071040.0999999940395355220.41999998688697815cloud_pos_density10.519999980926513670.409999996423721310.751cloud_pos_density20.50.50.0399999991059303281cloud_scale0.14999999105930328001cloud_scroll_rate10.4994001388549810.01099967956543cloud_shadow0.43999999761581421001density_multiplier0.00046000001020729542001distance_multiplier2.7000000476837158001east_angle3.6442475318908691enable_cloud_scroll00gamma1.6100000143051147001glow4.00000095367431640.0010000000474974513-1.34999990463256841haze_density0.69999998807907104001haze_horizon0.159999996423721310.199156001210212710.199156001210212711lightnorm0.480803102254867550.062790520489215851-0.874577462673187260max_y562.5001preset_num18star_brightness0sun_angle0.062831856310367584sunlight_color32.15999984741210940.269999980926513673 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Slips%20through%20walls%205.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Slips%20through%20walls%205.xml deleted file mode 100644 index 445c8b015..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Slips%20through%20walls%205.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.074200198054313660.0881695970892906190.119999997317790991blue_density0.145225003361701970.399996995925903320.800001978874206541blue_horizon0.107675999402999880.213486999273300170.251cloud_color0.419999986886978150.199999988079071040.0999999940395355220.41999998688697815cloud_pos_density10.519999980926513670.409999996423721310.751cloud_pos_density20.50.50.0399999991059303281cloud_scale0.14999999105930328001cloud_scroll_rate10.4994001388549810.01099967956543cloud_shadow0.43999999761581421001density_multiplier0.00046000001020729542001distance_multiplier2.7000000476837158001east_angle1.1309733390808105enable_cloud_scroll00gamma1.6100000143051147001glow4.00000095367431640.0010000000474974513-1.34999990463256841haze_density0.69999998807907104001haze_horizon0.159999996423721310.199156001210212710.199156001210212711lightnorm-0.860541641712188720.309016972780227660.404940187931060790max_y562.5001preset_num18star_brightness0sun_angle0.31415924429893494sunlight_color32.15999984741210940.269999980926513673 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Slips%20through%20walls%206.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Slips%20through%20walls%206.xml deleted file mode 100644 index d1494b6dc..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Slips%20through%20walls%206.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.62999999523162842011blue_density00.4999950230121612511blue_horizon00.50.810000002384185790.81000000238418579cloud_color0.399999976158142090.349999994039535520.0999999940395355220.39999997615814209cloud_pos_density10.519999980926513670.409999996423721310.699999988079071041cloud_pos_density20.50.50.0299999993294477461cloud_scale0.14999999105930328001cloud_scroll_rate10.4994001388549810.01099967956543cloud_shadow0.47999998927116394001density_multiplier0.00039999998989515007001distance_multiplier2001east_angle1.382300853729248enable_cloud_scroll00gamma1.6100000143051147001glow0.599999427795410160.0010000000474974513-2.44999980926513671haze_density0.45999997854232788001haze_horizon0.149999991059303280.199156001210212710.199156001210212711lightnorm-0.934210717678070070.309017002582550050.178210139274597170max_y289001preset_num18star_brightness0sun_angle0.31415927410125732sunlight_color31.25999999046325680.269999980926513673 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Slips%20through%20walls.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Slips%20through%20walls.xml deleted file mode 100644 index c5fe6c70d..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Slips%20through%20walls.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.074200198054313660.0881695970892906190.119999997317790991blue_density0.145225003361701970.399996995925903320.800001978874206541blue_horizon0.107675999402999880.213486999273300170.251cloud_color0.226153999567031860.226153999567031860.226153999567031861cloud_pos_density10.50.511cloud_pos_density20.50.50.1251cloud_scale0.32999998331069946001cloud_scroll_rate10.4994001388549810.01099967956543cloud_shadow0.22999998927116394001density_multiplier0.00046000001020729542001distance_multiplier2.7000000476837158001east_angle3.1415927410125732enable_cloud_scroll11gamma1.6100000143051147001glow0.399999618530273440.0010000000474974513-2.20000004768371581haze_density0.69999998807907104001haze_horizon0.159999996423721310.199156001210212710.199156001210212711lightnorm8.7172331575402495e-0080.075640067458152771-0.997135162353515630max_y562.5001preset_num18star_brightness0sun_angle0.075712382793426514sunlight_color31.533 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Southern%20delite.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Southern%20delite.xml deleted file mode 100644 index 28b5a7ee1..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Southern%20delite.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.04374999925494194 - 0.21000000834465027 - 0.20125000178813934 - 0.070000000298023224 - - blue_density - - 0.59999996423721313 - 0.41999998688697815 - 0.34980008006095886 - 0.68000000715255737 - - blue_horizon - - 1.2200000286102295 - 0.81999999284744263 - 0.81999999284744263 - 1.2200000286102295 - - cloud_color - - 0 - 0 - 0.23999999463558197 - 0.23999999463558197 - - cloud_pos_density1 - - 0.53999996185302734 - 0.40999999642372131 - 0.23999999463558197 - 1 - - cloud_pos_density2 - - 0.5 - 0.45999997854232788 - 0.049999997019767761 - 1 - - cloud_scale - - 0.31000000238418579 - 0 - 0 - 1 - - cloud_scroll_rate - - 20 - 20 - - cloud_shadow - - 0.19999998807907104 - 0 - 0 - 1 - - density_multiplier - - 0.00041000000783242285 - 0 - 0 - 1 - - distance_multiplier - - 20.899999618530273 - 0 - 0 - 1 - - east_angle - 3.8955750465393066 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.7599999904632568 - 0 - 0 - 1 - - glow - - 1.0000014305114746 - 0.0010000000474974513 - -0.49999997019767761 - 1 - - haze_density - - 2.2200000286102295 - 0 - 0 - 1 - - haze_horizon - - 0.68999999761581421 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.66898620128631592 - 0.21200692653656006 - 0.71239769458770752 - 1 - - max_y - - 483 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 2 - sun_angle - 6.0695571899414062 - sunlight_color - - 1.3499999046325684 - 0.71999996900558472 - 0.37799999117851257 - 0.44999998807907104 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sparz%20puft.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sparz%20puft.xml deleted file mode 100644 index a127d36ac..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sparz%20puft.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1.4699999094009399 - 1.4699999094009399 - 1.4699999094009399 - 0.48999997973442078 - - blue_density - - 0.50068968534469604 - 0.65999996662139893 - 0.59172403812408447 - 0.32999998331069946 - - blue_horizon - - 0.81999999284744263 - 0.59653842449188232 - 0.4696153998374939 - 0.81999999284744263 - - cloud_color - - 0.22999998927116394 - 0.17000000178813934 - 0.17000000178813934 - 0.22999998927116394 - - cloud_pos_density1 - - 0.89999997615814209 - 0.42999997735023499 - 0.2800000011920929 - 1 - - cloud_pos_density2 - - 0 - 0.19999998807907104 - 0.45999997854232788 - 1 - - cloud_scale - - 0.42999997735023499 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.200000040817258 - 10.010999893335338 - - cloud_shadow - - 0.22999998927116394 - 0 - 0 - 1 - - density_multiplier - - 1.9999999494757503e-005 - 0 - 0 - 1 - - distance_multiplier - - 12.800000190734863 - 0 - 0 - 1 - - east_angle - 0.62831848859786987 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.87999999523162842 - 0 - 0 - 1 - - glow - - 9.8000001907348633 - 0.0010000000474974513 - -0.85000002384185791 - 1 - - haze_density - - 3.0499999523162842 - 0 - 0 - 1 - - haze_horizon - - 0.17999999225139618 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.42594048380851746 - 0.68911367654800415 - -0.58625680208206177 - 0 - - max_y - - 295 - 0 - 0 - 1 - - preset_num - 27 - star_brightness - 1.0799999237060547 - sun_angle - 2.3813273906707764 - sunlight_color - - 1.2599999904632568 - 0.72947371006011963 - 0.84000003337860107 - 1.2599999904632568 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Stay%20stonkin%27.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Stay%20stonkin%27.xml deleted file mode 100644 index 57ce61660..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Stay%20stonkin%27.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.0799999982118606570.28000000119209290.286537349224090580.31000000238418579blue_density0.789999961853027340.3472527265548706100.78999996185302734blue_horizon0.459999978542327880.356337994337081910.343380212783813480.45999997854232788cloud_color0.257777780294418330.4399999976158142100.43999999761581421cloud_pos_density10.479999989271163940.779999971389770510.789999961853027341cloud_pos_density20.50.50.170000001788139341cloud_scale0.26999998092651367001cloud_scroll_rate10.07290822297227410.152564609237686cloud_shadow0.25999999046325684001density_multiplier0.00014000000373926014001distance_multiplier8.1000003814697266001east_angle6.2831854820251465enable_cloud_scroll00gamma1.4699999094009399001glow4.1011770117987680.0010000000397674888-0.494980372517707321haze_density0001haze_horizon0.509999990463256840.199156001210212710.199156001210212711lightnorm7.4445637210374116e-0080.90482699871063232-0.425779372453689580max_y921001preset_num18star_brightness0sun_angle2.0106194019317627sunlight_color1.94999992847442630.719999969005584721.68998980522155761.9499999284744263 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Strummer.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Strummer.xml deleted file mode 100644 index 0dc1eff4b..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Strummer.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.08999999612569809 - 0.072413794696331024 - 0.074999988079071045 - 0.029999999329447746 - - blue_density - - 0 - 0.71999281644821167 - 1.4399999380111694 - 0.71999996900558472 - - blue_horizon - - 0 - 0.32449981570243835 - 0.37999999523162842 - 0.18999999761581421 - - cloud_color - - 0.61000001430511475 - 0 - 0 - 0.61000001430511475 - - cloud_pos_density1 - - 0.53999996185302734 - 0.50999999046325684 - 0.23999999463558197 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.059999998658895493 - 1 - - cloud_scale - - 0.2800000011920929 - 0 - 0 - 1 - - cloud_scroll_rate - - 20 - 20 - - cloud_shadow - - 0.11999999731779099 - 0 - 0 - 1 - - density_multiplier - - 0.00018999999156221747 - 0 - 0 - 1 - - distance_multiplier - - 6.0999999046325684 - 0 - 0 - 1 - - east_angle - 2.3876104354858398 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.7599999904632568 - 0 - 0 - 1 - - glow - - 3.600001335144043 - 0.0010000000474974513 - -0.49999997019767761 - 1 - - haze_density - - 2.2400000095367432 - 0 - 0 - 1 - - haze_horizon - - 0.40999999642372131 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.67160260677337646 - 0.19354972243309021 - -0.71518415212631226 - 1 - - max_y - - 188 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.3199999332427979 - sun_angle - 3.3363716602325439 - sunlight_color - - 1.9499999284744263 - 0.55714249610900879 - 0.29250001907348633 - 0.64999997615814209 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Study%20vessels.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Study%20vessels.xml deleted file mode 100644 index 00471721f..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Study%20vessels.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.53999996185302734000.53999996185302734blue_density0.0862399935722351070.246400013566017150.879999995231628420.87999999523162842blue_horizon0.105600006878376010.308829843997955320.879999995231628420.87999999523162842cloud_color0.477749973535537720.770249962806701660.779999971389770510.77999997138977051cloud_pos_density10.489999979734420780.50.359999984502792361cloud_pos_density20.340000003576278690.429999977350234990.370000004768371581cloud_scale0.28999999165534973001cloud_scroll_rate9.93000033925018510.199999625297616cloud_shadow0.35999998450279236001density_multiplier0.00016999999934341758001distance_multiplier29.5001east_angle1.8221237659454346enable_cloud_scroll00gamma1.4800000190734863001glow11.2000007629394530.0010000000474974513-2.39999985694885251haze_density0.5899999737739563001haze_horizon0.489999979734420780.199156001210212710.199156001210212711lightnorm0.968105196952819820.0314109213650226590.248567193746566770max_y450.70001220703125001preset_num18star_brightness0.68999999761581421sun_angle3.1101765632629395sunlight_color2.00999975204467771.38926446437835691.00499987602233890.66999995708465576 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sunriser.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sunriser.xml deleted file mode 100644 index a3d0f7789..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sunriser.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0 - 0.29999998211860657 - 0.066666655242443085 - 0.099999994039535522 - - blue_density - - 0 - 0.60697674751281738 - 0.89999997615814209 - 0.44999998807907104 - - blue_horizon - - 1.0199999809265137 - 0.039999999105930328 - 0.41999998688697815 - 1.0199999809265137 - - cloud_color - - 0.15839998424053192 - 0.23999999463558197 - 0.53999996185302734 - 0.53999996185302734 - - cloud_pos_density1 - - 0.66999995708465576 - 0.96999996900558472 - 0.50999999046325684 - 1 - - cloud_pos_density2 - - 0.31000000238418579 - 0.19999998807907104 - 0.049999997019767761 - 1 - - cloud_scale - - 0.25999999046325684 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.993240904292179 - 10.179008409703329 - - cloud_shadow - - 0.42999997735023499 - 0 - 0 - 1 - - density_multiplier - - 0.00026000000070780516 - 0 - 0 - 1 - - distance_multiplier - - 39.900001525878906 - 0 - 0 - 1 - - east_angle - 6.031857967376709 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.2799999713897705 - 0 - 0 - 1 - - glow - - 4.6000003814697266 - 0.0010000000474974513 - -0.69999998807907104 - 1 - - haze_density - - 0.26999998092651367 - 0 - 0 - 1 - - haze_horizon - - 0.14999999105930328 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.24485112726688385 - 0.17502307891845703 - 0.9536324143409729 - 0 - - max_y - - 698 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 0.90999996662139893 - sun_angle - 0.17592920362949371 - sunlight_color - - 1.6500000953674316 - 1.0199999809265137 - 0.17999999225139618 - 0.55000001192092896 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sunset%20pinker.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sunset%20pinker.xml deleted file mode 100644 index 8443eecad..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sunset%20pinker.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1.2899999618530273 - 0.80999994277954102 - 0.80999994277954102 - 1.2899999618530273 - - blue_density - - 0.31999999284744263 - 0.39999699592590332 - 0.80000197887420654 - 1 - - blue_horizon - - 0.43999999761581421 - 0.19569641351699829 - 0.2291666716337204 - 0.2199999988079071 - - cloud_color - - 0.17000000178813934 - 0.17000000178813934 - 0.16019243001937866 - 0.17000000178813934 - - cloud_pos_density1 - - 0.89999997615814209 - 0.94999998807907104 - 0.81000000238418579 - 1 - - cloud_pos_density2 - - 0.26999998092651367 - 0.18999999761581421 - 0 - 1 - - cloud_scale - - 0.41999998688697815 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.29999998211860657 - 0 - 0 - 1 - - density_multiplier - - 0.00046000001020729542 - 0 - 0 - 1 - - distance_multiplier - - 1 - 0 - 0 - 1 - - east_angle - 0.062831856310367584 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.0799999237060547 - 0 - 0 - 1 - - glow - - 10.999999046325684 - 0.0010000000474974513 - -0.74999994039535522 - 1 - - haze_density - - 0.69999998807907104 - 0 - 0 - 1 - - haze_horizon - - 0.15999999642372131 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.06269015371799469 - 0.056518375873565674 - -0.99643146991729736 - 0 - - max_y - - 562.5 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 2 - sun_angle - 3.0850441455841064 - sunlight_color - - 2.5199999809265137 - 2.5199999809265137 - 2.5199999809265137 - 0.8399999737739563 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Teaching.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Teaching.xml deleted file mode 100644 index 615c38ebb..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Teaching.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.2199999988079071 - 0.28309014439582825 - 0.35728436708450317 - 0.70187348127365112 - - blue_density - - 0.11436444520950317 - 0.31499692797660828 - 0.62999999523162842 - 0.62999999523162842 - - blue_horizon - - 0.29525011777877808 - 0.58538740873336792 - 0.81000000238418579 - 0.81000000238418579 - - cloud_color - - 0.34999999403953552 - 0.34999999403953552 - 0.34999999403953552 - 0.34999999403953552 - - cloud_pos_density1 - - 0.5 - 0.5 - 0.65999996662139893 - 1 - - cloud_pos_density2 - - 0.38999998569488525 - 0.5 - 0.059999998658895493 - 1 - - cloud_scale - - 0.34000000357627869 - 0 - 0 - 0.99999997019767761 - - cloud_scroll_rate - - 10.499399772082484 - 10.010999472566027 - - cloud_shadow - - 0.32999998331069946 - 0 - 0 - 0.99999997019767761 - - density_multiplier - - 0.00015999999595806003 - 0 - 0 - 0.99999997019767761 - - distance_multiplier - - 11.40000057220459 - 0 - 0 - 0.99999997019767761 - - east_angle - 0 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.1499999761581421 - 0 - 0 - 0.99999997019767761 - - glow - - 17.399999618530273 - 0.0010000000474974513 - -0.39999997615814209 - 1 - - haze_density - - 1.1799999475479126 - 0 - 0 - 1 - - haze_horizon - - 0.18999999761581421 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0 - 0.34464260935783386 - -0.93873399496078491 - 0 - - max_y - - 711 - 0 - 0 - 0.99999997019767761 - - preset_num - 18 - star_brightness - 0 - sun_angle - 2.7897346019744873 - sunlight_color - - 2.2799999713897705 - 2.25 - 2.0241553783416748 - 2.2799999713897705 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Teak%20weak.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Teak%20weak.xml deleted file mode 100644 index c865b3949..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Teak%20weak.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.42000001668930054 - 0 - 0 - 0.42000001668930054 - - blue_density - - 0.019999999552965164 - 0.059999998658895493 - 0.019999999552965164 - 0.059999998658895493 - - blue_horizon - - 0.89999997615814209 - 0.71999996900558472 - 0.53999996185302734 - 1.0799999237060547 - - cloud_color - - 0 - 0 - 0 - 0 - - cloud_pos_density1 - - 0.47999998927116394 - 0.23999999463558197 - 0.34999999403953552 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.17000000178813934 - 1 - - cloud_scale - - 0.26999998092651367 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.072908222972274 - 10.152564609237686 - - cloud_shadow - - 0.25999999046325684 - 0 - 0 - 1 - - density_multiplier - - 0.00018999999156221747 - 0 - 0 - 1 - - distance_multiplier - - 9.5 - 0 - 0 - 1 - - east_angle - 0.8796459436416626 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.0799999237060547 - 0 - 0 - 1 - - glow - - 4.101177011798768 - 0.0010000000397674888 - -0.49498037251770732 - 1 - - haze_density - - 0 - 0 - 0 - 1 - - haze_horizon - - 0.52999997138977051 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.43309280276298523 - 0.82708048820495605 - -0.35828551650047302 - 0 - - max_y - - 993 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 2.1676990985870361 - sunlight_color - - 1.9499999284744263 - 1.3799998760223389 - 1.6899898052215576 - 1.9499999284744263 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Terpsa%20bonne.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Terpsa%20bonne.xml deleted file mode 100644 index a69decc33..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Terpsa%20bonne.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1.0799999237060547 - 0.26999998092651367 - 0.43636363744735718 - 1.0799999237060547 - - blue_density - - 1.1399999856948853 - 0.35999998450279236 - 1.1799999475479126 - 1.1799999475479126 - - blue_horizon - - 0.39999997615814209 - 0.32941171526908875 - 0.28235292434692383 - 0.19999998807907104 - - cloud_color - - 0.049999997019767761 - 0.42999997735023499 - 0 - 0.42999997735023499 - - cloud_pos_density1 - - 0.89999997615814209 - 0.42999997735023499 - 0.68000000715255737 - 1 - - cloud_pos_density2 - - 1 - 0.2800000011920929 - 0.0099999997764825821 - 1 - - cloud_scale - - 0.34999999403953552 - 0 - 0 - 1 - - cloud_scroll_rate - - 7.4499998092651367 - 10.01099967956543 - - cloud_shadow - - 0.38999998569488525 - 0 - 0 - 1 - - density_multiplier - - 0.00054999999701976776 - 0 - 0 - 1 - - distance_multiplier - - 43.200000762939453 - 0 - 0 - 1 - - east_angle - 3.7070791721343994 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.0099999904632568 - 0 - 0 - 1 - - glow - - 10.199999809265137 - 0.0010000000474974513 - -0.59999996423721313 - 1 - - haze_density - - 0.69999998807907104 - 0 - 0 - 1 - - haze_horizon - - 0.19999998807907104 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.5206262469291687 - 0.23649881780147552 - 0.82037591934204102 - 0 - - max_y - - 1262 - 0 - 0 - 1 - - preset_num - 27 - star_brightness - 0.17999999225139618 - sun_angle - 2.9028317928314209 - sunlight_color - - 1.6863635778427124 - 1.6545454263687134 - 2.0999999046325684 - 2.0999999046325684 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20That%20spells%20moon%202.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20That%20spells%20moon%202.xml deleted file mode 100644 index b9975e4dd..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20That%20spells%20moon%202.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0000blue_density00.424285709857940670.539999961853027340.53999996185302734blue_horizon0.438455134630203250.294186383485794070.560000002384185790.56000000238418579cloud_color0.0499999970197677610.0399999991059303280.0499999970197677610.049999997019767761cloud_pos_density10.699999988079071040.349999994039535520.799999952316284181cloud_pos_density20.21999999880790710.849999964237213130.170000001788139341cloud_scale0.47999998927116394001cloud_scroll_rate10.45399374929490910.026071512513319cloud_shadow0.2199999988079071001density_multiplier1.9999999494757503e-005001distance_multiplier37.600002288818359001east_angle1.0053097009658813enable_cloud_scroll00gamma0.93999999761581421001glow16.800001144409180.0010000000474974513-1.70000004768371581haze_density1.2599999904632568001haze_horizon0.359999984502792360.199156001210212710.199156001210212711lightnorm0.739890158176422120.48175376653671265-0.469548523426055910max_y309.89999389648437001preset_num18star_brightness1.0799999237060547sun_angle2.6389377117156982sunlight_color1.40999996662139891.66216289997100832.12999987602233892.1299998760223389 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20That%20spells%20moon%203.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20That%20spells%20moon%203.xml deleted file mode 100644 index 60cedf795..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20That%20spells%20moon%203.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.149999991059303280.149999991059303280.149999991059303280.14999999105930328blue_density00.424285709857940670.539999961853027340.53999996185302734blue_horizon0.438455134630203250.294186383485794070.560000002384185790.56000000238418579cloud_color0.0499999970197677610.0399999991059303280.0499999970197677610.049999997019767761cloud_pos_density10.699999988079071040.349999994039535520.799999952316284181cloud_pos_density20.21999999880790710.849999964237213130.170000001788139341cloud_scale0.47999998927116394001cloud_scroll_rate10.45399374929490910.026071512513319cloud_shadow0.2800000011920929001density_multiplier1.9999999494757503e-005001distance_multiplier37.600002288818359001east_angle1.0681415796279907enable_cloud_scroll00gamma1.1399999856948853001glow11.4000015258789060.0010000000474974513-1.751haze_density1.2599999904632568001haze_horizon0.359999984502792360.199156001210212710.199156001210212711lightnorm0.8147694468498230.36812439560890198-0.44792321324348450max_y309.89999389648437001preset_num18star_brightness1.0799999237060547sun_angle2.7646017074584961sunlight_color1.17169046401977541.38123393058776861.76999998092651370.5899999737739563 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20That%20spells%20moon%204.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20That%20spells%20moon%204.xml deleted file mode 100644 index 7be327071..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20That%20spells%20moon%204.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.449999988079071040.28000000119209290.149999991059303280.45999997854232788blue_density00.424285709857940670.539999961853027340.53999996185302734blue_horizon0.438455134630203250.294186383485794070.560000002384185790.56000000238418579cloud_color0.0499999970197677610.0399999991059303280.0499999970197677610.049999997019767761cloud_pos_density10.699999988079071040.349999994039535520.799999952316284181cloud_pos_density20.21999999880790710.849999964237213130.170000001788139341cloud_scale0.47999998927116394001cloud_scroll_rate10.45399374929490910.026071512513319cloud_shadow0.2800000011920929001density_multiplier1.9999999494757503e-005001distance_multiplier37.600002288818359001east_angle3.2672562599182129enable_cloud_scroll00gamma1.2799999713897705001glow0.199999809265136720.0010000000474974513-0.449999988079071041haze_density1.2599999904632568001haze_horizon0.359999984502792360.199156001210212710.199156001210212711lightnorm-0.117923535406589510.338737964630126950.933461666107177730max_y309.89999389648437001preset_num18star_brightness1.0799999237060547sun_angle2.7960174083709717sunlight_color0.959999978542327881.43999993801116942.12999987602233892.4900000095367432 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20That%20spells%20moon.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20That%20spells%20moon.xml deleted file mode 100644 index 002c57f50..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20That%20spells%20moon.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0000blue_density00.424285709857940670.539999961853027340.53999996185302734blue_horizon0.438455134630203250.294186383485794070.560000002384185790.56000000238418579cloud_color0.0499999970197677610.0399999991059303280.0499999970197677610.049999997019767761cloud_pos_density10.699999988079071040.349999994039535520.799999952316284181cloud_pos_density20.21999999880790710.849999964237213130.170000001788139341cloud_scale0.47999998927116394001cloud_scroll_rate10.45399374929490910.026071512513319cloud_shadow0.2199999988079071001density_multiplier1.9999999494757503e-005001distance_multiplier37.600002288818359001east_angle1.0053097009658813enable_cloud_scroll00gamma0.93999999761581421001glow4.00000095367431640.0010000000474974513-1.70000004768371581haze_density1.2599999904632568001haze_horizon0.359999984502792360.199156001210212710.199156001210212711lightnorm0.698327302932739260.56208330392837524-0.44317191839218140max_y309.89999389648437001preset_num18star_brightness1.0799999237060547sun_angle2.5446901321411133sunlight_color1.40999996662139891.66216289997100832.12999987602233892.1299998760223389 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20The%20pink%20tower.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20The%20pink%20tower.xml deleted file mode 100644 index 0060336fc..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20The%20pink%20tower.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.333484858274459840.7099999785423278800.70999997854232788blue_density00.408571422100067140.519999980926513670.77999997138977051blue_horizon0.399307370185852050.267919659614562990.509999990463256840.50999999046325684cloud_color0.0968749895691871640.269999980926513670.489999979734420780.48999997973442078cloud_pos_density10.849999964237213130.509999990463256840.751cloud_pos_density20.319999992847442630.489999979734420780.140000000596046451cloud_scale0.44999998807907104001cloud_scroll_rate10.45399374929490910.026071512513319cloud_shadow0.25999999046325684001density_multiplier0.00013999998918734491001distance_multiplier91.900001525878906001east_angle6.2831854820251465enable_cloud_scroll00gamma0.81000000238418579001glow2.00000047683715820.0010000000474974513-0.199999988079071041haze_density3.9199998378753662001haze_horizon0.28000000119209290.199156001210212710.199156001210212711lightnorm1.1562744361981458e-0070.75011110305786133-0.661311864852905270max_y338001preset_num18star_brightness1.5099999904632568sun_angle2.2933626174926758sunlight_color1.79999995231628420.897272467613220211.76249992847442630.59999996423721313 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20This%20alien%20life.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20This%20alien%20life.xml deleted file mode 100644 index 203dc2395..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20This%20alien%20life.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0 - 0.39999997615814209 - 1 - 1 - - blue_density - - 0 - 1 - 0 - 1 - - blue_horizon - - 0.59999996423721313 - 1 - 0 - 1 - - cloud_color - - 0 - 0 - 0.19999998807907104 - 0.19999998807907104 - - cloud_pos_density1 - - 0.25999999046325684 - 0.51999998092651367 - 0.38999998569488525 - 1 - - cloud_pos_density2 - - 0.25999999046325684 - 0.51999998092651367 - 0.18999999761581421 - 1 - - cloud_scale - - 0.41999998688697815 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.644780158996582 - 10.423800468444824 - - cloud_shadow - - 0.32999998331069946 - 0 - 0 - 1 - - density_multiplier - - 0.00011000000085914508 - 0 - 0 - 1 - - distance_multiplier - - 11.40000057220459 - 0 - 0 - 1 - - east_angle - 3.1415927410125732 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.5999999046325684 - 0 - 0 - 1 - - glow - - 0.19999980926513672 - 0.0010000000474974513 - -1.25 - 1 - - haze_density - - 0.79999995231628418 - 0 - 0 - 1 - - haze_horizon - - 0.34000000357627869 - 0.13210900127887726 - 0.13210900127887726 - 1 - - lightnorm - - -8.7250271008088021e-008 - 0.062790460884571075 - 0.99802672863006592 - 0 - - max_y - - 579 - 0 - 0 - 1 - - preset_num - 3 - star_brightness - 0 - sun_angle - 3.0787608623504639 - sunlight_color - - 0 - 0.029999999329447746 - 0.029999999329447746 - 0.029999999329447746 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Touchness.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Touchness.xml deleted file mode 100644 index ec5e9ea9f..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Touchness.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 1.8600000143051147 - 0.85764694213867188 - 0.85764694213867188 - 1.8600000143051147 - - blue_density - - 0.51999998092651367 - 0.51999998092651367 - 0.31999999284744263 - 0.51999998092651367 - - blue_horizon - - 1.7599999904632568 - 0.72000002861022949 - 0.34000003337860107 - 0.87999999523162842 - - cloud_color - - 0.44999998807907104 - 0.19999998807907104 - 0.25 - 0.44999998807907104 - - cloud_pos_density1 - - 1 - 1 - 1 - 1 - - cloud_pos_density2 - - 1 - 1 - 1 - 1 - - cloud_scale - - 0.22999998927116394 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.71999996900558472 - 0 - 0 - 1 - - density_multiplier - - 0.00022000000171829015 - 0 - 0 - 1 - - distance_multiplier - - 10.100000381469727 - 0 - 0 - 1 - - east_angle - 3.0787608623504639 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.87999999523162842 - 0 - 0 - 1 - - glow - - 12.200000762939453 - 0.0010000000474974513 - -0.94999998807907104 - 1 - - haze_density - - 1.8600000143051147 - 0 - 0 - 1 - - haze_horizon - - 0.38999998569488525 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.016758890822529793 - 0.96372371912002563 - -0.26637521386146545 - 0 - - max_y - - 940 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 0.2199999988079071 - sun_angle - 1.3006194829940796 - sunlight_color - - 1.0385869741439819 - 2.3739135265350342 - 2.7300000190734863 - 0.90999996662139893 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Turtle%20island%20night.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Turtle%20island%20night.xml deleted file mode 100644 index bf856a972..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Turtle%20island%20night.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.259999990463256840.0299999993294477460.620000004768371580.62000000476837158blue_density0.0799999982118606570.119999997317790990.599999964237213130.59999996423721313blue_horizon0.569999992847442630.140000000596046450.370000004768371580.56999999284744263cloud_color0.429999977350234990.4799999892711639411cloud_pos_density10.620000004768371580.50.799999952316284181cloud_pos_density20.560000002384185790.50.129999995231628421cloud_scale0.29999998211860657001cloud_scroll_rate10.2463061592461610.095008669949948cloud_shadow0.25999999046325684001density_multiplier0.00021999998716637492001distance_multiplier6001east_angle3.6442475318908691enable_cloud_scroll00gamma1.5399999618530273001glow6.00000143051147460.0010000000474974513-0.550000011920928961haze_density0.37999999523162842001haze_horizon0.289999991655349730.199156001210212710.199156001210212711lightnorm-0.48080307245254517-0.0627906322479248050.874577462673187260max_y253.5001preset_num18star_brightness0sun_angle3.2044246196746826sunlight_color2.18999981880187991.34999990463256842.12999987602233892.1899998188018799 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Turtle%20island.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Turtle%20island.xml deleted file mode 100644 index 3d73218f3..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Turtle%20island.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.202638760209083560.204902008175849910.550000011920928960.55000001192092896blue_density0.0931767895817756650.259998291730880740.519999980926513670.51999998092651367blue_horizon0.085551768541336060.207604348659515380.310000002384185790.31000000238418579cloud_color0.387880921363830570.476779490709304810.939999997615814210.93999999761581421cloud_pos_density10.539999961853027340.50.779999971389770511cloud_pos_density20.479999989271163940.50.109999999403953551cloud_scale0.29999998211860657001cloud_scroll_rate10.2463061592461610.095008669949948cloud_shadow0.37999999523162842001density_multiplier0.0002899999963119626001distance_multiplier8.1000003814697266001east_angle3.6442475318908691enable_cloud_scroll00gamma1.5399999618530273001glow6.00000143051147460.0010000000474974513-0.550000011920928961haze_density0.5899999737739563001haze_horizon0.209999993443489070.199156001210212710.199156001210212711lightnorm0.406758129596710210.53582680225372314-0.739890158176422120max_y253.5001preset_num18star_brightness0sun_angle0.56548666954040527sunlight_color1.6199998855590821.6199998855590821.6199998855590820.53999996185302734 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Tusken%20suns.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Tusken%20suns.xml deleted file mode 100644 index e4b7f68d8..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Tusken%20suns.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.149999991059303280.1062839999794960.144654005765914920.14999999105930328blue_density0.145225003361701970.399996995925903320.800001978874206541blue_horizon0.129999995231628420.300000011920928960.351310014724731451cloud_color0.829999983310699460.419999986886978150.719999969005584720.82999998331069946cloud_pos_density10.50.50.689999997615814211cloud_pos_density20.50.50.1251cloud_scale0.38999998569488525001cloud_scroll_rate10.4994001388549810.01099967956543cloud_shadow0.32999998331069946001density_multiplier0.0007599999662488699001distance_multiplier18.100000381469727001east_angle5.5920348167419434enable_cloud_scroll00gamma1.6100000143051147001glow4.60000038146972660.0010000000474974513-0.649999976158142091haze_density0.35999998450279236001haze_horizon0.349999994039535520.199156001210212710.199156001210212711lightnorm0.629576325416564940.156434461474418640.761026859283447270max_y1211001preset_num21star_brightness0.059999998658895493sun_angle0.15707962214946747sunlight_color1.52999997138977051.35000002384185791.35000002384185791.5299999713897705 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Twisted%20pixels.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Twisted%20pixels.xml deleted file mode 100644 index 0ab7d7598..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Twisted%20pixels.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.259999990463256840.259999990463256840.259999990463256840.25999999046325684blue_density0.164500012993812560.46999999880790710.939999997615814210.93999999761581421blue_horizon0.0552918054163455960.161702245473861690.340000003576278690.34000000357627869cloud_color0.229999989271163940.379999995231628420.489999979734420780.48999997973442078cloud_pos_density10.799999952316284180.949999988079071040.879999995231628421cloud_pos_density20.659999966621398930.610000014305114750.0399999991059303281cloud_scale0.2199999988079071001cloud_scroll_rate9.930000305175781310.199999809265137cloud_shadow0.2800000011920929001density_multiplier9.9999997473787516e-005001distance_multiplier2001east_angle2.3247785568237305enable_cloud_scroll00gamma2.0099999904632568001glow16.4000015258789060.0010000000474974513-1.29999995231628421haze_density0.14999999105930328001haze_horizon0.529999971389770510.199156001210212710.199156001210212711lightnorm-0.725733458995819090.094108313322067261-0.681509077548980710max_y873.20001220703125001preset_num24star_brightness0.31999999284744263sun_angle0.094247780740261078sunlight_color1.13999998569488530.777272760868072510.751914918422698970.37999999523162842 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Un%20Peinture.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Un%20Peinture.xml deleted file mode 100644 index d551e7158..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Un%20Peinture.xml +++ /dev/null @@ -1 +0,0 @@ -ambient00.05999999865889549300.059999998658895493blue_density00.0999999940395355220.329999983310699460.32999998331069946blue_horizon0.029999999329447746011cloud_color0.819999992847442630.189999997615814210.0399999991059303280.81999999284744263cloud_pos_density10.740000009536743160.939999997615814210.209999993443489071cloud_pos_density20.659999966621398930.529999971389770510.00999999977648258211cloud_scale0.14000000059604645001cloud_scroll_rate2020cloud_shadow0.37999999523162842001density_multiplier0.00018000000272877514001distance_multiplier6.7000002861022949001east_angle2.3247785568237305enable_cloud_scroll00gamma1.9499999284744263001glow17.3999996185302730.0010000000474974513-0.649999976158142091haze_density0.40999999642372131001haze_horizon0.170000001788139340.199156001210212710.199156001210212711lightnorm-0.723220467567443850.12533323466777802-0.679149270057678220max_y263001preset_num24star_brightness0.39999997615814209sun_angle0.12566371262073517sunlight_color1.58999991416931151.52999997138977050.539999961853027341.5899999141693115 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Unorthodox%20happy.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Unorthodox%20happy.xml deleted file mode 100644 index 3a839fd1c..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Unorthodox%20happy.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.84000003337860107 - 0 - 0 - 0.84000003337860107 - - blue_density - - 0.56000000238418579 - 0.2800000011920929 - 1 - 1 - - blue_horizon - - 0.14571428298950195 - 0.77714276313781738 - 1.0199999809265137 - 0.50999999046325684 - - cloud_color - - 0.93000000715255737 - 0.79000002145767212 - 0.90999996662139893 - 0.93000000715255737 - - cloud_pos_density1 - - 0.48999997973442078 - 0.5 - 0.23999999463558197 - 1 - - cloud_pos_density2 - - 0.38999998569488525 - 0.5 - 0.12999999523162842 - 1 - - cloud_scale - - 0.34000000357627869 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.9300004821488983 - 10.199999788063906 - - cloud_shadow - - 0.32999998331069946 - 0 - 0 - 1 - - density_multiplier - - 0.0002899999963119626 - 0 - 0 - 1 - - distance_multiplier - - 7.4000000953674316 - 0 - 0 - 1 - - east_angle - 3.2044246196746826 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.5399999618530273 - 0 - 0 - 1 - - glow - - 6.0000014305114746 - 0.0010000000474974513 - -0.49999997019767761 - 1 - - haze_density - - 0.48999997973442078 - 0 - 0 - 1 - - haze_horizon - - 0.29999998211860657 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.06277947872877121 - 0.01884840801358223 - 0.99784940481185913 - 0 - - max_y - - 886 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.5699999332427979 - sun_angle - 3.1227431297302246 - sunlight_color - - 1.8899999856948853 - 1.4099999666213989 - 1.5899999141693115 - 1.9199999570846558 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Use%20on%20fine%20ships.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Use%20on%20fine%20ships.xml deleted file mode 100644 index dc2295470..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Use%20on%20fine%20ships.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.41999998688697815 - 0.088846154510974884 - 0.12923076748847961 - 0.41999998688697815 - - blue_density - - 0.17000000178813934 - 0.38499599695205688 - 0.93999999761581421 - 0.93999999761581421 - - blue_horizon - - 0.87999999523162842 - 0.18999999761581421 - 0.15999999642372131 - 0.87999999523162842 - - cloud_color - - 0.62999999523162842 - 0.59500002861022949 - 0.26384636759757996 - 0.62999999523162842 - - cloud_pos_density1 - - 0.5 - 0.62000000476837158 - 0.34999999403953552 - 1 - - cloud_pos_density2 - - 0.29999998211860657 - 0.48999997973442078 - 0.059999998658895493 - 1 - - cloud_scale - - 0.20999999344348907 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.739999771118164 - 10.600000381469727 - - cloud_shadow - - 0.37000000476837158 - 0 - 0 - 1 - - density_multiplier - - 0.00015999999595806003 - 0 - 0 - 1 - - distance_multiplier - - 4.7000002861022949 - 0 - 0 - 1 - - east_angle - 5.5292034149169922 - enable_cloud_scroll - - 0 - 0 - - gamma - - 2.119999885559082 - 0 - 0 - 1 - - glow - - 15.199999809265137 - 0.0010000000474974513 - -0.74999994039535522 - 1 - - haze_density - - 0.91999995708465576 - 0 - 0 - 1 - - haze_horizon - - 0.079999998211860657 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.6810905933380127 - 0.10036152601242065 - -0.72528833150863647 - 0 - - max_y - - 342 - 0 - 0 - 1 - - preset_num - 28 - star_brightness - 1.7599999904632568 - sun_angle - 3.0410618782043457 - sunlight_color - - 0.37187513709068298 - 0.74375027418136597 - 2.5499999523162842 - 0.84999996423721313 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Use%20with%20full%20bright.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Use%20with%20full%20bright.xml deleted file mode 100644 index e340a370b..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Use%20with%20full%20bright.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0 - 0 - 0 - 0 - - blue_density - - 0 - 0 - 0 - 0 - - blue_horizon - - 0 - 0 - 0 - 0 - - cloud_color - - 0 - 0 - 0 - 0 - - cloud_pos_density1 - - 0 - 0 - 0 - 1 - - cloud_pos_density2 - - 0 - 0 - 0 - 1 - - cloud_scale - - 0.0099999997764825821 - 0 - 0 - 1 - - cloud_scroll_rate - - 10 - 10 - - cloud_shadow - - 0 - 0 - 0 - 1 - - density_multiplier - - 0.00089999998454004526 - 0 - 0 - 1 - - distance_multiplier - - 100 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 0 - 0 - - gamma - - 10 - 0 - 0 - 1 - - glow - - 20 - 0.0013735899701714516 - 0 - 1 - - haze_density - - 0 - 0 - 0 - 1 - - haze_horizon - - 0 - 0.13210900127887726 - 0.13210900127887726 - 1 - - lightnorm - - 0 - 0 - 1 - 0 - - max_y - - 0 - 0 - 0 - 1 - - preset_num - 5 - star_brightness - 0 - sun_angle - 0 - sunlight_color - - 0 - 0 - 0 - 0 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Variationz.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Variationz.xml deleted file mode 100644 index 347f6e2fc..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Variationz.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.50.0999999940395355220.114999994635581970.5blue_density00.707142829895019530.661874890327453610.76499995589256287blue_horizon0.424227565526962280.217093192040920260.28000000119209290.54999998211860657cloud_color0.224999986588954930.24999998882412910.264999993145465850.26499999314546585cloud_pos_density10.620000004768371580.370000004768371580.794999957084655761cloud_pos_density20.149999991059303280.849999964237213130.144999999552965161cloud_scale0.39499999582767487001cloud_scroll_rate10.47669685299342710.018535728290772cloud_shadow0.15999999642372131001density_multiplier0.00010499999552848749001distance_multiplier39.250001907348633001east_angle2.1991148591041565enable_cloud_scroll00gamma0.82999998331069946001glow5.90000033378601070.0010000000474974513-1.3751haze_density1.4249999523162842001haze_horizon0.289999991655349730.199156001210212710.199156001210212711lightnorm0.780343413352966310.263872832059860230.566952586174011230max_y239.44999694824219001preset_num18star_brightness0.76499998569488525sun_angle2.8745573759078979sunlight_color2.20499998331069951.8360813260078431.06499993801116942.5649999380111694 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Vehicle%20Sandbox.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Vehicle%20Sandbox.xml deleted file mode 100644 index c5b090d13..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Vehicle%20Sandbox.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.56250005960464478 - 0.26250001788139343 - 0.75 - 0.25 - - blue_density - - 0 - 0.40999585390090942 - 0.81999999284744263 - 0.85999995470046997 - - blue_horizon - - 0.43999999761581421 - 0.22910800576210022 - 0.26829266548156738 - 0.2199999988079071 - - cloud_color - - 0.23999999463558197 - 0.4699999988079071 - 0.31999999284744263 - 0.4699999988079071 - - cloud_pos_density1 - - 0.48999997973442078 - 0.50999999046325684 - 0.74000000953674316 - 1 - - cloud_pos_density2 - - 0.44999998807907104 - 0.5 - 0.14000000059604645 - 1 - - cloud_scale - - 0.32999998331069946 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.37999999523162842 - 0 - 0 - 1 - - density_multiplier - - 0.00035999997635371983 - 0 - 0 - 1 - - distance_multiplier - - 2 - 0 - 0 - 1 - - east_angle - 0.12566371262073517 - enable_cloud_scroll - - 0 - 0 - - gamma - - 2.0299999713897705 - 0 - 0 - 1 - - glow - - 12 - 0.0010000000474974513 - -0.59999996423721313 - 1 - - haze_density - - 0.77999997138977051 - 0 - 0 - 1 - - haze_horizon - - 0.15999999642372131 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.12524418532848358 - 0.037689968943595886 - -0.9914097785949707 - 0 - - max_y - - 591 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.0099999904632568 - sun_angle - 3.1038937568664551 - sunlight_color - - 2.5799999237060547 - 2.4411697387695313 - 2.4411697387695313 - 0.85999995470046997 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Vision%20of%20something.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Vision%20of%20something.xml deleted file mode 100644 index a641678c6..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Vision%20of%20something.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0 - 0 - 0 - 0 - - blue_density - - 0.049999997019767761 - 0.29999998211860657 - 1 - 1 - - blue_horizon - - 0.11999999731779099 - 0.67000001668930054 - 1 - 1 - - cloud_color - - 0.55000001192092896 - 0 - 0 - 0.55000001192092896 - - cloud_pos_density1 - - 0.64999997615814209 - 0.81000000238418579 - 0.18999999761581421 - 1 - - cloud_pos_density2 - - 0.47999998927116394 - 0.68999999761581421 - 0.14999999105930328 - 1 - - cloud_scale - - 0.37000000476837158 - 0 - 0 - 1 - - cloud_scroll_rate - - 20 - 20 - - cloud_shadow - - 0.34999999403953552 - 0 - 0 - 1 - - density_multiplier - - 0.00018999999156221747 - 0 - 0 - 1 - - distance_multiplier - - 16.100000381469727 - 0 - 0 - 1 - - east_angle - 3.7070791721343994 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.6100000143051147 - 0 - 0 - 1 - - glow - - 2.4000000953674316 - 0.0010000000474974513 - -0.85000002384185791 - 1 - - haze_density - - 0.099999994039535522 - 0 - 0 - 1 - - haze_horizon - - 0.23999999463558197 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.53582668304443359 - 0 - 0.84432798624038696 - 0 - - max_y - - 732.4000244140625 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0.37000000476837158 - sun_angle - 3.1541593074798584 - sunlight_color - - 1.6800000667572021 - 1.3160001039505005 - 0.95200002193450928 - 0.56000000238418579 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Watermelon%2Dish.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Watermelon%2Dish.xml deleted file mode 100644 index 8402067d1..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Watermelon%2Dish.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.53224128484725952 - 0.62999999523162842 - 0.38017240166664124 - 0.62999999523162842 - - blue_density - - 0.85999995470046997 - 0.69186055660247803 - 0.31450000405311584 - 0.85999995470046997 - - blue_horizon - - 0.84999996423721313 - 0.68000000715255737 - 0.37475556135177612 - 0.84999996423721313 - - cloud_color - - 0.59999996423721313 - 0.28999936580657959 - 0.49000000953674316 - 0.59999996423721313 - - cloud_pos_density1 - - 0.70999997854232788 - 0.78999996185302734 - 0.68000000715255737 - 1 - - cloud_pos_density2 - - 0.38999998569488525 - 0.37999999523162842 - 0 - 1 - - cloud_scale - - 0.25999999046325684 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.499370784775238 - 10.011009025563908 - - cloud_shadow - - 0.5 - 0 - 0 - 1 - - density_multiplier - - 5.999999848427251e-005 - 0 - 0 - 1 - - distance_multiplier - - 55.700000762939453 - 0 - 0 - 1 - - east_angle - 6.2831854820251465 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.59999996423721313 - 0 - 0 - 1 - - glow - - 11.400001525878906 - 0.0010000000474974513 - -0.049999997019767761 - 1 - - haze_density - - 1.5099999904632568 - 0 - 0 - 1 - - haze_horizon - - 0.25999999046325684 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -1.2895088730147108e-007 - 0.67533284425735474 - 0.73751306533813477 - 0 - - max_y - - 763 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0.43999999761581421 - sun_angle - 0.74141591787338257 - sunlight_color - - 1.8303898572921753 - 2.4300000667572021 - 2.3668835163116455 - 0.81000000238418579 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20We%27re%20so%20vane.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20We%27re%20so%20vane.xml deleted file mode 100644 index 9d79c022a..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20We%27re%20so%20vane.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.44999998807907104 - 0.15999999642372131 - 0 - 0.44999998807907104 - - blue_density - - 0.079999998211860657 - 0.22999770939350128 - 0.43999999761581421 - 0.43999999761581421 - - blue_horizon - - 0.2199999988079071 - 0.2199999988079071 - 0.2199999988079071 - 0.10999999940395355 - - cloud_color - - 0 - 0 - 0 - 0 - - cloud_pos_density1 - - 0 - 0 - 0 - 1 - - cloud_pos_density2 - - 0 - 0 - 0 - 1 - - cloud_scale - - 0.0099999997764825821 - 0 - 0 - 1 - - cloud_scroll_rate - - 20 - 20 - - cloud_shadow - - 0.10999999940395355 - 0 - 0 - 1 - - density_multiplier - - 0.00018999999156221747 - 0 - 0 - 1 - - distance_multiplier - - 4.0999999046325684 - 0 - 0 - 1 - - east_angle - 3.0159289836883545 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.5399999618530273 - 0 - 0 - 1 - - glow - - 3.8000011444091797 - 0.0010000000474974513 - -0.55000001192092896 - 1 - - haze_density - - 3.429999828338623 - 0 - 0 - 1 - - haze_horizon - - 0.42999997735023499 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.12533320486545563 - 0 - -0.99211472272872925 - 0 - - max_y - - 1047 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 0 - sunlight_color - - 1.2599999904632568 - 0.71999996900558472 - 1.9199999570846558 - 1.9199999570846558 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20What%20I%20am%20thinking.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20What%20I%20am%20thinking.xml deleted file mode 100644 index e3a7ac45c..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20What%20I%20am%20thinking.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.0649129971861839290.302927345037460330.310000002384185790.31000000238418579blue_density00.9699999690055847200.96999996900558472blue_horizon00.560000002384185790.407272696495056150.56000000238418579cloud_color0.234343409538269040.3999999761581420900.39999997615814209cloud_pos_density10.479999989271163940.779999971389770510.789999961853027341cloud_pos_density20.50.439999997615814210.170000001788139341cloud_scale0.35999998450279236001cloud_scroll_rate10.07290822297227410.152564609237686cloud_shadow0.38999998569488525001density_multiplier7.9999997979030013e-005001distance_multiplier8.1000003814697266001east_angle6.2831854820251465enable_cloud_scroll00gamma1.4399999380111694001glow200.001000000047497451301haze_density0001haze_horizon0.509999990463256840.199156001210212710.199156001210212711lightnorm1.2207115673845692e-0070.71593630313873291-0.698165595531463620max_y921001preset_num18star_brightness0sun_angle2.3436284065246582sunlight_color1.94999992847442630.989999949932098391.68998980522155761.9499999284744263 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Where%20were%202.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Where%20were%202.xml deleted file mode 100644 index 92ae48025..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Where%20were%202.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0 - 0 - 2.6399998664855957 - 0.87999999523162842 - - blue_density - - 0.19200001657009125 - 1.5999999046325684 - 0 - 0.79999995231628418 - - blue_horizon - - 1.4800000190734863 - 1.4800000190734863 - 1.4800000190734863 - 0.74000000953674316 - - cloud_color - - 0.040425527840852737 - 0.37999999523162842 - 0 - 0.37999999523162842 - - cloud_pos_density1 - - 0.039999999105930328 - 0.23999999463558197 - 0.059999998658895493 - 1 - - cloud_pos_density2 - - 0 - 0 - 0 - 1 - - cloud_scale - - 0.63999998569488525 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.644780158996582 - 10.423800468444824 - - cloud_shadow - - 0.8399999737739563 - 0 - 0 - 1 - - density_multiplier - - 0.00026999998954124749 - 0 - 0 - 1 - - distance_multiplier - - 14.90000057220459 - 0 - 0 - 1 - - east_angle - 0.31415924429893494 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.2200000286102295 - 0 - 0 - 1 - - glow - - 2.5999999046325684 - 0.0010000000474974513 - -1.0499999523162842 - 1 - - haze_density - - 0.31999999284744263 - 0 - 0 - 1 - - haze_horizon - - 0.29999998211860657 - 0.13210900127887726 - 0.13210900127887726 - 1 - - lightnorm - - -0.29881986975669861 - 0.25477075576782227 - 0.91967308521270752 - 0 - - max_y - - 322 - 0 - 0 - 1 - - preset_num - 3 - star_brightness - 0.5899999737739563 - sun_angle - 0.25761061906814575 - sunlight_color - - 1.2300000190734863 - 0.059999998658895493 - 0 - 1.2300000190734863 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Where%20were%203.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Where%20were%203.xml deleted file mode 100644 index 416115654..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Where%20were%203.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.59999996423721313 - 0 - 2.6399998664855957 - 0.87999999523162842 - - blue_density - - 0.19200001657009125 - 1.5999999046325684 - 0 - 0.79999995231628418 - - blue_horizon - - 0 - 1.4399999380111694 - 1.4399999380111694 - 0.71999996900558472 - - cloud_color - - 0.24842105805873871 - 0.5899999737739563 - 0 - 0.5899999737739563 - - cloud_pos_density1 - - 0.039999999105930328 - 0.23999999463558197 - 0.059999998658895493 - 1 - - cloud_pos_density2 - - 0 - 0 - 0 - 1 - - cloud_scale - - 0.88999998569488525 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.644780158996582 - 10.423800468444824 - - cloud_shadow - - 0.84999996423721313 - 0 - 0 - 1 - - density_multiplier - - 0.00026999998954124749 - 0 - 0 - 1 - - distance_multiplier - - 21.600000381469727 - 0 - 0 - 1 - - east_angle - 0.31415924429893494 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.74000000953674316 - 0 - 0 - 1 - - glow - - 2.5999999046325684 - 0.0010000000474974513 - -1.0499999523162842 - 1 - - haze_density - - 0.34999999403953552 - 0 - 0 - 1 - - haze_horizon - - 0.28999999165534973 - 0.13210900127887726 - 0.13210900127887726 - 1 - - lightnorm - - -0.29881986975669861 - 0.25477075576782227 - 0.91967308521270752 - 0 - - max_y - - 322 - 0 - 0 - 1 - - preset_num - 3 - star_brightness - 1.4599999189376831 - sun_angle - 0.25761061906814575 - sunlight_color - - 1.1999999284744263 - 0.059999998658895493 - 0 - 1.1999999284744263 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Where%20were.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Where%20were.xml deleted file mode 100644 index c0616503b..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Where%20were.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0 - 0 - 2.6399998664855957 - 0.87999999523162842 - - blue_density - - 0.19200001657009125 - 1.5999999046325684 - 0 - 0.79999995231628418 - - blue_horizon - - 1.4800000190734863 - 1.4800000190734863 - 1.4800000190734863 - 0.74000000953674316 - - cloud_color - - 0.040425527840852737 - 0.37999999523162842 - 0 - 0.37999999523162842 - - cloud_pos_density1 - - 0.039999999105930328 - 0.23999999463558197 - 0.53999996185302734 - 1 - - cloud_pos_density2 - - 0 - 0 - 0 - 1 - - cloud_scale - - 0.63999998569488525 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.644780158996582 - 10.423800468444824 - - cloud_shadow - - 0.34000000357627869 - 0 - 0 - 1 - - density_multiplier - - 0.00026999998954124749 - 0 - 0 - 1 - - distance_multiplier - - 14.90000057220459 - 0 - 0 - 1 - - east_angle - 0.31415924429893494 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.2200000286102295 - 0 - 0 - 1 - - glow - - 2.5999999046325684 - 0.0010000000474974513 - -1.0499999523162842 - 1 - - haze_density - - 0.31999999284744263 - 0 - 0 - 1 - - haze_horizon - - 0.29999998211860657 - 0.13210900127887726 - 0.13210900127887726 - 1 - - lightnorm - - -0.27264297008514404 - 0.47070392966270447 - 0.83910882472991943 - 0 - - max_y - - 322 - 0 - 0 - 1 - - preset_num - 3 - star_brightness - 0.5899999737739563 - sun_angle - 0.49008846282958984 - sunlight_color - - 1.2300000190734863 - 0.059999998658895493 - 0 - 1.2300000190734863 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Whirld%20spinnin.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Whirld%20spinnin.xml deleted file mode 100644 index db40cc71d..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Whirld%20spinnin.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.28000006079673767 - 0.29999992251396179 - 0.5 - 0.5 - - blue_density - - 0.0091836731880903244 - 0.35356777906417847 - 0.44999998807907104 - 0.44999998807907104 - - blue_horizon - - 0.30857133865356445 - 0.53999996185302734 - 0 - 0.53999996185302734 - - cloud_color - - 0.53886795043945313 - 0.56000000238418579 - 0.23895518481731415 - 0.56000000238418579 - - cloud_pos_density1 - - 0.39999997615814209 - 0.62000000476837158 - 0.34000000357627869 - 1 - - cloud_pos_density2 - - 0.29999998211860657 - 0.48999997973442078 - 0.049999997019767761 - 1 - - cloud_scale - - 0.18999999761581421 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.739999771118164 - 10.600000381469727 - - cloud_shadow - - 0.37000000476837158 - 0 - 0 - 1 - - density_multiplier - - 4.9999998736893758e-005 - 0 - 0 - 1 - - distance_multiplier - - 6.7000002861022949 - 0 - 0 - 1 - - east_angle - 0.31415924429893494 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.0299999713897705 - 0 - 0 - 1 - - glow - - 4.8000001907348633 - 0.0010000000474974513 - -0.39999997615814209 - 1 - - haze_density - - 0.87000000476837158 - 0 - 0 - 1 - - haze_horizon - - 0.39999997615814209 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.27533614635467529 - 0.45399037003517151 - -0.84739762544631958 - 0 - - max_y - - 526 - 0 - 0 - 1 - - preset_num - 28 - star_brightness - 0.099999994039535522 - sun_angle - 2.670353889465332 - sunlight_color - - 1.1999999284744263 - 1.1999999284744263 - 1.1999999284744263 - 0.39999997615814209 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Whisked.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Whisked.xml deleted file mode 100644 index 9621cc0e2..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Whisked.xml +++ /dev/null @@ -1 +0,0 @@ -ambient10.319999992847442630.140000000596046451blue_density0.0299999993294477460.354996502399444580.709999978542327880.70999997854232788blue_horizon0.0475675649940967560.159999996423721310.439999997615814210.43999999761581421cloud_color0.274149477481842040.399999976158142090.599999964237213130.59999996423721313cloud_pos_density10.879999995231628420.769999980926513670.199999988079071041cloud_pos_density20.550000011920928960.389999985694885250.119999997317790991cloud_scale0.44999998807907104001cloud_scroll_rate2010.01099967956543cloud_shadow0.31000000238418579001density_multiplier0.00011000000085914508001distance_multiplier31.5001east_angle2.7646017074584961enable_cloud_scroll00gamma1.4099999666213989001glow8.6000013351440430.0010000000474974513-1.34999990463256841haze_density0.84999996423721313001haze_horizon0.199999988079071040.199156001210212710.199156001210212711lightnorm-0.367768406867980960.043968122452497482-0.928877413272857670max_y789001preset_num24star_brightness0.2800000011920929sun_angle0.043982300907373428sunlight_color1.28999996185302731.00125002861022950.659999847412109380.42999997735023499 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Wonderzan.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Wonderzan.xml deleted file mode 100644 index 9802d8723..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Wonderzan.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.229999989271163940.157593697309494020.479999989271163940.47999998927116394blue_density00.365548551082611080.731102764606475830.87368583679199219blue_horizon0.409999996423721310.252947539091110230.353347927331924440.40999999642372131cloud_color0.330606031041494220.388021565875288130.390892339194746091cloud_pos_density10.50.511cloud_pos_density20.50.50.109210731770717381cloud_scale0.32999998090376081001cloud_scroll_rate10.3359383380316110.065257411083678cloud_shadow0.28999999165534973001density_multiplier0.00037999998312443495001distance_multiplier12.800000190734863001east_angle2.7646017074584961enable_cloud_scroll00gamma1.2099999189376831001glow3.6000013351440430.0010000000474974513-0.550000011920928961haze_density0.53999996185302734001haze_horizon0.089999996125698090.199156001210212710.199156001210212711lightnorm-0.365221619606018070.12533323466777802-0.922444999217987060max_y1154.9000244140625001preset_num18star_brightness2sun_angle0.12566371262073517sunlight_color1.25999999046325681.43999993801116941.43999993801116941.4399999380111694 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Wuxia%20nights.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Wuxia%20nights.xml deleted file mode 100644 index 2774c0824..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Wuxia%20nights.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.87185126543045044 - 1.0359940528869629 - 1.4099999666213989 - 0.4699999988079071 - - blue_density - - 0.5 - 0.019999999552965164 - 0.5 - 0.51999998092651367 - - blue_horizon - - 0.84959989786148071 - 1.1799999475479126 - 1.1799999475479126 - 0.5899999737739563 - - cloud_color - - 0.22615399956703186 - 0.22615399956703186 - 0.22615399956703186 - 1 - - cloud_pos_density1 - - 0 - 0.23999999463558197 - 0.34999999403953552 - 1 - - cloud_pos_density2 - - 5.9584097862243652 - 6.9909601211547852 - 0.0099999997764825821 - 1 - - cloud_scale - - 0.37999999523162842 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.19999998807907104 - 0 - 0 - 1 - - density_multiplier - - 0.00026999998954124749 - 0 - 0 - 1 - - distance_multiplier - - 0.5 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1 - 0 - 0 - 1 - - glow - - 5 - 0.0010000000474974513 - -0.69999998807907104 - 1 - - haze_density - - 1.6799999475479126 - 0 - 0 - 1 - - haze_horizon - - 1 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0 - 0 - 1 - 0 - - max_y - - 18 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 2 - sun_angle - 6.1512389183044434 - sunlight_color - - 0.32999998331069946 - 1.6170113086700439 - 3 - 1 - - - diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Yo%20pirates%21.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Yo%20pirates%21.xml deleted file mode 100644 index 2765606bb..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Yo%20pirates%21.xml +++ /dev/null @@ -1 +0,0 @@ -ambient0.31000000238418579000.31000000238418579blue_density0.140000000596046450.280000001192092911blue_horizon0.729999899864196780.3509429991245269811cloud_color0.502249956130981450.80975002050399780.819999992847442630.81999999284744263cloud_pos_density10.639999985694885250.489999979734420780.399999976158142091cloud_pos_density20.349999994039535520.50.0399999991059303281cloud_scale0.31000000238418579001cloud_scroll_rate9.930000482148898310.199999788063906cloud_shadow0.31000000238418579001density_multiplier0.00013999998918734491001distance_multiplier3.4000000953674316001east_angle3.4557521343231201enable_cloud_scroll00gamma1.5399999618530273001glow4.00000095367431640.0010000000474974513-0.899999976158142091haze_density0001haze_horizon0.0399999991059303280.199156001210212710.199156001210212711lightnorm-0.303543657064437870.187381297349929810.934210598468780520max_y507001preset_num18star_brightness0.90999996662139893sun_angle2.9530971050262451sunlight_color1.28999996185302731.01050007343292240.731000006198883060.42999997735023499 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Yolka%20loka.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Yolka%20loka.xml deleted file mode 100644 index 134284858..000000000 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Yolka%20loka.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0 - 0.38999998569488525 - 0.086666658520698547 - 0.12999999523162842 - - blue_density - - 0 - 0.71999996900558472 - 0.689361572265625 - 0.35999998450279236 - - blue_horizon - - 0.47999998927116394 - 0.44129028916358948 - 0.59999996423721313 - 0.59999996423721313 - - cloud_color - - 0.20880000293254852 - 0.31999999284744263 - 0.87000000476837158 - 0.87000000476837158 - - cloud_pos_density1 - - 0.70999997854232788 - 0.96999996900558472 - 0.53999996185302734 - 1 - - cloud_pos_density2 - - 0.62999999523162842 - 0.22999998927116394 - 0.049999997019767761 - 1 - - cloud_scale - - 0.25999999046325684 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.993240904292179 - 10.179008409703329 - - cloud_shadow - - 0.40999999642372131 - 0 - 0 - 1 - - density_multiplier - - 0.00022999999055173248 - 0 - 0 - 1 - - distance_multiplier - - 31.100000381469727 - 0 - 0 - 1 - - east_angle - 1.6964600086212158 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.2799999713897705 - 0 - 0 - 1 - - glow - - 2.7999997138977051 - 0.0010000000474974513 - -0.39999997615814209 - 1 - - haze_density - - 0.96999996900558472 - 0 - 0 - 1 - - haze_horizon - - 0.17000000178813934 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.98349088430404663 - 0.13156437873840332 - -0.12424375861883163 - 0 - - max_y - - 966 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 0.90999996662139893 - sun_angle - 0.13194690644741058 - sunlight_color - - 1.1320408582687378 - 1.0267347097396851 - 1.2899999618530273 - 0.42999997735023499 - - - diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio5.xml b/indra/newview/app_settings/windlight/skies/AnaLu%20%252Astudio%252A%205.xml similarity index 99% rename from indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio5.xml rename to indra/newview/app_settings/windlight/skies/AnaLu%20%252Astudio%252A%205.xml index fde46ae5e..b7c6d047f 100644 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio5.xml +++ b/indra/newview/app_settings/windlight/skies/AnaLu%20%252Astudio%252A%205.xml @@ -112,7 +112,7 @@ lightnorm - -0 + 0 0 1 0 diff --git a/indra/newview/app_settings/windlight/skies/AnaLutetia%20%2D%20AvatarOpt(2).xml b/indra/newview/app_settings/windlight/skies/AnaLutetia%20%2D%20AvatarOpt(2).xml deleted file mode 100644 index 1ee1cf715..000000000 --- a/indra/newview/app_settings/windlight/skies/AnaLutetia%20%2D%20AvatarOpt(2).xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.5565025806427002 - 0.66127157211303711 - 0.89999997615814209 - 0.29999998211860657 - - blue_density - - 0.14522500336170197 - 0.39999699592590332 - 0.80000197887420654 - 1 - - blue_horizon - - 0.15130999684333801 - 0.30000001192092896 - 0.35131001472473145 - 1 - - cloud_color - - 0.12862999737262726 - 0.12862999737262726 - 0.12862999737262726 - 1 - - cloud_pos_density1 - - 0.88419097661972046 - 0.53047597408294678 - 0.4270470142364502 - 1 - - cloud_pos_density2 - - 0.38419300317764282 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.41999998688697815 - 0 - 0 - 1 - - cloud_scroll_rate - - 10 - 10 - - cloud_shadow - - 0 - 0 - 0 - 1 - - density_multiplier - - 0.0001250890054507181 - 0 - 0 - 1 - - distance_multiplier - - 11.40000057220459 - 0 - 0 - 1 - - east_angle - 3.3300881385803223 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.7300000190734863 - 0 - 0 - 1 - - glow - - 0.19999980926513672 - 0.0012815999798476696 - 0 - 1 - - haze_density - - 1.4399999380111694 - 0 - 0 - 1 - - haze_horizon - - 0.14999999105930328 - 0.21744099259376526 - 0.21744099259376526 - 1 - - lightnorm - - 0.18507426977157593 - 0.15643447637557983 - -0.97019368410110474 - 0 - - max_y - - 4000 - 0 - 0 - 1 - - preset_num - 2 - star_brightness - 0 - sun_angle - 0.15707963705062866 - sunlight_color - - 3 - 3 - 3 - 1 - - - diff --git a/indra/newview/app_settings/windlight/skies/AnaLutetia%2Doutdoor2(2).xml b/indra/newview/app_settings/windlight/skies/AnaLutetia%2Doutdoor2(2).xml deleted file mode 100644 index 156852976..000000000 --- a/indra/newview/app_settings/windlight/skies/AnaLutetia%2Doutdoor2(2).xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0 - 0 - 0.44999998807907104 - 0.44999998807907104 - - blue_density - - 0.13997539444089213 - 0.38665792478461469 - 0.77332294252195766 - 0.95108884837904384 - - blue_horizon - - 0 - 0.22876684367656708 - 0.290018230676651 - 0.31999999284744263 - - cloud_color - - 0.25999999046325684 - 0.28883209824562073 - 0.28994369506835938 - 0.28999999165534973 - - cloud_pos_density1 - - 0.17999999225139618 - 0.50999999046325684 - 0.91999995708465576 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.079999998211860657 - 1 - - cloud_scale - - 0.25 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.436104517528292 - 10 - - cloud_shadow - - 0.34000000357627869 - 0 - 0 - 1 - - density_multiplier - - 0.0002899999963119626 - 0 - 0 - 1 - - distance_multiplier - - 1.3000000715255737 - 0 - 0 - 1 - - east_angle - 2.2619466781616211 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.5399999618530273 - 0 - 0 - 1 - - glow - - 4.0000009536743164 - 0.0010000000474974513 - -0.74999994039535522 - 1 - - haze_density - - 0.12999999523162842 - 0 - 0 - 1 - - haze_horizon - - 0.14999999105930328 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.28364488482475281 - 0.92977643013000488 - 0.23465146124362946 - 0 - - max_y - - 394.39999389648437 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0.44999998807907104 - sun_angle - 1.9477875232696533 - sunlight_color - - 2.25 - 1.957500696182251 - 1.170000433921814 - 0.75 - - - diff --git a/indra/newview/app_settings/windlight/skies/B5%2DShadowDancing.xml b/indra/newview/app_settings/windlight/skies/B5%2DShadowDancing.xml index a1a8f026d..1c0c8cc46 100644 --- a/indra/newview/app_settings/windlight/skies/B5%2DShadowDancing.xml +++ b/indra/newview/app_settings/windlight/skies/B5%2DShadowDancing.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.26999998092651367 - 0.26999998092651367 - 0.26999998092651367 - 0.08999999612569809 - - blue_density - - 0.37999999523162842 - 0.37999999523162842 - 0.37999999523162842 - 0.18999999761581421 - - blue_horizon - - 0.69999998807907104 - 0.69999998807907104 - 0.69999998807907104 - 0.34999999403953552 - - cloud_color - - 0 - 0 - 0 - 0 - - cloud_pos_density1 - - 0.2800000011920929 - 0.59999996423721313 - 1 - 1 - - cloud_pos_density2 - - 0 - 0 - 0 - 1 - - cloud_scale - - 0.2199999988079071 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.069999776780605 - 9.9299997761845589 - - cloud_shadow - - 0.22999998927116394 - 0 - 0 - 1 - - density_multiplier - - 0.00039999998989515007 - 0 - 0 - 1 - - distance_multiplier - - 8.6000003814697266 - 0 - 0 - 1 - - east_angle - 2.7017695903778076 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.5099999904632568 - 0 - 0 - 1 - - glow - - 13.600001335144043 - 0.0010000000474974513 - -0.39999997615814209 - 1 - - haze_density - - 0.81999999284744263 - 0 - 0 - 1 - - haze_horizon - - 0.59999996423721313 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.42413315176963806 - 0.087851203978061676 - -0.90132862329483032 - 0 - - max_y - - 2562 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0.74000000953674316 - sun_angle - 0.087964601814746857 - sunlight_color - - 1.1999999284744263 - 1.1999999284744263 - 1.1999999284744263 - 0.39999997615814209 - - - + + + ambient + + 0.26999998092651367 + 0.26999998092651367 + 0.26999998092651367 + 0.08999999612569809 + + blue_density + + 0.37999999523162842 + 0.37999999523162842 + 0.37999999523162842 + 0.18999999761581421 + + blue_horizon + + 0.69999998807907104 + 0.69999998807907104 + 0.69999998807907104 + 0.34999999403953552 + + cloud_color + + 0 + 0 + 0 + 0 + + cloud_pos_density1 + + 0.2800000011920929 + 0.59999996423721313 + 1 + 1 + + cloud_pos_density2 + + 0 + 0 + 0 + 1 + + cloud_scale + + 0.2199999988079071 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.069999776780605 + 9.9299997761845589 + + cloud_shadow + + 0.22999998927116394 + 0 + 0 + 1 + + density_multiplier + + 0.00039999998989515007 + 0 + 0 + 1 + + distance_multiplier + + 8.6000003814697266 + 0 + 0 + 1 + + east_angle + 2.7017695903778076 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.5099999904632568 + 0 + 0 + 1 + + glow + + 13.600001335144043 + 0.0010000000474974513 + -0.39999997615814209 + 1 + + haze_density + + 0.81999999284744263 + 0 + 0 + 1 + + haze_horizon + + 0.59999996423721313 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.42413315176963806 + 0.087851203978061676 + -0.90132862329483032 + 0 + + max_y + + 2562 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0.74000000953674316 + sun_angle + 0.087964601814746857 + sunlight_color + + 1.1999999284744263 + 1.1999999284744263 + 1.1999999284744263 + 0.39999997615814209 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rose%2Dtinted.xml b/indra/newview/app_settings/windlight/skies/Blacknight.xml similarity index 64% rename from indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rose%2Dtinted.xml rename to indra/newview/app_settings/windlight/skies/Blacknight.xml index 22388e2dd..65940a320 100644 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Rose%2Dtinted.xml +++ b/indra/newview/app_settings/windlight/skies/Blacknight.xml @@ -1,141 +1,141 @@ - - - ambient - - 1 - 1 - 1 - 1 - - blue_density - - 0.18999999761581421 - 0.18999999761581421 - 0.18999999761581421 - 0.18999999761581421 - - blue_horizon - - 0.84999996423721313 - 0.34999999403953552 - 0.56000000238418579 - 0.84999996423721313 - - cloud_color - - 0 - 0 - 0 - 0 - - cloud_pos_density1 - - 0 - 0 - 0 - 1 - - cloud_pos_density2 - - 0 - 0 - 0 - 1 - - cloud_scale - - 0.0099999997764825821 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0 - 0 - 0 - 1 - - density_multiplier - - 0.0004400000034365803 - 0 - 0 - 1 - - distance_multiplier - - 100 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.0299999713897705 - 0 - 0 - 1 - - glow - - 20 - 0.0010000000474974513 - 0 - 1 - - haze_density - - 0 - 0 - 0 - 1 - - haze_horizon - - 0 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0 - 0 - 1 - 0 - - max_y - - 500 - 0 - 0 - 1 - - preset_num - 3 - star_brightness - 0 - sun_angle - 0 - sunlight_color - - 0 - 0 - 0 - 0 - - - + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 2 + 2 + 2 + 1 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0.2113494873046875 + 0.22654294967651367 + 0.2339630126953125 + 0.2339630126953125 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.18000000715255737 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.199999809265137 + 10.01099967956543 + + cloud_shadow + + 0.28999999165534973 + 0 + 0 + 1 + + density_multiplier + + 0.00011000000085914508 + 0 + 0 + 1 + + distance_multiplier + + 100 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.070000000298023224 + 0 + 0 + 1 + + glow + + 20 + 0.0010000000474974513 + -0 + 1 + + haze_density + + 4 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0 + 0.85491091012954712 + 0.51877486705780029 + 1 + + max_y + + 240 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 1.4800000190734863 + sun_angle + 4.1669716835021973 + sunlight_color + + 0.7084808349609375 + 0.8618316650390625 + 0.83307838439941406 + 0.2872772216796875 + + + diff --git a/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Annas%20Many%20Murders.xml b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Annas%20Many%20Murders.xml index f585ddb6d..da80036ff 100644 --- a/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Annas%20Many%20Murders.xml +++ b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Annas%20Many%20Murders.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.21000000834465027 - 0.08999999612569809 - 0 - 0.070000000298023224 - - blue_density - - 0.17999999225139618 - 0.19999998807907104 - 0.14000000059604645 - 0.2199999988079071 - - blue_horizon - - 0.29999998211860657 - 0.17999999225139618 - 0.19999998807907104 - 0.29999998211860657 - - cloud_color - - 0.61000001430511475 - 0.53999996185302734 - 0.56000000238418579 - 0.61000001430511475 - - cloud_pos_density1 - - 0.44999998807907104 - 0.55000001192092896 - 0.059999998658895493 - 1 - - cloud_pos_density2 - - 0.53999996185302734 - 0.47999998927116394 - 0.039999999105930328 - 1 - - cloud_scale - - 0.18000000715255737 - 0 - 0 - 1 - - cloud_scroll_rate - - 12.989999771118164 - 10.510000228881836 - - cloud_shadow - - 0.63999998569488525 - 0 - 0 - 1 - - density_multiplier - - 0.00020999999833293259 - 0 - 0 - 1 - - distance_multiplier - - 23 - 0 - 0 - 1 - - east_angle - 2.0106194019317627 - enable_cloud_scroll - - 1 - 1 - - gamma - - 0.74000000953674316 - 0 - 0 - 1 - - glow - - 20 - 0.0010000000474974513 - -0 - 1 - - haze_density - - 4 - 0 - 0 - 1 - - haze_horizon - - 0.17000000178813934 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.90482699871063232 - 1.7484555314695172e-007 - -0.42577937245368958 - 0 - - max_y - - 322 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 6.2831854820251465 - sunlight_color - - 0.65999996662139893 - 0.53999996185302734 - 0.59999996423721313 - 0.65999996662139893 - - - + + + ambient + + 0.21000000834465027 + 0.08999999612569809 + 0 + 0.070000000298023224 + + blue_density + + 0.17999999225139618 + 0.19999998807907104 + 0.14000000059604645 + 0.2199999988079071 + + blue_horizon + + 0.29999998211860657 + 0.17999999225139618 + 0.19999998807907104 + 0.29999998211860657 + + cloud_color + + 0.61000001430511475 + 0.53999996185302734 + 0.56000000238418579 + 0.61000001430511475 + + cloud_pos_density1 + + 0.44999998807907104 + 0.55000001192092896 + 0.059999998658895493 + 1 + + cloud_pos_density2 + + 0.53999996185302734 + 0.47999998927116394 + 0.039999999105930328 + 1 + + cloud_scale + + 0.18000000715255737 + 0 + 0 + 1 + + cloud_scroll_rate + + 12.989999771118164 + 10.510000228881836 + + cloud_shadow + + 0.63999998569488525 + 0 + 0 + 1 + + density_multiplier + + 0.00020999999833293259 + 0 + 0 + 1 + + distance_multiplier + + 23 + 0 + 0 + 1 + + east_angle + 2.0106194019317627 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.74000000953674316 + 0 + 0 + 1 + + glow + + 20 + 0.0010000000474974513 + -0 + 1 + + haze_density + + 4 + 0 + 0 + 1 + + haze_horizon + + 0.17000000178813934 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.90482699871063232 + 1.7484555314695172e-007 + -0.42577937245368958 + 0 + + max_y + + 322 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 6.2831854820251465 + sunlight_color + + 0.65999996662139893 + 0.53999996185302734 + 0.59999996423721313 + 0.65999996662139893 + + + diff --git a/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20BLUNIVERSE.xml b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20BLUNIVERSE.xml index 8c2082e43..b2630b9f8 100644 --- a/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20BLUNIVERSE.xml +++ b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20BLUNIVERSE.xml @@ -1,141 +1,141 @@ - - - ambient - - 0 - 0 - 0.14999999105930328 - 0.14999999105930328 - - blue_density - - 0 - 0.37999999523162842 - 0.56000000238418579 - 0.56000000238418579 - - blue_horizon - - 0.45999997854232788 - 0.37999999523162842 - 0.57999998331069946 - 0.57999998331069946 - - cloud_color - - 0.11999999731779099 - 0.10999999940395355 - 0.11999999731779099 - 0.11999999731779099 - - cloud_pos_density1 - - 0.69999998807907104 - 0.34999999403953552 - 0.79999995231628418 - 1 - - cloud_pos_density2 - - 0.29999998211860657 - 0.17000000178813934 - 0.17000000178813934 - 1 - - cloud_scale - - 0.39999997615814209 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.359999656677246 - 10.029999732971191 - - cloud_shadow - - 0.29999998211860657 - 0 - 0 - 1 - - density_multiplier - - 9.9999997473787516e-005 - 0 - 0 - 1 - - distance_multiplier - - 37.200000762939453 - 0 - 0 - 1 - - east_angle - 1.1938052177429199 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.0099999904632568 - 0 - 0 - 1 - - glow - - 3.8000011444091797 - 0.0010000000474974513 - -1.5999999046325684 - 1 - - haze_density - - 1.2699999809265137 - 0 - 0 - 1 - - haze_horizon - - 0.35999998450279236 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.76900023221969604 - 0.56208312511444092 - -0.30446872115135193 - 0 - - max_y - - 349 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 2 - sun_angle - 2.5446903705596924 - sunlight_color - - 1.4099999666213989 - 1.6500000953674316 - 2.0399999618530273 - 2.0399999618530273 - - - + + + ambient + + 0 + 0 + 0.14999999105930328 + 0.14999999105930328 + + blue_density + + 0 + 0.37999999523162842 + 0.56000000238418579 + 0.56000000238418579 + + blue_horizon + + 0.45999997854232788 + 0.37999999523162842 + 0.57999998331069946 + 0.57999998331069946 + + cloud_color + + 0.11999999731779099 + 0.10999999940395355 + 0.11999999731779099 + 0.11999999731779099 + + cloud_pos_density1 + + 0.69999998807907104 + 0.34999999403953552 + 0.79999995231628418 + 1 + + cloud_pos_density2 + + 0.29999998211860657 + 0.17000000178813934 + 0.17000000178813934 + 1 + + cloud_scale + + 0.39999997615814209 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.359999656677246 + 10.029999732971191 + + cloud_shadow + + 0.29999998211860657 + 0 + 0 + 1 + + density_multiplier + + 9.9999997473787516e-005 + 0 + 0 + 1 + + distance_multiplier + + 37.200000762939453 + 0 + 0 + 1 + + east_angle + 1.1938052177429199 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.0099999904632568 + 0 + 0 + 1 + + glow + + 3.8000011444091797 + 0.0010000000474974513 + -1.5999999046325684 + 1 + + haze_density + + 1.2699999809265137 + 0 + 0 + 1 + + haze_horizon + + 0.35999998450279236 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.76900023221969604 + 0.56208312511444092 + -0.30446872115135193 + 0 + + max_y + + 349 + 0 + 0 + 1 + + preset_num + 24 + star_brightness + 2 + sun_angle + 2.5446903705596924 + sunlight_color + + 1.4099999666213989 + 1.6500000953674316 + 2.0399999618530273 + 2.0399999618530273 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Faux%20moon.xml b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20BOX%20MetaLES.xml similarity index 62% rename from indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Faux%20moon.xml rename to indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20BOX%20MetaLES.xml index cee6c8fc2..be2bb5571 100644 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Faux%20moon.xml +++ b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20BOX%20MetaLES.xml @@ -2,68 +2,68 @@ ambient - 0.95999997854232788 - 0.32999998331069946 - 0.32999998331069946 - 0.95999997854232788 + 1.0799999237060547 + 1.2599999904632568 + 1.2599999904632568 + 1.2599999904632568 blue_density - 0.44999998807907104 - 0.44999998807907104 - 0.44999998807907104 - 1 + 0.2800000011920929 + 0.2800000011920929 + 0.34000000357627869 + 0.34000000357627869 blue_horizon - 0.23999999463558197 - 0.23999999463558197 - 0.23999999463558197 - 1 + 0.10838708281517029 + 0.10838708281517029 + 0.14000000059604645 + 0.070000000298023224 cloud_color - 0.22615399956703186 - 0.22615399956703186 - 0.22615399956703186 + 1 + 1 + 1 1 cloud_pos_density1 - 0.69999998807907104 - 0.34999999403953552 - 0.87999999523162842 + 1 + 0.34000000357627869 + 1 1 cloud_pos_density2 - 0.2199999988079071 0.84999996423721313 - 0.125 + 0 + 1 1 cloud_scale - 0.41999998688697815 + 0.15000000596046448 0 0 1 cloud_scroll_rate - 20 - 20 + 15.329999923706055 + 8.4700002670288086 cloud_shadow - 0.29999998211860657 + 0.08999999612569809 0 0 1 density_multiplier - 0.00030000001424923539 + 0.00015999999595806003 0 0 1 @@ -76,7 +76,7 @@ 1 east_angle - 0 + 5.1522121429443359 enable_cloud_scroll 1 @@ -84,58 +84,58 @@ gamma - 1 + 1.1499999761581421 0 0 1 glow - 4.8000001907348633 + 10 0.0010000000474974513 - -0.94999998807907104 + -0.74999994039535522 1 haze_density - 4 + 0.64999997615814209 0 0 1 haze_horizon - 0.070000000298023224 + 0.08999999612569809 0.19915600121021271 0.19915600121021271 1 lightnorm - 0 - 0.77450281381607056 - -0.63257044553756714 + 0.90395194292068481 + 0.043968122452497482 + 0.42536768317222595 0 max_y - 906.20001220703125 + 242 0 0 1 preset_num - 18 + 22 star_brightness - 2 + 0 sun_angle - 2.2556638717651367 + 0.043982300907373428 sunlight_color - 0.50181812047958374 - 0.40772724151611328 - 0.68999993801116943 - 0.22999998927116394 + 0.87000000476837158 + 0.87000000476837158 + 0.87000000476837158 + 0.28999999165534973 diff --git a/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Immersiva%20Grey%20Dust.xml b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Immersiva%20Grey%20Dust.xml index 2a07b39d0..924ba4765 100644 --- a/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Immersiva%20Grey%20Dust.xml +++ b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Immersiva%20Grey%20Dust.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.32999998331069946 - 0.23999999463558197 - 0.029999999329447746 - 0.32999998331069946 - - blue_density - - 0.15999999642372131 - 0.15999999642372131 - 0.47999998927116394 - 0.47999998927116394 - - blue_horizon - - 0.19999998807907104 - 0.19999998807907104 - 0.43999999761581421 - 0.43999999761581421 - - cloud_color - - 0.48999997973442078 - 0.50999999046325684 - 0.64999997615814209 - 0.64999997615814209 - - cloud_pos_density1 - - 0.48999997973442078 - 0.50999999046325684 - 0.2199999988079071 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.039999999105930328 - 1 - - cloud_scale - - 0.11999999731779099 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.659999847412109 - 20 - - cloud_shadow - - 0.70999997854232788 - 0 - 0 - 1 - - density_multiplier - - 0.00018999999156221747 - 0 - 0 - 1 - - distance_multiplier - - 24.30000114440918 - 0 - 0 - 1 - - east_angle - 2.3876104354858398 - enable_cloud_scroll - - 1 - 0 - - gamma - - 0.94999998807907104 - 0 - 0 - 1 - - glow - - 20 - 0.0010000000474974513 - -0.29999998211860657 - 1 - - haze_density - - 3.7799999713897705 - 0 - 0 - 1 - - haze_horizon - - 0.15999999642372131 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.64833343029022217 - 0.32094338536262512 - 0.69040501117706299 - 0 - - max_y - - 376 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 2.8148672580718994 - sunlight_color - - 0.75 - 0.71999996900558472 - 0.77999997138977051 - 0.77999997138977051 - - - + + + ambient + + 0.32999998331069946 + 0.23999999463558197 + 0.029999999329447746 + 0.32999998331069946 + + blue_density + + 0.15999999642372131 + 0.15999999642372131 + 0.47999998927116394 + 0.47999998927116394 + + blue_horizon + + 0.19999998807907104 + 0.19999998807907104 + 0.43999999761581421 + 0.43999999761581421 + + cloud_color + + 0.48999997973442078 + 0.50999999046325684 + 0.64999997615814209 + 0.64999997615814209 + + cloud_pos_density1 + + 0.48999997973442078 + 0.50999999046325684 + 0.2199999988079071 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.039999999105930328 + 1 + + cloud_scale + + 0.11999999731779099 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.659999847412109 + 20 + + cloud_shadow + + 0.70999997854232788 + 0 + 0 + 1 + + density_multiplier + + 0.00018999999156221747 + 0 + 0 + 1 + + distance_multiplier + + 24.30000114440918 + 0 + 0 + 1 + + east_angle + 2.3876104354858398 + enable_cloud_scroll + + 1 + 0 + + gamma + + 0.94999998807907104 + 0 + 0 + 1 + + glow + + 20 + 0.0010000000474974513 + -0.29999998211860657 + 1 + + haze_density + + 3.7799999713897705 + 0 + 0 + 1 + + haze_horizon + + 0.15999999642372131 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.64833343029022217 + 0.32094338536262512 + 0.69040501117706299 + 0 + + max_y + + 376 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 2.8148672580718994 + sunlight_color + + 0.75 + 0.71999996900558472 + 0.77999997138977051 + 0.77999997138977051 + + + diff --git a/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Mayfly.xml b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Mayfly.xml index 272d1e041..e222914c0 100644 --- a/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Mayfly.xml +++ b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Mayfly.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.21000000834465027 - 0.23999999463558197 - 0.32999998331069946 - 0.10999999940395355 - - blue_density - - 0.15999999642372131 - 0.43999999761581421 - 0.89999997615814209 - 0.89999997615814209 - - blue_horizon - - 0 - 0 - 0.059999998658895493 - 0.029999999329447746 - - cloud_color - - 0.29999998211860657 - 0.31999999284744263 - 0.22999998927116394 - 0.31999999284744263 - - cloud_pos_density1 - - 0.98999994993209839 - 1 - 1 - 1 - - cloud_pos_density2 - - 1.6884100437164307 - 0.52609699964523315 - 0.125 - 1 - - cloud_scale - - 0.15000000596046448 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.359999656677246 - 10.219999313354492 - - cloud_shadow - - 0.42999997735023499 - 0 - 0 - 1 - - density_multiplier - - 0.00052000000141561031 - 0 - 0 - 1 - - distance_multiplier - - 3.4000000953674316 - 0 - 0 - 1 - - east_angle - 4.8380527496337891 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1 - 0 - 0 - 1 - - glow - - 7.7999997138977051 - 0.0010000000474974513 - -0.59999996423721313 - 1 - - haze_density - - 1.1100000143051147 - 0 - 0 - 1 - - haze_horizon - - 0.12999999523162842 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.98646044731140137 - 0.10661106556653976 - -0.12461899220943451 - 0 - - max_y - - 591 - 0 - 0 - 1 - - preset_num - 22 - star_brightness - 0.71999996900558472 - sun_angle - 3.0347785949707031 - sunlight_color - - 1.5 - 1.5299999713897705 - 2.8499999046325684 - 0.94999998807907104 - - - + + + ambient + + 0.21000000834465027 + 0.23999999463558197 + 0.32999998331069946 + 0.10999999940395355 + + blue_density + + 0.15999999642372131 + 0.43999999761581421 + 0.89999997615814209 + 0.89999997615814209 + + blue_horizon + + 0 + 0 + 0.059999998658895493 + 0.029999999329447746 + + cloud_color + + 0.29999998211860657 + 0.31999999284744263 + 0.22999998927116394 + 0.31999999284744263 + + cloud_pos_density1 + + 0.98999994993209839 + 1 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.15000000596046448 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.359999656677246 + 10.219999313354492 + + cloud_shadow + + 0.42999997735023499 + 0 + 0 + 1 + + density_multiplier + + 0.00052000000141561031 + 0 + 0 + 1 + + distance_multiplier + + 3.4000000953674316 + 0 + 0 + 1 + + east_angle + 4.8380527496337891 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 7.7999997138977051 + 0.0010000000474974513 + -0.59999996423721313 + 1 + + haze_density + + 1.1100000143051147 + 0 + 0 + 1 + + haze_horizon + + 0.12999999523162842 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.98646044731140137 + 0.10661106556653976 + -0.12461899220943451 + 0 + + max_y + + 591 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.71999996900558472 + sun_angle + 3.0347785949707031 + sunlight_color + + 1.5 + 1.5299999713897705 + 2.8499999046325684 + 0.94999998807907104 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Monochrome%20redflog.xml b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Rusted%20Gears.xml similarity index 74% rename from indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Monochrome%20redflog.xml rename to indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Rusted%20Gears.xml index f8170c7ba..8f6bbf4a4 100644 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Monochrome%20redflog.xml +++ b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Rusted%20Gears.xml @@ -23,60 +23,60 @@ cloud_color - 0.5 - 0 - 0 - 0.5 + 0.28999999165534973 + 0.28999999165534973 + 0.31999999284744263 + 0.31999999284744263 cloud_pos_density1 - 0.55000001192092896 0.5 - 0.25 + 0.5 + 1 1 cloud_pos_density2 0.5 0.5 - 0.049999997019767761 + 0.125 1 cloud_scale - 0.25 + 0.079999998211860657 0 0 1 cloud_scroll_rate - 20 - 20 + 10.49940013885498 + 9.9299993515014648 cloud_shadow - 0.29999998211860657 + 0.32999998331069946 0 0 1 density_multiplier - 0.00019999999494757503 + 0.00089999998454004526 0 0 1 distance_multiplier - 10 + 0 0 0 1 east_angle - 3.1415927410125732 + 1.1309733390808105 enable_cloud_scroll 1 @@ -84,58 +84,58 @@ gamma - 1.75 + 0.19999998807907104 0 0 1 glow - 2.0000004768371582 + 20 0.0010000000474974513 - -0.49999997019767761 + -0 1 haze_density - 2 + 4 0 0 1 haze_horizon - 0.5 + 0.34000000357627869 0.19915600121021271 0.19915600121021271 1 lightnorm - 8.2254402400394611e-008 - 0.33873814344406128 - -0.94088071584701538 - 1 + -0.9048270583152771 + 0 + 0.4257793128490448 + 0 max_y - 200 + 134 0 0 1 preset_num - 18 + 21 star_brightness - 2 + 0 sun_angle - 3.4871680736541748 + 0 sunlight_color - 1.5 - 1.5 - 1.5 - 0.5 + 3 + 3 + 3 + 3 diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Evil%20machinery.xml b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Virginia%20Alone.xml similarity index 60% rename from indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Evil%20machinery.xml rename to indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Virginia%20Alone.xml index 22e82a3ab..3893a3290 100644 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Evil%20machinery.xml +++ b/indra/newview/app_settings/windlight/skies/Bryn%20Oh%27s%20Virginia%20Alone.xml @@ -2,140 +2,140 @@ ambient - 1.5899999141693115 - 0.53999996185302734 0 - 1.5899999141693115 + 0 + 0 + 0 blue_density - 0.52199989557266235 - 0.32480010390281677 - 0.57999998331069946 - 0.28999999165534973 + 0.98039215803146362 + 0.98039215803146362 + 0.75999999046325684 + 0.49019607901573181 blue_horizon - 0.85999995470046997 - 0.63999998569488525 - 1 - 1.059999942779541 + 0.084549009799957275 + 0.11094905436038971 + 0.26054903864860535 + 0.13027451932430267 cloud_color - 0.37000000476837158 - 0.25999999046325684 - 0.039999999105930328 - 0.37000000476837158 + 0.38823530077934265 + 0.42130720615386963 + 0.43137255311012268 + 0.43137255311012268 cloud_pos_density1 - 0.51999998092651367 - 0.38999998569488525 - 0.68999999761581421 + 0.63999998569488525 + 0.5 + 0.56999999284744263 1 cloud_pos_density2 - 0 - 0 + 0.4699999988079071 + 0.34999999403953552 0 1 cloud_scale - 0.17000000178813934 + 0.31999999284744263 0 0 1 cloud_scroll_rate - 10.49940013885498 - 10.01099967956543 + 10.069999694824219 + 10.909999847412109 cloud_shadow - 0.5 + 0.37000000476837158 0 0 1 density_multiplier - 0.00089999998454004526 + 0.00013000000035390258 0 0 1 distance_multiplier - 100 + 2 0 0 1 east_angle - 0.12566371262073517 + 2.7017695903778076 enable_cloud_scroll - 0 - 0 + 1 + 1 gamma - 0.4699999988079071 + 1 0 0 1 glow - 11.600000381469727 + 10 0.0010000000474974513 - -1.4999998807907104 + -0.29999998211860657 1 haze_density - 0.0099999997764825821 + 1.8799999952316284 0 0 1 haze_horizon - 0 - 0.19915600121021271 - 0.19915600121021271 + 0.23999999463558197 + 0.19915600203784933 + 0.19915600203784933 1 lightnorm - -0.10497009009122849 - 0.54639440774917603 - 0.83092385530471802 + 0.40607276558876038 + 0.30070748925209045 + 0.86294835805892944 0 max_y - 4 + 667 0 0 1 preset_num - 18 + 22 star_brightness - 0 + 0.2199999988079071 sun_angle - 0.57805311679840088 + 2.836158275604248 sunlight_color - 1.3499999046325684 - 1.559999942779541 - 0.56999999284744263 - 1.559999942779541 + 1.3882352113723755 + 1.5325489044189453 + 1.6588236093521118 + 0.55294120311737061 diff --git a/indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%201.xml b/indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%201.xml similarity index 100% rename from indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%201.xml rename to indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%201.xml diff --git a/indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%202.xml b/indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%202.xml similarity index 100% rename from indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%202.xml rename to indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%202.xml diff --git a/indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%203.xml b/indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%203.xml similarity index 100% rename from indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%203.xml rename to indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%203.xml diff --git a/indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%204.xml b/indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%204.xml similarity index 100% rename from indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%204.xml rename to indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%204.xml diff --git a/indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%205.xml b/indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%205.xml similarity index 100% rename from indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%205.xml rename to indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%205.xml diff --git a/indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%206.xml b/indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%206.xml similarity index 100% rename from indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%206.xml rename to indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%206.xml diff --git a/indra/newview/app_settings/windlight/skies/Daytime_shadows.xml b/indra/newview/app_settings/windlight/skies/Daytime%20shadows.xml similarity index 100% rename from indra/newview/app_settings/windlight/skies/Daytime_shadows.xml rename to indra/newview/app_settings/windlight/skies/Daytime%20shadows.xml diff --git a/indra/newview/app_settings/windlight/skies/Fairy%20blue%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Fairy%20blue%20%28Paulina%29.xml index a426aac29..4ec91f92e 100644 --- a/indra/newview/app_settings/windlight/skies/Fairy%20blue%20%28Paulina%29.xml +++ b/indra/newview/app_settings/windlight/skies/Fairy%20blue%20%28Paulina%29.xml @@ -1,141 +1,141 @@ - - - ambient - - 1.2300000190734863 - 1.2300000190734863 - 1.1914535760879517 - 0.40999999642372131 - - blue_density - - 0.2199999988079071 - 0.57999998331069946 - 0.55851858854293823 - 0.68000000715255737 - - blue_horizon - - 0.2159720099190805 - 0.36269319055529792 - 0.41333344578742803 - 0.62444435060024084 - - cloud_color - - 0.22616269560725816 - 0.22616269560725816 - 0.22616269560725816 - 0.99997991561308353 - - cloud_pos_density1 - - 0.4699999988079071 - 0.5 - 0.88000017954328535 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.41999998605913369 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.499400261264498 - 10.010999906567616 - - cloud_shadow - - 0.22999998927116394 - 0 - 0 - 1 - - density_multiplier - - 0.00011000000085914508 - 0 - 0 - 1 - - distance_multiplier - - 16.200000762939453 - 0 - 0 - 1 - - east_angle - 6.2831854820251465 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.8899999856948853 - 0 - 0 - 1 - - glow - - 0.19999980926513672 - 0.0010000000474974513 - -2.2000000476837158 - 1 - - haze_density - - 1.8899999856948853 - 0 - 0 - 1 - - haze_horizon - - 0 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 1.2670240323586768e-007 - 0.68911367654800415 - -0.72465324401855469 - 0 - - max_y - - 403 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.2999999523162842 - sun_angle - 2.3813273906707764 - sunlight_color - - 0.52803641557693481 - 0.52897685766220093 - 0.56999999284744263 - 0.18999999761581421 - - - + + + ambient + + 1.2300000190734863 + 1.2300000190734863 + 1.1914535760879517 + 0.40999999642372131 + + blue_density + + 0.2199999988079071 + 0.57999998331069946 + 0.55851858854293823 + 0.68000000715255737 + + blue_horizon + + 0.2159720099190805 + 0.36269319055529792 + 0.41333344578742803 + 0.62444435060024084 + + cloud_color + + 0.22616269560725816 + 0.22616269560725816 + 0.22616269560725816 + 0.99997991561308353 + + cloud_pos_density1 + + 0.4699999988079071 + 0.5 + 0.88000017954328535 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.41999998605913369 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499400261264498 + 10.010999906567616 + + cloud_shadow + + 0.22999998927116394 + 0 + 0 + 1 + + density_multiplier + + 0.00011000000085914508 + 0 + 0 + 1 + + distance_multiplier + + 16.200000762939453 + 0 + 0 + 1 + + east_angle + 6.2831854820251465 + enable_cloud_scroll + + 0 + 0 + + gamma + + 1.8899999856948853 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -2.2000000476837158 + 1 + + haze_density + + 1.8899999856948853 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 1.2670240323586768e-007 + 0.68911367654800415 + -0.72465324401855469 + 0 + + max_y + + 403 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 1.2999999523162842 + sun_angle + 2.3813273906707764 + sunlight_color + + 0.52803641557693481 + 0.52897685766220093 + 0.56999999284744263 + 0.18999999761581421 + + + diff --git a/indra/newview/app_settings/windlight/skies/Fairy%20dark%20blue%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Fairy%20dark%20blue%20%28Paulina%29.xml index 4fbdfe121..03805fa0b 100644 --- a/indra/newview/app_settings/windlight/skies/Fairy%20dark%20blue%20%28Paulina%29.xml +++ b/indra/newview/app_settings/windlight/skies/Fairy%20dark%20blue%20%28Paulina%29.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.58604651689529419 - 0.7813953161239624 - 1.0499999523162842 - 0.34999999403953552 - - blue_density - - 0.43999999761581421 - 0.43999999761581421 - 0.43999999761581421 - 0.2199999988079071 - - blue_horizon - - 0.2159720099190805 - 0.36269319055529792 - 0.41333344578742803 - 0.62444435060024084 - - cloud_color - - 0.22616269560725816 - 0.22616269560725816 - 0.22616269560725816 - 0.99997991561308353 - - cloud_pos_density1 - - 0.4699999988079071 - 0.5 - 0.88000017954328535 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.41999998605913369 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.499400261264498 - 10.010999906567616 - - cloud_shadow - - 0.22999998927116394 - 0 - 0 - 1 - - density_multiplier - - 0.0002899999963119626 - 0 - 0 - 1 - - distance_multiplier - - 16.200000762939453 - 0 - 0 - 1 - - east_angle - 1.1938052177429199 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.6200000047683716 - 0 - 0 - 1 - - glow - - 0.19999980926513672 - 0.0010000000474974513 - -2.2000000476837158 - 1 - - haze_density - - 1.8899999856948853 - 0 - 0 - 1 - - haze_horizon - - 0 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.9034002423286438 - 0.23649945855140686 - 0.35768145322799683 - 1 - - max_y - - 1047 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.2999999523162842 - sun_angle - 3.3803541660308838 - sunlight_color - - 2.3344762325286865 - 2.3386342525482178 - 2.5199999809265137 - 0.8399999737739563 - - - + + + ambient + + 0.58604651689529419 + 0.7813953161239624 + 1.0499999523162842 + 0.34999999403953552 + + blue_density + + 0.43999999761581421 + 0.43999999761581421 + 0.43999999761581421 + 0.2199999988079071 + + blue_horizon + + 0.2159720099190805 + 0.36269319055529792 + 0.41333344578742803 + 0.62444435060024084 + + cloud_color + + 0.22616269560725816 + 0.22616269560725816 + 0.22616269560725816 + 0.99997991561308353 + + cloud_pos_density1 + + 0.4699999988079071 + 0.5 + 0.88000017954328535 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.41999998605913369 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499400261264498 + 10.010999906567616 + + cloud_shadow + + 0.22999998927116394 + 0 + 0 + 1 + + density_multiplier + + 0.0002899999963119626 + 0 + 0 + 1 + + distance_multiplier + + 16.200000762939453 + 0 + 0 + 1 + + east_angle + 1.1938052177429199 + enable_cloud_scroll + + 0 + 0 + + gamma + + 1.6200000047683716 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -2.2000000476837158 + 1 + + haze_density + + 1.8899999856948853 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.9034002423286438 + 0.23649945855140686 + 0.35768145322799683 + 1 + + max_y + + 1047 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 1.2999999523162842 + sun_angle + 3.3803541660308838 + sunlight_color + + 2.3344762325286865 + 2.3386342525482178 + 2.5199999809265137 + 0.8399999737739563 + + + diff --git a/indra/newview/app_settings/windlight/skies/Fairy%20light%20pink%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Fairy%20light%20pink%20%28Paulina%29.xml index a3d67ac73..10189f112 100644 --- a/indra/newview/app_settings/windlight/skies/Fairy%20light%20pink%20%28Paulina%29.xml +++ b/indra/newview/app_settings/windlight/skies/Fairy%20light%20pink%20%28Paulina%29.xml @@ -1,141 +1,141 @@ - - - ambient - - 1.7400000095367432 - 1.4500001668930054 - 1.353333592414856 - 0.57999998331069946 - - blue_density - - 0.17032256722450256 - 0.47999998927116394 - 0.3449999988079071 - 0.23999999463558197 - - blue_horizon - - 0.93999999761581421 - 0.2199999988079071 - 0.25999999046325684 - 0.93999999761581421 - - cloud_color - - 0.22616269560725816 - 0.22616269560725816 - 0.22616269560725816 - 0.99997991561308353 - - cloud_pos_density1 - - 0.4699999988079071 - 0.5 - 0.88000017954328535 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.41999998605913369 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.499400261264498 - 10.010999906567616 - - cloud_shadow - - 0.22999998927116394 - 0 - 0 - 1 - - density_multiplier - - 0.00089999998454004526 - 0 - 0 - 1 - - distance_multiplier - - 4.0999999046325684 - 0 - 0 - 1 - - east_angle - 4.6495571136474609 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.2799999713897705 - 0 - 0 - 1 - - glow - - 0.19999980926513672 - 0.0010000000474974513 - -2.2000000476837158 - 1 - - haze_density - - 0.2199999988079071 - 0 - 0 - 1 - - haze_horizon - - 0.08999999612569809 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.72322285175323486 - 0.68911415338516235 - -0.045501336455345154 - 1 - - max_y - - 4000 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 2 - sun_angle - 3.9018585681915283 - sunlight_color - - 1.9521123170852661 - 2.0000483989715576 - 2.0999999046325684 - 0.69999998807907104 - - - + + + ambient + + 1.7400000095367432 + 1.4500001668930054 + 1.353333592414856 + 0.57999998331069946 + + blue_density + + 0.17032256722450256 + 0.47999998927116394 + 0.3449999988079071 + 0.23999999463558197 + + blue_horizon + + 0.93999999761581421 + 0.2199999988079071 + 0.25999999046325684 + 0.93999999761581421 + + cloud_color + + 0.22616269560725816 + 0.22616269560725816 + 0.22616269560725816 + 0.99997991561308353 + + cloud_pos_density1 + + 0.4699999988079071 + 0.5 + 0.88000017954328535 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.41999998605913369 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499400261264498 + 10.010999906567616 + + cloud_shadow + + 0.22999998927116394 + 0 + 0 + 1 + + density_multiplier + + 0.00089999998454004526 + 0 + 0 + 1 + + distance_multiplier + + 4.0999999046325684 + 0 + 0 + 1 + + east_angle + 4.6495571136474609 + enable_cloud_scroll + + 0 + 0 + + gamma + + 1.2799999713897705 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -2.2000000476837158 + 1 + + haze_density + + 0.2199999988079071 + 0 + 0 + 1 + + haze_horizon + + 0.08999999612569809 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.72322285175323486 + 0.68911415338516235 + -0.045501336455345154 + 1 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 2 + sun_angle + 3.9018585681915283 + sunlight_color + + 1.9521123170852661 + 2.0000483989715576 + 2.0999999046325684 + 0.69999998807907104 + + + diff --git a/indra/newview/app_settings/windlight/skies/Fairy%20warm%20pinks%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Fairy%20warm%20pinks%20%28Paulina%29.xml index 72d3345c4..bc0387bfa 100644 --- a/indra/newview/app_settings/windlight/skies/Fairy%20warm%20pinks%20%28Paulina%29.xml +++ b/indra/newview/app_settings/windlight/skies/Fairy%20warm%20pinks%20%28Paulina%29.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.68999993801116943 - 0.44999998807907104 - 0.42000001668930054 - 0.68999993801116943 - - blue_density - - 0.25714284181594849 - 0.71428567171096802 - 1 - 0.5 - - blue_horizon - - 0.56000000238418579 - 0.17999999225139618 - 0.25999999046325684 - 0.56000000238418579 - - cloud_color - - 0.22616269560725816 - 0.22616269560725816 - 0.22616269560725816 - 0.99997991561308353 - - cloud_pos_density1 - - 0.4699999988079071 - 0.5 - 0.88000017954328535 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.41999998605913369 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.499400261264498 - 10.010999906567616 - - cloud_shadow - - 0.22999998927116394 - 0 - 0 - 1 - - density_multiplier - - 0.00042999998549930751 - 0 - 0 - 1 - - distance_multiplier - - 9.5 - 0 - 0 - 1 - - east_angle - 0.81681406497955322 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1.8199999332427979 - 0 - 0 - 1 - - glow - - 0.19999980926513672 - 0.0010000000474974513 - -2.2000000476837158 - 1 - - haze_density - - 0.31999999284744263 - 0 - 0 - 1 - - haze_horizon - - 0.029999999329447746 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.63206756114959717 - 0.49818456172943115 - -0.59355098009109497 - 1 - - max_y - - 4000 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 2 - sun_angle - 5.7616815567016602 - sunlight_color - - 1.7400000095367432 - 1.5899999141693115 - 0.71999996900558472 - 1.7400000095367432 - - - + + + ambient + + 0.68999993801116943 + 0.44999998807907104 + 0.42000001668930054 + 0.68999993801116943 + + blue_density + + 0.25714284181594849 + 0.71428567171096802 + 1 + 0.5 + + blue_horizon + + 0.56000000238418579 + 0.17999999225139618 + 0.25999999046325684 + 0.56000000238418579 + + cloud_color + + 0.22616269560725816 + 0.22616269560725816 + 0.22616269560725816 + 0.99997991561308353 + + cloud_pos_density1 + + 0.4699999988079071 + 0.5 + 0.88000017954328535 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.41999998605913369 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499400261264498 + 10.010999906567616 + + cloud_shadow + + 0.22999998927116394 + 0 + 0 + 1 + + density_multiplier + + 0.00042999998549930751 + 0 + 0 + 1 + + distance_multiplier + + 9.5 + 0 + 0 + 1 + + east_angle + 0.81681406497955322 + enable_cloud_scroll + + 0 + 0 + + gamma + + 1.8199999332427979 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -2.2000000476837158 + 1 + + haze_density + + 0.31999999284744263 + 0 + 0 + 1 + + haze_horizon + + 0.029999999329447746 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.63206756114959717 + 0.49818456172943115 + -0.59355098009109497 + 1 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 2 + sun_angle + 5.7616815567016602 + sunlight_color + + 1.7400000095367432 + 1.5899999141693115 + 0.71999996900558472 + 1.7400000095367432 + + + diff --git a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20neutral.xml b/indra/newview/app_settings/windlight/skies/Free%27s%20Sunset.xml similarity index 63% rename from indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20neutral.xml rename to indra/newview/app_settings/windlight/skies/Free%27s%20Sunset.xml index e0cdfb172..15f674238 100644 --- a/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20neutral.xml +++ b/indra/newview/app_settings/windlight/skies/Free%27s%20Sunset.xml @@ -3,36 +3,36 @@ ambient 0.89999997615814209 + 0.62999999523162842 + 0.75 0.89999997615814209 - 0.89999997615814209 - 0.29999998211860657 blue_density - 0.91235297918319702 - 0.93999999761581421 - 0.88470596075057983 - 0.4699999988079071 + 0.19999998807907104 + 0.37999999523162842 + 0.81999999284744263 + 0.81999999284744263 blue_horizon - 0.68000000715255737 - 0.93999999761581421 - 1.4399999380111694 - 1.4399999380111694 + 0.14000000059604645 + 0.23999999463558197 + 0.34000000357627869 + 0.35999998450279236 cloud_color - 0.30162510275840759 - 0.30162510275840759 - 0.30162510275840759 - 0.75779753923416138 + 0 + 0.22999998927116394 + 1 + 1 cloud_pos_density1 1.6884100437164307 0.52609699964523315 - 0.92926150560379028 + 0.88893386161064514 1 cloud_pos_density2 @@ -44,39 +44,39 @@ cloud_scale - 0.41999998688697815 + 0.41999998688697787 0 0 1 cloud_scroll_rate - 10.376492500305176 + 10.477110118587461 10.01099967956543 cloud_shadow - 0.26999998092651367 + 0.39999997615814209 0 0 1 density_multiplier - 0.00013000000035390258 + 0.0004400000034365803 0 0 1 distance_multiplier - 0.69999998807907104 + 0 0 0 1 east_angle - 0 + 6.2203531265258789 enable_cloud_scroll 1 @@ -84,42 +84,42 @@ gamma - 1.5499999523162842 + 1.6899999380111694 0 0 1 glow - 15.799999237060547 + 5.9999990463256836 0.0010000000474974513 - -0.64999997615814209 + -0.59999996423721313 1 haze_density - 0.96999996900558472 + 0.75999999046325684 0 0 1 haze_horizon - 0 + 0.15999999642372131 0.19915600121021271 0.19915600121021271 1 lightnorm - -0 - 0.49818512797355652 - 0.86707067489624023 + -0.062779694795608521 + 0.01884840801358223 + -0.99784946441650391 0 max_y - 295 + 640.11296108365059 0 0 1 @@ -127,15 +127,15 @@ preset_num 22 star_brightness - 0 + 0.14999999105930328 sun_angle - 0.52150440216064453 + 3.1227431297302246 sunlight_color - 0.32999998331069946 - 0.26999998092651367 - 0.26999998092651367 - 0.51999998092651367 + 3 + 2.5199999809265137 + 3 + 3 diff --git a/indra/newview/app_settings/windlight/skies/Magic_Hour.xml b/indra/newview/app_settings/windlight/skies/Magic%20Hour.xml similarity index 100% rename from indra/newview/app_settings/windlight/skies/Magic_Hour.xml rename to indra/newview/app_settings/windlight/skies/Magic%20Hour.xml diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Black%20fog%201.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Black%20fog%201.xml index 4dee8354e..e6241d272 100644 --- a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Black%20fog%201.xml +++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Black%20fog%201.xml @@ -1,141 +1,141 @@ - - - ambient - - 0 - 0 - 0 - 0 - - blue_density - - 0.5 - 0.5 - 0.5 - 0.25 - - blue_horizon - - 0.56000000238418579 - 0.56000000238418579 - 0.56000000238418579 - 0.2800000011920929 - - cloud_color - - 0.22617273092134837 - 0.2261830306064212 - 0.22618354559006093 - 1 - - cloud_pos_density1 - - 0.5 - 0.5 - 1 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.12499716758729562 - 1 - - cloud_scale - - 0.22999998927116394 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.499370784775238 - 10.011009025563908 - - cloud_shadow - - 0.26999998092651367 - 0 - 0 - 1 - - density_multiplier - - 0.00089999998454004526 - 0 - 0 - 1 - - distance_multiplier - - 100 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.19999998807907104 - 0 - 0 - 1 - - glow - - 20 - 0.0010000000474974513 - -2.5 - 1 - - haze_density - - 0 - 0 - 0 - 1 - - haze_horizon - - 0 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0 - 1 - -4.3711388286737929e-008 - 0 - - max_y - - 4000 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 2 - sun_angle - 1.5707963705062866 - sunlight_color - - 3 - 3 - 3 - 1 - - - + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 0.5 + 0.5 + 0.5 + 0.25 + + blue_horizon + + 0.56000000238418579 + 0.56000000238418579 + 0.56000000238418579 + 0.2800000011920929 + + cloud_color + + 0.22617273092134837 + 0.2261830306064212 + 0.22618354559006093 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.12499716758729562 + 1 + + cloud_scale + + 0.22999998927116394 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499370784775238 + 10.011009025563908 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00089999998454004526 + 0 + 0 + 1 + + distance_multiplier + + 100 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 0 + 0 + + gamma + + 0.19999998807907104 + 0 + 0 + 1 + + glow + + 20 + 0.0010000000474974513 + -2.5 + 1 + + haze_density + + 0 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 1 + -4.3711388286737929e-008 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 2 + sun_angle + 1.5707963705062866 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Black%20fog%202.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Black%20fog%202.xml index ef93fdc08..b906b0f4e 100644 --- a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Black%20fog%202.xml +++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Black%20fog%202.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.29999998211860657 - 0.29999998211860657 - 0.29999998211860657 - 0.099999994039535522 - - blue_density - - 0.5 - 0.5 - 0.5 - 0.25 - - blue_horizon - - 0.56000000238418579 - 0.56000000238418579 - 0.56000000238418579 - 0.2800000011920929 - - cloud_color - - 0 - 0 - 0 - 0 - - cloud_pos_density1 - - 0 - 0 - 0 - 1 - - cloud_pos_density2 - - 0 - 0 - 0 - 1 - - cloud_scale - - 0.0099999997764825821 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.499370784775238 - 10.011009025563908 - - cloud_shadow - - 0 - 0 - 0 - 1 - - density_multiplier - - 0.00089999998454004526 - 0 - 0 - 1 - - distance_multiplier - - 100 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.19999998807907104 - 0 - 0 - 1 - - glow - - 0.19999980926513672 - 0.0010000000474974513 - -2.5 - 1 - - haze_density - - 0 - 0 - 0 - 1 - - haze_horizon - - 0 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0 - 1 - -4.3711388286737929e-008 - 0 - - max_y - - 4000 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 1.5707963705062866 - sunlight_color - - 3 - 3 - 3 - 1 - - - + + + ambient + + 0.29999998211860657 + 0.29999998211860657 + 0.29999998211860657 + 0.099999994039535522 + + blue_density + + 0.5 + 0.5 + 0.5 + 0.25 + + blue_horizon + + 0.56000000238418579 + 0.56000000238418579 + 0.56000000238418579 + 0.2800000011920929 + + cloud_color + + 0 + 0 + 0 + 0 + + cloud_pos_density1 + + 0 + 0 + 0 + 1 + + cloud_pos_density2 + + 0 + 0 + 0 + 1 + + cloud_scale + + 0.0099999997764825821 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499370784775238 + 10.011009025563908 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00089999998454004526 + 0 + 0 + 1 + + distance_multiplier + + 100 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 0 + 0 + + gamma + + 0.19999998807907104 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -2.5 + 1 + + haze_density + + 0 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 1 + -4.3711388286737929e-008 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 1.5707963705062866 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20blue.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20blue.xml index 69a23e7f9..24e69927b 100644 --- a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20blue.xml +++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20blue.xml @@ -1,141 +1,141 @@ - - - ambient - - 0 - 0 - 3 - 3 - - blue_density - - 0 - 0 - 2 - 2 - - blue_horizon - - 0 - 0 - 2 - 2 - - cloud_color - - 0 - 1 - 0 - 1 - - cloud_pos_density1 - - 1 - 1 - 1 - 1 - - cloud_pos_density2 - - 1 - 1 - 1 - 1 - - cloud_scale - - 1 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.8000001907348633 - 8.9899997711181641 - - cloud_shadow - - 0 - 0 - 0 - 1 - - density_multiplier - - 0.00026999998954124749 - 0 - 0 - 1 - - distance_multiplier - - 100 - 0 - 0 - 1 - - east_angle - 2.6389377117156982 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.0099999997764825821 - 0 - 0 - 1 - - glow - - 20 - 0.0010000000474974513 - 0 - 1 - - haze_density - - 0.0099999997764825821 - 0 - 0 - 1 - - haze_horizon - - 1 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.48175370693206787 - 0 - 0.87630659341812134 - 0 - - max_y - - 1 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 3.2107079029083252 - sunlight_color - - 0 - 0 - 3 - 3 - - - + + + ambient + + 0 + 0 + 3 + 3 + + blue_density + + 0 + 0 + 2 + 2 + + blue_horizon + + 0 + 0 + 2 + 2 + + cloud_color + + 0 + 1 + 0 + 1 + + cloud_pos_density1 + + 1 + 1 + 1 + 1 + + cloud_pos_density2 + + 1 + 1 + 1 + 1 + + cloud_scale + + 1 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.8000001907348633 + 8.9899997711181641 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00026999998954124749 + 0 + 0 + 1 + + distance_multiplier + + 100 + 0 + 0 + 1 + + east_angle + 2.6389377117156982 + enable_cloud_scroll + + 0 + 0 + + gamma + + 0.0099999997764825821 + 0 + 0 + 1 + + glow + + 20 + 0.0010000000474974513 + 0 + 1 + + haze_density + + 0.0099999997764825821 + 0 + 0 + 1 + + haze_horizon + + 1 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.48175370693206787 + 0 + 0.87630659341812134 + 0 + + max_y + + 1 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 3.2107079029083252 + sunlight_color + + 0 + 0 + 3 + 3 + + + diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20extreme.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20extreme.xml index 09d9c3546..f2b902814 100644 --- a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20extreme.xml +++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20extreme.xml @@ -1,141 +1,141 @@ - - - ambient - - 3 - 3 - 3 - 3 - - blue_density - - 2 - 2 - 2 - 2 - - blue_horizon - - 2 - 2 - 2 - 2 - - cloud_color - - 1 - 1 - 1 - 1 - - cloud_pos_density1 - - 1 - 1 - 1 - 1 - - cloud_pos_density2 - - 1 - 1 - 1 - 1 - - cloud_scale - - 1 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.8000001907348633 - 8.9899997711181641 - - cloud_shadow - - 0 - 0 - 0 - 1 - - density_multiplier - - 0.00089999998454004526 - 0 - 0 - 1 - - distance_multiplier - - 100 - 0 - 0 - 1 - - east_angle - 3.1415927410125732 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.0099999997764825821 - 0 - 0 - 1 - - glow - - 0.19999980926513672 - 0.0010000000474974513 - -2.5 - 1 - - haze_density - - 0 - 0 - 0 - 1 - - haze_horizon - - 0 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -8.7422776573475858e-008 - 0 - 1 - 0 - - max_y - - 1 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 3.1415927410125732 - sunlight_color - - 3 - 3 - 3 - 3 - - - + + + ambient + + 3 + 3 + 3 + 3 + + blue_density + + 2 + 2 + 2 + 2 + + blue_horizon + + 2 + 2 + 2 + 2 + + cloud_color + + 1 + 1 + 1 + 1 + + cloud_pos_density1 + + 1 + 1 + 1 + 1 + + cloud_pos_density2 + + 1 + 1 + 1 + 1 + + cloud_scale + + 1 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.8000001907348633 + 8.9899997711181641 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00089999998454004526 + 0 + 0 + 1 + + distance_multiplier + + 100 + 0 + 0 + 1 + + east_angle + 3.1415927410125732 + enable_cloud_scroll + + 0 + 0 + + gamma + + 0.0099999997764825821 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -2.5 + 1 + + haze_density + + 0 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -8.7422776573475858e-008 + 0 + 1 + 0 + + max_y + + 1 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 3.1415927410125732 + sunlight_color + + 3 + 3 + 3 + 3 + + + diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20green.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20green.xml index 9343abe71..712cbe360 100644 --- a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20green.xml +++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20green.xml @@ -1,141 +1,141 @@ - - - ambient - - 0 - 3 - 0 - 3 - - blue_density - - 0 - 2 - 0 - 2 - - blue_horizon - - 0 - 2 - 0 - 2 - - cloud_color - - 0 - 1 - 0 - 1 - - cloud_pos_density1 - - 1 - 1 - 1 - 1 - - cloud_pos_density2 - - 1 - 1 - 1 - 1 - - cloud_scale - - 1 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.8000001907348633 - 8.9899997711181641 - - cloud_shadow - - 0 - 0 - 0 - 1 - - density_multiplier - - 0.00026999998954124749 - 0 - 0 - 1 - - distance_multiplier - - 100 - 0 - 0 - 1 - - east_angle - 2.6389377117156982 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.0099999997764825821 - 0 - 0 - 1 - - glow - - 20 - 0.0010000000474974513 - 0 - 1 - - haze_density - - 0.0099999997764825821 - 0 - 0 - 1 - - haze_horizon - - 1 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.48175376653671265 - 0 - 0.87630665302276611 - 0 - - max_y - - 1 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 3.2107079029083252 - sunlight_color - - 0 - 3 - 0 - 3 - - - + + + ambient + + 0 + 3 + 0 + 3 + + blue_density + + 0 + 2 + 0 + 2 + + blue_horizon + + 0 + 2 + 0 + 2 + + cloud_color + + 0 + 1 + 0 + 1 + + cloud_pos_density1 + + 1 + 1 + 1 + 1 + + cloud_pos_density2 + + 1 + 1 + 1 + 1 + + cloud_scale + + 1 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.8000001907348633 + 8.9899997711181641 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00026999998954124749 + 0 + 0 + 1 + + distance_multiplier + + 100 + 0 + 0 + 1 + + east_angle + 2.6389377117156982 + enable_cloud_scroll + + 0 + 0 + + gamma + + 0.0099999997764825821 + 0 + 0 + 1 + + glow + + 20 + 0.0010000000474974513 + 0 + 1 + + haze_density + + 0.0099999997764825821 + 0 + 0 + 1 + + haze_horizon + + 1 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.48175376653671265 + 0 + 0.87630665302276611 + 0 + + max_y + + 1 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 3.2107079029083252 + sunlight_color + + 0 + 3 + 0 + 3 + + + diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20red.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20red.xml index 0ce00b1e8..adc5fd399 100644 --- a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20red.xml +++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20red.xml @@ -1,141 +1,141 @@ - - - ambient - - 3 - 0 - 0 - 3 - - blue_density - - 2 - 0 - 0 - 2 - - blue_horizon - - 2 - 0 - 0 - 2 - - cloud_color - - 0 - 1 - 0 - 1 - - cloud_pos_density1 - - 1 - 1 - 1 - 1 - - cloud_pos_density2 - - 1 - 1 - 1 - 1 - - cloud_scale - - 1 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.8000001907348633 - 8.9899997711181641 - - cloud_shadow - - 0 - 0 - 0 - 1 - - density_multiplier - - 0.00026999998954124749 - 0 - 0 - 1 - - distance_multiplier - - 100 - 0 - 0 - 1 - - east_angle - 2.6389377117156982 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.0099999997764825821 - 0 - 0 - 1 - - glow - - 20 - 0.0010000000474974513 - 0 - 1 - - haze_density - - 0.0099999997764825821 - 0 - 0 - 1 - - haze_horizon - - 1 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.48175376653671265 - 0 - 0.87630665302276611 - 0 - - max_y - - 1 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 3.2107079029083252 - sunlight_color - - 3 - 0 - 0 - 3 - - - + + + ambient + + 3 + 0 + 0 + 3 + + blue_density + + 2 + 0 + 0 + 2 + + blue_horizon + + 2 + 0 + 0 + 2 + + cloud_color + + 0 + 1 + 0 + 1 + + cloud_pos_density1 + + 1 + 1 + 1 + 1 + + cloud_pos_density2 + + 1 + 1 + 1 + 1 + + cloud_scale + + 1 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.8000001907348633 + 8.9899997711181641 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00026999998954124749 + 0 + 0 + 1 + + distance_multiplier + + 100 + 0 + 0 + 1 + + east_angle + 2.6389377117156982 + enable_cloud_scroll + + 0 + 0 + + gamma + + 0.0099999997764825821 + 0 + 0 + 1 + + glow + + 20 + 0.0010000000474974513 + 0 + 1 + + haze_density + + 0.0099999997764825821 + 0 + 0 + 1 + + haze_horizon + + 1 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.48175376653671265 + 0 + 0.87630665302276611 + 0 + + max_y + + 1 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 3.2107079029083252 + sunlight_color + + 3 + 0 + 0 + 3 + + + diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20underground%20comic.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20underground%20comic.xml index 62ebaa233..189bd3fe2 100644 --- a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20underground%20comic.xml +++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20Drawing%20underground%20comic.xml @@ -1,141 +1,141 @@ - - - ambient - - 3 - 3 - 3 - 3 - - blue_density - - 0.35000002384185791 - 0.28999707102775574 - 0.57999998331069946 - 0.57999998331069946 - - blue_horizon - - 0.56000000238418579 - 0.42976745963096619 - 0.2734883725643158 - 0.56000000238418579 - - cloud_color - - 1 - 1 - 1 - 1 - - cloud_pos_density1 - - 1 - 1 - 1 - 1 - - cloud_pos_density2 - - 1 - 1 - 1 - 1 - - cloud_scale - - 1 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.8000001907348633 - 8.9899997711181641 - - cloud_shadow - - 0 - 0 - 0 - 1 - - density_multiplier - - 0.00020999999833293259 - 0 - 0 - 1 - - distance_multiplier - - 24.200000762939453 - 0 - 0 - 1 - - east_angle - 3.1415927410125732 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.0099999997764825821 - 0 - 0 - 1 - - glow - - 0.19999980926513672 - 0.0010000000474974513 - -2.5 - 1 - - haze_density - - 0.56000000238418579 - 0 - 0 - 1 - - haze_horizon - - 0.2199999988079071 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -8.7422776573475858e-008 - 0 - 1 - 0 - - max_y - - 632 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 3.1415927410125732 - sunlight_color - - 3 - 3 - 3 - 3 - - - + + + ambient + + 3 + 3 + 3 + 3 + + blue_density + + 0.35000002384185791 + 0.28999707102775574 + 0.57999998331069946 + 0.57999998331069946 + + blue_horizon + + 0.56000000238418579 + 0.42976745963096619 + 0.2734883725643158 + 0.56000000238418579 + + cloud_color + + 1 + 1 + 1 + 1 + + cloud_pos_density1 + + 1 + 1 + 1 + 1 + + cloud_pos_density2 + + 1 + 1 + 1 + 1 + + cloud_scale + + 1 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.8000001907348633 + 8.9899997711181641 + + cloud_shadow + + 0 + 0 + 0 + 1 + + density_multiplier + + 0.00020999999833293259 + 0 + 0 + 1 + + distance_multiplier + + 24.200000762939453 + 0 + 0 + 1 + + east_angle + 3.1415927410125732 + enable_cloud_scroll + + 0 + 0 + + gamma + + 0.0099999997764825821 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + -2.5 + 1 + + haze_density + + 0.56000000238418579 + 0 + 0 + 1 + + haze_horizon + + 0.2199999988079071 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -8.7422776573475858e-008 + 0 + 1 + 0 + + max_y + + 632 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 3.1415927410125732 + sunlight_color + + 3 + 3 + 3 + 3 + + + diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20fog.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20fog.xml index 088f09cbb..4ecf8c2a6 100644 --- a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20fog.xml +++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20fog.xml @@ -1,141 +1,141 @@ - - - ambient - - 0 - 0 - 0 - 0 - - blue_density - - 0.39999997615814209 - 0.39999997615814209 - 0.39999997615814209 - 0.19999998807907104 - - blue_horizon - - 1 - 1 - 1 - 0.5 - - cloud_color - - 0.22617273092134837 - 0.2261830306064212 - 0.22618354559006093 - 1 - - cloud_pos_density1 - - 0.5 - 0.5 - 1 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.12499716758729562 - 1 - - cloud_scale - - 0.22999998927116394 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.499370784775238 - 10.011009025563908 - - cloud_shadow - - 0.26999998092651367 - 0 - 0 - 1 - - density_multiplier - - 0.00089999998454004526 - 0 - 0 - 1 - - distance_multiplier - - 100 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1 - 0 - 0 - 1 - - glow - - 0.19999980926513672 - 0.0010000000474974513 - 0 - 1 - - haze_density - - 0.5 - 0 - 0 - 1 - - haze_horizon - - 0.32999998331069946 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0 - 1 - -4.3711388286737929e-008 - 0 - - max_y - - 4000 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 1.5707963705062866 - sunlight_color - - 3 - 3 - 3 - 1 - - - + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 0.39999997615814209 + 0.39999997615814209 + 0.39999997615814209 + 0.19999998807907104 + + blue_horizon + + 1 + 1 + 1 + 0.5 + + cloud_color + + 0.22617273092134837 + 0.2261830306064212 + 0.22618354559006093 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.12499716758729562 + 1 + + cloud_scale + + 0.22999998927116394 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499370784775238 + 10.011009025563908 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00089999998454004526 + 0 + 0 + 1 + + distance_multiplier + + 100 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 0 + 0 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 0.19999980926513672 + 0.0010000000474974513 + 0 + 1 + + haze_density + + 0.5 + 0 + 0 + 1 + + haze_horizon + + 0.32999998331069946 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 1 + -4.3711388286737929e-008 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 1.5707963705062866 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20gray.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20gray.xml index fbbf36485..8f4ade046 100644 --- a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20gray.xml +++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20gray.xml @@ -1,141 +1,141 @@ - - - ambient - - 0 - 0 - 0 - 0 - - blue_density - - 2 - 2 - 2 - 1 - - blue_horizon - - 2 - 2 - 2 - 1 - - cloud_color - - 0.22617273092134837 - 0.2261830306064212 - 0.22618354559006093 - 1 - - cloud_pos_density1 - - 0.5 - 0.5 - 1 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.12499716758729562 - 1 - - cloud_scale - - 0.22999998927116394 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.499370784775238 - 10.011009025563908 - - cloud_shadow - - 0.26999998092651367 - 0 - 0 - 1 - - density_multiplier - - 0.00089999998454004526 - 0 - 0 - 1 - - distance_multiplier - - 100 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1 - 0 - 0 - 1 - - glow - - 20 - 0.0010000000474974513 - 0 - 1 - - haze_density - - 1 - 0 - 0 - 1 - - haze_horizon - - 0 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0 - 0 - 1 - 0 - - max_y - - 1 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 0 - sunlight_color - - 3 - 3 - 3 - 1 - - - + + + ambient + + 0 + 0 + 0 + 0 + + blue_density + + 2 + 2 + 2 + 1 + + blue_horizon + + 2 + 2 + 2 + 1 + + cloud_color + + 0.22617273092134837 + 0.2261830306064212 + 0.22618354559006093 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.12499716758729562 + 1 + + cloud_scale + + 0.22999998927116394 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499370784775238 + 10.011009025563908 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00089999998454004526 + 0 + 0 + 1 + + distance_multiplier + + 100 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 0 + 0 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 20 + 0.0010000000474974513 + 0 + 1 + + haze_density + + 1 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0 + 1 + 0 + + max_y + + 1 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 0 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20green.xml b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20green.xml index 8c5e8f119..8dcfbc95a 100644 --- a/indra/newview/app_settings/windlight/skies/Orac%20%2D%20green.xml +++ b/indra/newview/app_settings/windlight/skies/Orac%20%2D%20green.xml @@ -1,141 +1,141 @@ - - - ambient - - 0 - 1.2599999904632568 - 0 - 1.2599999904632568 - - blue_density - - 0.019999999552965164 - 0.019999999552965164 - 0.019999999552965164 - 0.0099999997764825821 - - blue_horizon - - 0 - 0 - 0 - 0 - - cloud_color - - 0 - 0.5 - 0 - 0.5 - - cloud_pos_density1 - - 0 - 0 - 0.5 - 1 - - cloud_pos_density2 - - 0 - 0 - 0 - 1 - - cloud_scale - - 1 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.5 - 0 - 0 - 1 - - density_multiplier - - 0 - 0 - 0 - 1 - - distance_multiplier - - 0 - 0 - 0 - 1 - - east_angle - 0.062831856310367584 - enable_cloud_scroll - - 0 - 0 - - gamma - - 1 - 0 - 0 - 1 - - glow - - 20 - 0.0010000000474974513 - 0 - 1 - - haze_density - - 0 - 0 - 0 - 1 - - haze_horizon - - 0 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.05404643714427948 - 0.509041428565979 - 0.85904353857040405 - 0 - - max_y - - 1 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 0.53407078981399536 - sunlight_color - - 0 - 1.1399999856948853 - 0 - 1.1399999856948853 - - - + + + ambient + + 0 + 1.2599999904632568 + 0 + 1.2599999904632568 + + blue_density + + 0.019999999552965164 + 0.019999999552965164 + 0.019999999552965164 + 0.0099999997764825821 + + blue_horizon + + 0 + 0 + 0 + 0 + + cloud_color + + 0 + 0.5 + 0 + 0.5 + + cloud_pos_density1 + + 0 + 0 + 0.5 + 1 + + cloud_pos_density2 + + 0 + 0 + 0 + 1 + + cloud_scale + + 1 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.5 + 0 + 0 + 1 + + density_multiplier + + 0 + 0 + 0 + 1 + + distance_multiplier + + 0 + 0 + 0 + 1 + + east_angle + 0.062831856310367584 + enable_cloud_scroll + + 0 + 0 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 20 + 0.0010000000474974513 + 0 + 1 + + haze_density + + 0 + 0 + 0 + 1 + + haze_horizon + + 0 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.05404643714427948 + 0.509041428565979 + 0.85904353857040405 + 0 + + max_y + + 1 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 0.53407078981399536 + sunlight_color + + 0 + 1.1399999856948853 + 0 + 1.1399999856948853 + + + diff --git a/indra/newview/app_settings/windlight/skies/PaperSnow.xml b/indra/newview/app_settings/windlight/skies/PaperSnow.xml index a34ac8df6..6165644e5 100644 --- a/indra/newview/app_settings/windlight/skies/PaperSnow.xml +++ b/indra/newview/app_settings/windlight/skies/PaperSnow.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.62999999523162842 - 0.62999999523162842 - 0.62999999523162842 - 0.62999999523162842 - - blue_density - - 0.56000000238418579 - 0.56000000238418579 - 0.23999999463558197 - 0.56000000238418579 - - blue_horizon - - 0.59999996423721313 - 0.59999996423721313 - 0.68000000715255737 - 0.74000000953674316 - - cloud_color - - 0.12862999737262726 - 0.12862999737262726 - 0.12862999737262726 - 1 - - cloud_pos_density1 - - 0.88419097661972046 - 0.53047597408294678 - 0.4270470142364502 - 1 - - cloud_pos_density2 - - 0.38419300317764282 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.41999998688697815 - 0 - 0 - 1 - - cloud_scroll_rate - - 10 - 10 - - cloud_shadow - - 0.61711597442626953 - 0 - 0 - 1 - - density_multiplier - - 0.00013000000035390258 - 0 - 0 - 1 - - distance_multiplier - - 16.200000762939453 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 1 - 1 - - gamma - - 0.94999998807907104 - 0 - 0 - 1 - - glow - - 6.4079799652099609 - 0.0012815999798476696 - -0.44999998807907104 - 1 - - haze_density - - 4 - 0 - 0 - 1 - - haze_horizon - - 0.12999999523162842 - 0.21744099259376526 - 0.21744099259376526 - 1 - - lightnorm - - 0 - 0.25477027893066406 - -0.96700161695480347 - 1 - - max_y - - 4000 - 0 - 0 - 1 - - preset_num - 2 - star_brightness - 0 - sun_angle - 6.0255751609802246 - sunlight_color - - 3 - 3 - 3 - 1 - - - + + + ambient + + 0.62999999523162842 + 0.62999999523162842 + 0.62999999523162842 + 0.62999999523162842 + + blue_density + + 0.56000000238418579 + 0.56000000238418579 + 0.23999999463558197 + 0.56000000238418579 + + blue_horizon + + 0.59999996423721313 + 0.59999996423721313 + 0.68000000715255737 + 0.74000000953674316 + + cloud_color + + 0.12862999737262726 + 0.12862999737262726 + 0.12862999737262726 + 1 + + cloud_pos_density1 + + 0.88419097661972046 + 0.53047597408294678 + 0.4270470142364502 + 1 + + cloud_pos_density2 + + 0.38419300317764282 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10 + 10 + + cloud_shadow + + 0.61711597442626953 + 0 + 0 + 1 + + density_multiplier + + 0.00013000000035390258 + 0 + 0 + 1 + + distance_multiplier + + 16.200000762939453 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.94999998807907104 + 0 + 0 + 1 + + glow + + 6.4079799652099609 + 0.0012815999798476696 + -0.44999998807907104 + 1 + + haze_density + + 4 + 0 + 0 + 1 + + haze_horizon + + 0.12999999523162842 + 0.21744099259376526 + 0.21744099259376526 + 1 + + lightnorm + + 0 + 0.25477027893066406 + -0.96700161695480347 + 1 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 2 + star_brightness + 0 + sun_angle + 6.0255751609802246 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Abracadabra.xml b/indra/newview/app_settings/windlight/skies/Places%20Abracadabra.xml index 21e73f0a4..9d450d997 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Abracadabra.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Abracadabra.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.35999998450279236 - 0.25200003385543823 - 0 - 0.11999999731779099 - - blue_density - - 0.97999995946884155 - 0.97999995946884155 - 0.97999995946884155 - 0.48999997973442078 - - blue_horizon - - 0.47999998927116394 - 0.29999998211860657 - 0.2800000011920929 - 0.51999998092651367 - - cloud_color - - 0.50999999046325684 - 0.50999999046325684 - 0.50999999046325684 - 1 - - cloud_pos_density1 - - 0.5 - 0.5 - 1 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.079999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.25999999046325684 - 0 - 0 - 1 - - density_multiplier - - 0.00022000000171829015 - 0 - 0 - 1 - - distance_multiplier - - 31.100000381469727 - 0 - 0 - 1 - - east_angle - 4.3353981971740723 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1 - 0 - 0 - 1 - - glow - - 5 - 0.0010000000474974513 - -0.33000001311302185 - 1 - - haze_density - - 1.2699999809265137 - 0 - 0 - 1 - - haze_horizon - - 0.2800000011920929 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.86661803722381592 - 0.36227512359619141 - 0.34311801195144653 - 0 - - max_y - - 752 - 0 - 0 - 1 - - preset_num - 21 - star_brightness - 0 - sun_angle - 2.7708849906921387 - sunlight_color - - 1.3799998760223389 - 1.3799998760223389 - 1.3799998760223389 - 0.45999997854232788 - - - + + + ambient + + 0.35999998450279236 + 0.25200003385543823 + 0 + 0.11999999731779099 + + blue_density + + 0.97999995946884155 + 0.97999995946884155 + 0.97999995946884155 + 0.48999997973442078 + + blue_horizon + + 0.47999998927116394 + 0.29999998211860657 + 0.2800000011920929 + 0.51999998092651367 + + cloud_color + + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.25999999046325684 + 0 + 0 + 1 + + density_multiplier + + 0.00022000000171829015 + 0 + 0 + 1 + + distance_multiplier + + 31.100000381469727 + 0 + 0 + 1 + + east_angle + 4.3353981971740723 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.33000001311302185 + 1 + + haze_density + + 1.2699999809265137 + 0 + 0 + 1 + + haze_horizon + + 0.2800000011920929 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.86661803722381592 + 0.36227512359619141 + 0.34311801195144653 + 0 + + max_y + + 752 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.7708849906921387 + sunlight_color + + 1.3799998760223389 + 1.3799998760223389 + 1.3799998760223389 + 0.45999997854232788 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Abracadabra2.xml b/indra/newview/app_settings/windlight/skies/Places%20Abracadabra2.xml index 55158516c..079611232 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Abracadabra2.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Abracadabra2.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.35999998450279236 - 0.25200003385543823 - 0 - 0.11999999731779099 - - blue_density - - 0.97999995946884155 - 0.97999995946884155 - 0.97999995946884155 - 0.48999997973442078 - - blue_horizon - - 0.47999998927116394 - 0.53999996185302734 - 0.45999997854232788 - 0.53999996185302734 - - cloud_color - - 0.50999999046325684 - 0.50999999046325684 - 0.50999999046325684 - 1 - - cloud_pos_density1 - - 0.5 - 0.5 - 1 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.079999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.25999999046325684 - 0 - 0 - 1 - - density_multiplier - - 0.00013000000035390258 - 0 - 0 - 1 - - distance_multiplier - - 24.30000114440918 - 0 - 0 - 1 - - east_angle - 5.9061942100524902 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.6899999380111694 - 0 - 0 - 1 - - glow - - 15.59999942779541 - 0.0010000000474974513 - -0.59999996423721313 - 1 - - haze_density - - 1.2699999809265137 - 0 - 0 - 1 - - haze_horizon - - 0.26999998092651367 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.34311828017234802 - 0.36227512359619141 - -0.86661791801452637 - 0 - - max_y - - 483 - 0 - 0 - 1 - - preset_num - 21 - star_brightness - 0 - sun_angle - 2.7708849906921387 - sunlight_color - - 1.3799998760223389 - 1.3799998760223389 - 1.3799998760223389 - 0.45999997854232788 - - - + + + ambient + + 0.35999998450279236 + 0.25200003385543823 + 0 + 0.11999999731779099 + + blue_density + + 0.97999995946884155 + 0.97999995946884155 + 0.97999995946884155 + 0.48999997973442078 + + blue_horizon + + 0.47999998927116394 + 0.53999996185302734 + 0.45999997854232788 + 0.53999996185302734 + + cloud_color + + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.25999999046325684 + 0 + 0 + 1 + + density_multiplier + + 0.00013000000035390258 + 0 + 0 + 1 + + distance_multiplier + + 24.30000114440918 + 0 + 0 + 1 + + east_angle + 5.9061942100524902 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.6899999380111694 + 0 + 0 + 1 + + glow + + 15.59999942779541 + 0.0010000000474974513 + -0.59999996423721313 + 1 + + haze_density + + 1.2699999809265137 + 0 + 0 + 1 + + haze_horizon + + 0.26999998092651367 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.34311828017234802 + 0.36227512359619141 + -0.86661791801452637 + 0 + + max_y + + 483 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.7708849906921387 + sunlight_color + + 1.3799998760223389 + 1.3799998760223389 + 1.3799998760223389 + 0.45999997854232788 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Abracadabra3.xml b/indra/newview/app_settings/windlight/skies/Places%20Abracadabra3.xml index 9b5388ab6..f6e1f1793 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Abracadabra3.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Abracadabra3.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.35999998450279236 - 0.25200003385543823 - 0 - 0.11999999731779099 - - blue_density - - 0.97999995946884155 - 0.97999995946884155 - 0.97999995946884155 - 0.48999997973442078 - - blue_horizon - - 0.47999998927116394 - 0.53999996185302734 - 0.45999997854232788 - 0.53999996185302734 - - cloud_color - - 0.50999999046325684 - 0.50999999046325684 - 0.50999999046325684 - 1 - - cloud_pos_density1 - - 0.5 - 0.5 - 1 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.079999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.25999999046325684 - 0 - 0 - 1 - - density_multiplier - - 0.00013000000035390258 - 0 - 0 - 1 - - distance_multiplier - - 24.30000114440918 - 0 - 0 - 1 - - east_angle - 5.026547908782959 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.6899999380111694 - 0 - 0 - 1 - - glow - - 15.59999942779541 - 0.0010000000474974513 - -0.59999996423721313 - 1 - - haze_density - - 1.2699999809265137 - 0 - 0 - 1 - - haze_horizon - - 0.26999998092651367 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.88645249605178833 - 0.36227512359619141 - -0.28802555799484253 - 0 - - max_y - - 483 - 0 - 0 - 1 - - preset_num - 21 - star_brightness - 0 - sun_angle - 2.7708849906921387 - sunlight_color - - 1.3799998760223389 - 1.3799998760223389 - 1.3799998760223389 - 0.45999997854232788 - - - + + + ambient + + 0.35999998450279236 + 0.25200003385543823 + 0 + 0.11999999731779099 + + blue_density + + 0.97999995946884155 + 0.97999995946884155 + 0.97999995946884155 + 0.48999997973442078 + + blue_horizon + + 0.47999998927116394 + 0.53999996185302734 + 0.45999997854232788 + 0.53999996185302734 + + cloud_color + + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.25999999046325684 + 0 + 0 + 1 + + density_multiplier + + 0.00013000000035390258 + 0 + 0 + 1 + + distance_multiplier + + 24.30000114440918 + 0 + 0 + 1 + + east_angle + 5.026547908782959 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.6899999380111694 + 0 + 0 + 1 + + glow + + 15.59999942779541 + 0.0010000000474974513 + -0.59999996423721313 + 1 + + haze_density + + 1.2699999809265137 + 0 + 0 + 1 + + haze_horizon + + 0.26999998092651367 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.88645249605178833 + 0.36227512359619141 + -0.28802555799484253 + 0 + + max_y + + 483 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.7708849906921387 + sunlight_color + + 1.3799998760223389 + 1.3799998760223389 + 1.3799998760223389 + 0.45999997854232788 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Annamaria.xml b/indra/newview/app_settings/windlight/skies/Places%20Annamaria.xml index 15876975d..32b8cc184 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Annamaria.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Annamaria.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.17999999225139618 - 0.17999999225139618 - 0 - 0.17999999225139618 - - blue_density - - 0.97999995946884155 - 0.97999995946884155 - 0.75999999046325684 - 1 - - blue_horizon - - 0.084897957742214203 - 0.11000000685453415 - 0.25999999046325684 - 0.12999999523162842 - - cloud_color - - 0.47999998927116394 - 0.47999998927116394 - 0.47999998927116394 - 0.47999998927116394 - - cloud_pos_density1 - - 0.63999998569488525 - 0.5 - 0.56999999284744263 - 1 - - cloud_pos_density2 - - 0.37000000476837158 - 0.35999998450279236 - 0 - 1 - - cloud_scale - - 0.079999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.219999775290489 - 9.9899997767060995 - - cloud_shadow - - 0.31999999284744263 - 0 - 0 - 1 - - density_multiplier - - 0.00013000000035390258 - 0 - 0 - 1 - - distance_multiplier - - 2 - 0 - 0 - 1 - - east_angle - 3.1415927410125732 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1 - 0 - 0 - 1 - - glow - - 5.3999996185302734 - 0.0010000000474974513 - -0.33000001311302185 - 1 - - haze_density - - 1.8899999856948853 - 0 - 0 - 1 - - haze_horizon - - 0.23999999463558197 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -8.1484252234531596e-008 - 0.36227512359619141 - 0.93207120895385742 - 0 - - max_y - - 671 - 0 - 0 - 1 - - preset_num - 21 - star_brightness - 0.2199999988079071 - sun_angle - 2.7708849906921387 - sunlight_color - - 1.3799998760223389 - 1.3799998760223389 - 1.3799998760223389 - 1.3799998760223389 - - - + + + ambient + + 0.17999999225139618 + 0.17999999225139618 + 0 + 0.17999999225139618 + + blue_density + + 0.97999995946884155 + 0.97999995946884155 + 0.75999999046325684 + 1 + + blue_horizon + + 0.084897957742214203 + 0.11000000685453415 + 0.25999999046325684 + 0.12999999523162842 + + cloud_color + + 0.47999998927116394 + 0.47999998927116394 + 0.47999998927116394 + 0.47999998927116394 + + cloud_pos_density1 + + 0.63999998569488525 + 0.5 + 0.56999999284744263 + 1 + + cloud_pos_density2 + + 0.37000000476837158 + 0.35999998450279236 + 0 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.219999775290489 + 9.9899997767060995 + + cloud_shadow + + 0.31999999284744263 + 0 + 0 + 1 + + density_multiplier + + 0.00013000000035390258 + 0 + 0 + 1 + + distance_multiplier + + 2 + 0 + 0 + 1 + + east_angle + 3.1415927410125732 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.3999996185302734 + 0.0010000000474974513 + -0.33000001311302185 + 1 + + haze_density + + 1.8899999856948853 + 0 + 0 + 1 + + haze_horizon + + 0.23999999463558197 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -8.1484252234531596e-008 + 0.36227512359619141 + 0.93207120895385742 + 0 + + max_y + + 671 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0.2199999988079071 + sun_angle + 2.7708849906921387 + sunlight_color + + 1.3799998760223389 + 1.3799998760223389 + 1.3799998760223389 + 1.3799998760223389 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Astryls%20Wild.xml b/indra/newview/app_settings/windlight/skies/Places%20Astryls%20Wild.xml index c9783190b..7e306ba19 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Astryls%20Wild.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Astryls%20Wild.xml @@ -1,141 +1,141 @@ - - - ambient - - 1.7372221946716309 - 1.7699999809265137 - 1.5899999141693115 - 1.7999999523162842 - - blue_density - - 0.5 - 0.97999995946884155 - 0.97999995946884155 - 0.48999997973442078 - - blue_horizon - - 0.31999999284744263 - 0.2800000011920929 - 0.37999999523162842 - 0.37999999523162842 - - cloud_color - - 0.50999999046325684 - 0.50999999046325684 - 0.50999999046325684 - 1 - - cloud_pos_density1 - - 0.5 - 0.5 - 1 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.079999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.25999999046325684 - 0 - 0 - 1 - - density_multiplier - - 0.00053999997908249497 - 0 - 0 - 1 - - distance_multiplier - - 8.8000001907348633 - 0 - 0 - 1 - - east_angle - 0.56548666954040527 - enable_cloud_scroll - - 1 - 1 - - gamma - - 0.94999998807907104 - 0 - 0 - 1 - - glow - - 11.600000381469727 - 0.0010000000474974513 - -2.2999999523162842 - 1 - - haze_density - - 1.4299999475479126 - 0 - 0 - 1 - - haze_horizon - - 0.15999999642372131 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.38828861713409424 - 0.68911367654800415 - -0.61184495687484741 - 0 - - max_y - - 886 - 0 - 0 - 1 - - preset_num - 21 - star_brightness - 0 - sun_angle - 2.3813273906707764 - sunlight_color - - 1.4399999380111694 - 1.4699999094009399 - 1.4399999380111694 - 1.4699999094009399 - - - + + + ambient + + 1.7372221946716309 + 1.7699999809265137 + 1.5899999141693115 + 1.7999999523162842 + + blue_density + + 0.5 + 0.97999995946884155 + 0.97999995946884155 + 0.48999997973442078 + + blue_horizon + + 0.31999999284744263 + 0.2800000011920929 + 0.37999999523162842 + 0.37999999523162842 + + cloud_color + + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.25999999046325684 + 0 + 0 + 1 + + density_multiplier + + 0.00053999997908249497 + 0 + 0 + 1 + + distance_multiplier + + 8.8000001907348633 + 0 + 0 + 1 + + east_angle + 0.56548666954040527 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.94999998807907104 + 0 + 0 + 1 + + glow + + 11.600000381469727 + 0.0010000000474974513 + -2.2999999523162842 + 1 + + haze_density + + 1.4299999475479126 + 0 + 0 + 1 + + haze_horizon + + 0.15999999642372131 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.38828861713409424 + 0.68911367654800415 + -0.61184495687484741 + 0 + + max_y + + 886 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.3813273906707764 + sunlight_color + + 1.4399999380111694 + 1.4699999094009399 + 1.4399999380111694 + 1.4699999094009399 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Babbage.xml b/indra/newview/app_settings/windlight/skies/Places%20Babbage.xml index a7176d14e..6ae0392aa 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Babbage.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Babbage.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.32999998331069946 - 0.32999998331069946 - 0.32999998331069946 - 0.10999999940395355 - - blue_density - - 0 - 0.39999699592590332 - 0.80000197887420654 - 0.97999995946884155 - - blue_horizon - - 0.16199998557567596 - 0.76855206489562988 - 0.89999997615814209 - 0.44999998807907104 - - cloud_color - - 0.69999998807907104 - 0.69999998807907104 - 0.69999998807907104 - 0.69999998807907104 - - cloud_pos_density1 - - 0.5 - 0.5 - 0.53999996185302734 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.29999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.39999997615814209 - 0 - 0 - 1 - - density_multiplier - - 0.00072999997064471245 - 0 - 0 - 1 - - distance_multiplier - - 7.4000000953674316 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1 - 0 - 0 - 1 - - glow - - 3.7999999523162842 - 0.0010000000474974513 - -0.5 - 1 - - haze_density - - 4 - 0 - 0 - 1 - - haze_horizon - - 0.64999997615814209 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0 - 1 - -4.3711388286737929e-008 - 0 - - max_y - - 1745 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 1.5707963705062866 - sunlight_color - - 0.53999996185302734 - 0.53999996185302734 - 0.53999996185302734 - 0.17999999225139618 - - - + + + ambient + + 0.32999998331069946 + 0.32999998331069946 + 0.32999998331069946 + 0.10999999940395355 + + blue_density + + 0 + 0.39999699592590332 + 0.80000197887420654 + 0.97999995946884155 + + blue_horizon + + 0.16199998557567596 + 0.76855206489562988 + 0.89999997615814209 + 0.44999998807907104 + + cloud_color + + 0.69999998807907104 + 0.69999998807907104 + 0.69999998807907104 + 0.69999998807907104 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.53999996185302734 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.29999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.39999997615814209 + 0 + 0 + 1 + + density_multiplier + + 0.00072999997064471245 + 0 + 0 + 1 + + distance_multiplier + + 7.4000000953674316 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 3.7999999523162842 + 0.0010000000474974513 + -0.5 + 1 + + haze_density + + 4 + 0 + 0 + 1 + + haze_horizon + + 0.64999997615814209 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 1 + -4.3711388286737929e-008 + 0 + + max_y + + 1745 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 1.5707963705062866 + sunlight_color + + 0.53999996185302734 + 0.53999996185302734 + 0.53999996185302734 + 0.17999999225139618 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Beach%20Cay%20Surreal.xml b/indra/newview/app_settings/windlight/skies/Places%20Beach%20Cay%20Surreal.xml index 1b06037ae..aee1ec691 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Beach%20Cay%20Surreal.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Beach%20Cay%20Surreal.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.35999998450279236 - 0.25200003385543823 - 0 - 0.11999999731779099 - - blue_density - - 0.97999995946884155 - 0.97999995946884155 - 0.97999995946884155 - 0.48999997973442078 - - blue_horizon - - 0.47999998927116394 - 0.53999996185302734 - 0.45999997854232788 - 0.53999996185302734 - - cloud_color - - 0.50999999046325684 - 0.50999999046325684 - 0.50999999046325684 - 1 - - cloud_pos_density1 - - 0.5 - 0.5 - 1 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.079999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.25999999046325684 - 0 - 0 - 1 - - density_multiplier - - 7.0000001869630069e-005 - 0 - 0 - 1 - - distance_multiplier - - 31.100000381469727 - 0 - 0 - 1 - - east_angle - 4.0840702056884766 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.6899999380111694 - 0 - 0 - 1 - - glow - - 15.59999942779541 - 0.0010000000474974513 - -0.59999996423721313 - 1 - - haze_density - - 1.2699999809265137 - 0 - 0 - 1 - - haze_horizon - - 0.26999998092651367 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.75406128168106079 - 0.36227512359619141 - 0.54785788059234619 - 0 - - max_y - - 403 - 0 - 0 - 1 - - preset_num - 21 - star_brightness - 0 - sun_angle - 2.7708849906921387 - sunlight_color - - 1.3799998760223389 - 1.3799998760223389 - 1.3799998760223389 - 0.45999997854232788 - - - + + + ambient + + 0.35999998450279236 + 0.25200003385543823 + 0 + 0.11999999731779099 + + blue_density + + 0.97999995946884155 + 0.97999995946884155 + 0.97999995946884155 + 0.48999997973442078 + + blue_horizon + + 0.47999998927116394 + 0.53999996185302734 + 0.45999997854232788 + 0.53999996185302734 + + cloud_color + + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.25999999046325684 + 0 + 0 + 1 + + density_multiplier + + 7.0000001869630069e-005 + 0 + 0 + 1 + + distance_multiplier + + 31.100000381469727 + 0 + 0 + 1 + + east_angle + 4.0840702056884766 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.6899999380111694 + 0 + 0 + 1 + + glow + + 15.59999942779541 + 0.0010000000474974513 + -0.59999996423721313 + 1 + + haze_density + + 1.2699999809265137 + 0 + 0 + 1 + + haze_horizon + + 0.26999998092651367 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.75406128168106079 + 0.36227512359619141 + 0.54785788059234619 + 0 + + max_y + + 403 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.7708849906921387 + sunlight_color + + 1.3799998760223389 + 1.3799998760223389 + 1.3799998760223389 + 0.45999997854232788 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Beach%20Cay.xml b/indra/newview/app_settings/windlight/skies/Places%20Beach%20Cay.xml index d4fa195fe..85f0f9900 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Beach%20Cay.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Beach%20Cay.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.21000000834465027 - 0.029999999329447746 - 0 - 0.21000000834465027 - - blue_density - - 0.29999998211860657 - 0.29999998211860657 - 0.29999998211860657 - 0.14999999105930328 - - blue_horizon - - 0.47999998927116394 - 0.17142856121063232 - 0 - 0.23999999463558197 - - cloud_color - - 0.26999998092651367 - 0.34999999403953552 - 0.029999999329447746 - 0.34999999403953552 - - cloud_pos_density1 - - 0.85999995470046997 - 0.42999997735023499 - 0.45999997854232788 - 1 - - cloud_pos_density2 - - 1 - 1 - 0.099999994039535522 - 1 - - cloud_scale - - 0.14000000059604645 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.644780158996582 - 10.423800468444824 - - cloud_shadow - - 0.2800000011920929 - 0 - 0 - 1 - - density_multiplier - - 0.00013999998918734491 - 0 - 0 - 1 - - distance_multiplier - - 37.799999237060547 - 0 - 0 - 1 - - east_angle - 1.7592918872833252 - enable_cloud_scroll - - 1 - 1 - - gamma - - 2.2999999523162842 - 0 - 0 - 1 - - glow - - 2.5999999046325684 - 0.0013735899701714516 - -2.5 - 1 - - haze_density - - 1.7300000190734863 - 0 - 0 - 1 - - haze_horizon - - 0.14999999105930328 - 0.13210900127887726 - 0.13210900127887726 - 1 - - lightnorm - - -0.98228722810745239 - 0 - -0.187381312251091 - 0 - - max_y - - 1396 - 0 - 0 - 1 - - preset_num - 5 - star_brightness - 2 - sun_angle - 0 - sunlight_color - - 1.9199999570846558 - 1.7699999809265137 - 0 - 1.9199999570846558 - - - + + + ambient + + 0.21000000834465027 + 0.029999999329447746 + 0 + 0.21000000834465027 + + blue_density + + 0.29999998211860657 + 0.29999998211860657 + 0.29999998211860657 + 0.14999999105930328 + + blue_horizon + + 0.47999998927116394 + 0.17142856121063232 + 0 + 0.23999999463558197 + + cloud_color + + 0.26999998092651367 + 0.34999999403953552 + 0.029999999329447746 + 0.34999999403953552 + + cloud_pos_density1 + + 0.85999995470046997 + 0.42999997735023499 + 0.45999997854232788 + 1 + + cloud_pos_density2 + + 1 + 1 + 0.099999994039535522 + 1 + + cloud_scale + + 0.14000000059604645 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.644780158996582 + 10.423800468444824 + + cloud_shadow + + 0.2800000011920929 + 0 + 0 + 1 + + density_multiplier + + 0.00013999998918734491 + 0 + 0 + 1 + + distance_multiplier + + 37.799999237060547 + 0 + 0 + 1 + + east_angle + 1.7592918872833252 + enable_cloud_scroll + + 1 + 1 + + gamma + + 2.2999999523162842 + 0 + 0 + 1 + + glow + + 2.5999999046325684 + 0.0013735899701714516 + -2.5 + 1 + + haze_density + + 1.7300000190734863 + 0 + 0 + 1 + + haze_horizon + + 0.14999999105930328 + 0.13210900127887726 + 0.13210900127887726 + 1 + + lightnorm + + -0.98228722810745239 + 0 + -0.187381312251091 + 0 + + max_y + + 1396 + 0 + 0 + 1 + + preset_num + 5 + star_brightness + 2 + sun_angle + 0 + sunlight_color + + 1.9199999570846558 + 1.7699999809265137 + 0 + 1.9199999570846558 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Bentham.xml b/indra/newview/app_settings/windlight/skies/Places%20Bentham.xml index db35e04ec..de1ca043d 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Bentham.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Bentham.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.59999996423721313 - 0.4888889491558075 - 0.40000000596046448 - 0.19999998807907104 - - blue_density - - 1.059999942779541 - 0.47638890147209167 - 0.47638890147209167 - 1.059999942779541 - - blue_horizon - - 0.14000000059604645 - 0.31999999284744263 - 0.62000000476837158 - 0.62000000476837158 - - cloud_color - - 0.28999999165534973 - 0.28999999165534973 - 0.31999999284744263 - 0.31999999284744263 - - cloud_pos_density1 - - 0.5 - 0.5 - 1 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.079999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 9.9299993515014648 - - cloud_shadow - - 0.32999998331069946 - 0 - 0 - 1 - - density_multiplier - - 0.00032999998074956238 - 0 - 0 - 1 - - distance_multiplier - - 6.8000001907348633 - 0 - 0 - 1 - - east_angle - 4.7752208709716797 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.0799999237060547 - 0 - 0 - 1 - - glow - - 5 - 0.0010000000474974513 - -0.33000001311302185 - 1 - - haze_density - - 1.8899999856948853 - 0 - 0 - 1 - - haze_horizon - - 0.23999999463558197 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.91343516111373901 - 0.4029063880443573 - -0.057468503713607788 - 0 - - max_y - - 644 - 0 - 0 - 1 - - preset_num - 21 - star_brightness - 0 - sun_angle - 2.7269024848937988 - sunlight_color - - 2.25 - 1.8899999856948853 - 1.6800000667572021 - 2.25 - - - + + + ambient + + 0.59999996423721313 + 0.4888889491558075 + 0.40000000596046448 + 0.19999998807907104 + + blue_density + + 1.059999942779541 + 0.47638890147209167 + 0.47638890147209167 + 1.059999942779541 + + blue_horizon + + 0.14000000059604645 + 0.31999999284744263 + 0.62000000476837158 + 0.62000000476837158 + + cloud_color + + 0.28999999165534973 + 0.28999999165534973 + 0.31999999284744263 + 0.31999999284744263 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 9.9299993515014648 + + cloud_shadow + + 0.32999998331069946 + 0 + 0 + 1 + + density_multiplier + + 0.00032999998074956238 + 0 + 0 + 1 + + distance_multiplier + + 6.8000001907348633 + 0 + 0 + 1 + + east_angle + 4.7752208709716797 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.0799999237060547 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.33000001311302185 + 1 + + haze_density + + 1.8899999856948853 + 0 + 0 + 1 + + haze_horizon + + 0.23999999463558197 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.91343516111373901 + 0.4029063880443573 + -0.057468503713607788 + 0 + + max_y + + 644 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.7269024848937988 + sunlight_color + + 2.25 + 1.8899999856948853 + 1.6800000667572021 + 2.25 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Cornfield.xml b/indra/newview/app_settings/windlight/skies/Places%20Cornfield.xml index 77416688e..6cd480670 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Cornfield.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Cornfield.xml @@ -1,141 +1,141 @@ - - - ambient - - 1.7400000095367432 - 1.619999885559082 - 1.4099999666213989 - 2.4600000381469727 - - blue_density - - 0.97999995946884155 - 0.97999995946884155 - 0.97999995946884155 - 0.48999997973442078 - - blue_horizon - - 0.2800000011920929 - 0.29999998211860657 - 0.37999999523162842 - 0.39999997615814209 - - cloud_color - - 0.50999999046325684 - 0.50999999046325684 - 0.50999999046325684 - 1 - - cloud_pos_density1 - - 0.5 - 0.5 - 1 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.079999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.25999999046325684 - 0 - 0 - 1 - - density_multiplier - - 0.00031000000308267772 - 0 - 0 - 1 - - distance_multiplier - - 6.8000001907348633 - 0 - 0 - 1 - - east_angle - 4.5238933563232422 - enable_cloud_scroll - - 1 - 1 - - gamma - - 0.74000000953674316 - 0 - 0 - 1 - - glow - - 11.600000381469727 - 0.0010000000474974513 - -2.2999999523162842 - 1 - - haze_density - - 1.4299999475479126 - 0 - 0 - 1 - - haze_horizon - - 0.15999999642372131 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.71181762218475342 - 0.68911367654800415 - 0.1357865184545517 - 0 - - max_y - - 242 - 0 - 0 - 1 - - preset_num - 21 - star_brightness - 0 - sun_angle - 2.3813273906707764 - sunlight_color - - 1.4399999380111694 - 1.4399999380111694 - 1.4399999380111694 - 0.47999998927116394 - - - + + + ambient + + 1.7400000095367432 + 1.619999885559082 + 1.4099999666213989 + 2.4600000381469727 + + blue_density + + 0.97999995946884155 + 0.97999995946884155 + 0.97999995946884155 + 0.48999997973442078 + + blue_horizon + + 0.2800000011920929 + 0.29999998211860657 + 0.37999999523162842 + 0.39999997615814209 + + cloud_color + + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.25999999046325684 + 0 + 0 + 1 + + density_multiplier + + 0.00031000000308267772 + 0 + 0 + 1 + + distance_multiplier + + 6.8000001907348633 + 0 + 0 + 1 + + east_angle + 4.5238933563232422 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.74000000953674316 + 0 + 0 + 1 + + glow + + 11.600000381469727 + 0.0010000000474974513 + -2.2999999523162842 + 1 + + haze_density + + 1.4299999475479126 + 0 + 0 + 1 + + haze_horizon + + 0.15999999642372131 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.71181762218475342 + 0.68911367654800415 + 0.1357865184545517 + 0 + + max_y + + 242 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.3813273906707764 + sunlight_color + + 1.4399999380111694 + 1.4399999380111694 + 1.4399999380111694 + 0.47999998927116394 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Cromac.xml b/indra/newview/app_settings/windlight/skies/Places%20Cromac.xml index efec78721..104314ebd 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Cromac.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Cromac.xml @@ -1,141 +1,141 @@ - - - ambient - - 1.0799999237060547 - 0.98999994993209839 - 0.77999997138977051 - 1.0799999237060547 - - blue_density - - 0.64736837148666382 - 0.48414888978004456 - 0.81999999284744263 - 0.40999999642372131 - - blue_horizon - - 0.5 - 0.49548381567001343 - 0.45999997854232788 - 0.51999998092651367 - - cloud_color - - 0.4100000062111997 - 0.4100000062111997 - 0.4100000062111997 - 0.4100000062111997 - - cloud_pos_density1 - - 0.14000000059604645 - 0.62000000476837158 - 1 - 1 - - cloud_pos_density2 - - 0.35999998450279236 - 0.56999999284744263 - 0.12999999523162842 - 1 - - cloud_scale - - 0.35999998450279236 - 0 - 0 - 1.0000000149011612 - - cloud_scroll_rate - - 10.199999791580112 - 10.010999679880427 - - cloud_shadow - - 0.29999998211860657 - 0 - 0 - 1.0000000149011612 - - density_multiplier - - 7.9999997979030013e-005 - 0 - 0 - 1.0000000149011612 - - distance_multiplier - - 5.4000000953674316 - 0 - 0 - 1.0000000149011612 - - east_angle - 4.2725663185119629 - enable_cloud_scroll - - 1 - 1 - - gamma - - 2.8399999141693115 - 0 - 0 - 1.0000000149011612 - - glow - - 5 - 0.0010000000474974513 - -0.55000001192092896 - 1 - - haze_density - - 0.31999999284744263 - 0 - 0 - 1 - - haze_horizon - - 0.17999999225139618 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.14154624938964844 - 0.98768830299377441 - 0.066606558859348297 - 0 - - max_y - - 805 - 0 - 0 - 1.0000000149011612 - - preset_num - 28 - star_brightness - 0.25999999046325684 - sun_angle - 1.7278760671615601 - sunlight_color - - 0.69882339239120483 - 0.8258824348449707 - 1.0799999237060547 - 0.35999998450279236 - - - + + + ambient + + 1.0799999237060547 + 0.98999994993209839 + 0.77999997138977051 + 1.0799999237060547 + + blue_density + + 0.64736837148666382 + 0.48414888978004456 + 0.81999999284744263 + 0.40999999642372131 + + blue_horizon + + 0.5 + 0.49548381567001343 + 0.45999997854232788 + 0.51999998092651367 + + cloud_color + + 0.4100000062111997 + 0.4100000062111997 + 0.4100000062111997 + 0.4100000062111997 + + cloud_pos_density1 + + 0.14000000059604645 + 0.62000000476837158 + 1 + 1 + + cloud_pos_density2 + + 0.35999998450279236 + 0.56999999284744263 + 0.12999999523162842 + 1 + + cloud_scale + + 0.35999998450279236 + 0 + 0 + 1.0000000149011612 + + cloud_scroll_rate + + 10.199999791580112 + 10.010999679880427 + + cloud_shadow + + 0.29999998211860657 + 0 + 0 + 1.0000000149011612 + + density_multiplier + + 7.9999997979030013e-005 + 0 + 0 + 1.0000000149011612 + + distance_multiplier + + 5.4000000953674316 + 0 + 0 + 1.0000000149011612 + + east_angle + 4.2725663185119629 + enable_cloud_scroll + + 1 + 1 + + gamma + + 2.8399999141693115 + 0 + 0 + 1.0000000149011612 + + glow + + 5 + 0.0010000000474974513 + -0.55000001192092896 + 1 + + haze_density + + 0.31999999284744263 + 0 + 0 + 1 + + haze_horizon + + 0.17999999225139618 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.14154624938964844 + 0.98768830299377441 + 0.066606558859348297 + 0 + + max_y + + 805 + 0 + 0 + 1.0000000149011612 + + preset_num + 28 + star_brightness + 0.25999999046325684 + sun_angle + 1.7278760671615601 + sunlight_color + + 0.69882339239120483 + 0.8258824348449707 + 1.0799999237060547 + 0.35999998450279236 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Crucible.xml b/indra/newview/app_settings/windlight/skies/Places%20Crucible.xml index 08c15adf0..1eef22192 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Crucible.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Crucible.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.20405015781398106 - 0.24246659642869872 - 0.33000011563842691 - 0.11000042485298422 - - blue_density - - 0.44999968444335536 - 0.44999993884084688 - 0.45000033684982554 - 1 - - blue_horizon - - 0.2399998628207527 - 0.23999996847777538 - 0.24000000489354534 - 1 - - cloud_color - - 0.22615399956703186 - 0.22615399956703186 - 0.22615399956703186 - 1 - - cloud_pos_density1 - - 1.6884100437164307 - 0.52609699964523315 - 0.87999999523162842 - 1 - - cloud_pos_density2 - - 1.6884100437164307 - 0.52609699964523315 - 0.125 - 1 - - cloud_scale - - 0.41999998688697815 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.26999998092651367 - 0 - 0 - 1 - - density_multiplier - - 0.00030000017352815878 - 0 - 0 - 1 - - distance_multiplier - - 2.6920993051460229e-006 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1 - 0 - 0 - 1 - - glow - - 5 - 0.0010000000474974513 - -0.47999998927116394 - 1 - - haze_density - - 3.9999967092453517 - 0 - 0 - 1 - - haze_horizon - - 1.5953180371869324e-007 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0 - 0.99963462352752686 - 0.027029547840356827 - 1 - - max_y - - 906.19966977159493 - 0 - 0 - 1 - - preset_num - 22 - star_brightness - 1.9999979734420776 - sun_angle - 4.6853561401367187 - sunlight_color - - 0.34876771076233126 - 0.35574326291055058 - 0.66000120168018839 - 0.22000041117803448 - - - + + + ambient + + 0.20405015781398106 + 0.24246659642869872 + 0.33000011563842691 + 0.11000042485298422 + + blue_density + + 0.44999968444335536 + 0.44999993884084688 + 0.45000033684982554 + 1 + + blue_horizon + + 0.2399998628207527 + 0.23999996847777538 + 0.24000000489354534 + 1 + + cloud_color + + 0.22615399956703186 + 0.22615399956703186 + 0.22615399956703186 + 1 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.87999999523162842 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00030000017352815878 + 0 + 0 + 1 + + distance_multiplier + + 2.6920993051460229e-006 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 3.9999967092453517 + 0 + 0 + 1 + + haze_horizon + + 1.5953180371869324e-007 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0 + 0.99963462352752686 + 0.027029547840356827 + 1 + + max_y + + 906.19966977159493 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 1.9999979734420776 + sun_angle + 4.6853561401367187 + sunlight_color + + 0.34876771076233126 + 0.35574326291055058 + 0.66000120168018839 + 0.22000041117803448 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20District8.xml b/indra/newview/app_settings/windlight/skies/Places%20District8.xml index 0ef69a361..8d254b1fe 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20District8.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20District8.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.26999998092651367 - 0.21000000834465027 - 0.08999999612569809 - 0.26999998092651367 - - blue_density - - 0.71999996900558472 - 1.0199999809265137 - 1.059999942779541 - 1.059999942779541 - - blue_horizon - - 0.35999998450279236 - 0.36272725462913513 - 0.41999998688697815 - 0.5 - - cloud_color - - 0.50999999046325684 - 0.50999999046325684 - 0.50999999046325684 - 1 - - cloud_pos_density1 - - 0.5 - 0.5 - 1 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.079999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.25 - 0 - 0 - 1 - - density_multiplier - - 0.00020999999833293259 - 0 - 0 - 1 - - distance_multiplier - - 4.7000002861022949 - 0 - 0 - 1 - - east_angle - 3.3300881385803223 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.2200000286102295 - 0 - 0 - 1 - - glow - - 16.600000381469727 - 0.0010000000474974513 - -0.049999997019767761 - 1 - - haze_density - - 2.1599998474121094 - 0 - 0 - 1 - - haze_horizon - - 0.25999999046325684 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.17994101345539093 - 0.27899131178855896 - -0.94328427314758301 - 1 - - max_y - - 698 - 0 - 0 - 1 - - preset_num - 21 - star_brightness - 0 - sun_angle - 3.4243361949920654 - sunlight_color - - 2.0999999046325684 - 2.1599998474121094 - 2.1599998474121094 - 2.1599998474121094 - - - + + + ambient + + 0.26999998092651367 + 0.21000000834465027 + 0.08999999612569809 + 0.26999998092651367 + + blue_density + + 0.71999996900558472 + 1.0199999809265137 + 1.059999942779541 + 1.059999942779541 + + blue_horizon + + 0.35999998450279236 + 0.36272725462913513 + 0.41999998688697815 + 0.5 + + cloud_color + + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.25 + 0 + 0 + 1 + + density_multiplier + + 0.00020999999833293259 + 0 + 0 + 1 + + distance_multiplier + + 4.7000002861022949 + 0 + 0 + 1 + + east_angle + 3.3300881385803223 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.2200000286102295 + 0 + 0 + 1 + + glow + + 16.600000381469727 + 0.0010000000474974513 + -0.049999997019767761 + 1 + + haze_density + + 2.1599998474121094 + 0 + 0 + 1 + + haze_horizon + + 0.25999999046325684 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.17994101345539093 + 0.27899131178855896 + -0.94328427314758301 + 1 + + max_y + + 698 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 3.4243361949920654 + sunlight_color + + 2.0999999046325684 + 2.1599998474121094 + 2.1599998474121094 + 2.1599998474121094 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Duskwood.xml b/indra/newview/app_settings/windlight/skies/Places%20Duskwood.xml index 2389e9660..44ff7f160 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Duskwood.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Duskwood.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.17999999225139618 - 0.17999999225139618 - 0 - 0.17999999225139618 - - blue_density - - 0.97999995946884155 - 0.97999995946884155 - 0.75999999046325684 - 1 - - blue_horizon - - 0.084897957742214203 - 0.11000000685453415 - 0.25999999046325684 - 0.12999999523162842 - - cloud_color - - 0.47999998927116394 - 0.47999998927116394 - 0.47999998927116394 - 0.47999998927116394 - - cloud_pos_density1 - - 0.63999998569488525 - 0.5 - 0.56999999284744263 - 1 - - cloud_pos_density2 - - 0.37000000476837158 - 0.35999998450279236 - 0 - 1 - - cloud_scale - - 0.079999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.219999775290489 - 9.9899997767060995 - - cloud_shadow - - 0.31999999284744263 - 0 - 0 - 1 - - density_multiplier - - 0.00031000000308267772 - 0 - 0 - 1 - - distance_multiplier - - 33.100002288818359 - 0 - 0 - 1 - - east_angle - 3.1415927410125732 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1 - 0 - 0 - 1 - - glow - - 5.3999996185302734 - 0.0010000000474974513 - -0.33000001311302185 - 1 - - haze_density - - 1.8899999856948853 - 0 - 0 - 1 - - haze_horizon - - 0.23999999463558197 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -8.1484252234531596e-008 - 0.36227512359619141 - 0.93207120895385742 - 0 - - max_y - - 671 - 0 - 0 - 1 - - preset_num - 21 - star_brightness - 0.2199999988079071 - sun_angle - 2.7708849906921387 - sunlight_color - - 1.3799998760223389 - 1.3799998760223389 - 1.3799998760223389 - 1.3799998760223389 - - - + + + ambient + + 0.17999999225139618 + 0.17999999225139618 + 0 + 0.17999999225139618 + + blue_density + + 0.97999995946884155 + 0.97999995946884155 + 0.75999999046325684 + 1 + + blue_horizon + + 0.084897957742214203 + 0.11000000685453415 + 0.25999999046325684 + 0.12999999523162842 + + cloud_color + + 0.47999998927116394 + 0.47999998927116394 + 0.47999998927116394 + 0.47999998927116394 + + cloud_pos_density1 + + 0.63999998569488525 + 0.5 + 0.56999999284744263 + 1 + + cloud_pos_density2 + + 0.37000000476837158 + 0.35999998450279236 + 0 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.219999775290489 + 9.9899997767060995 + + cloud_shadow + + 0.31999999284744263 + 0 + 0 + 1 + + density_multiplier + + 0.00031000000308267772 + 0 + 0 + 1 + + distance_multiplier + + 33.100002288818359 + 0 + 0 + 1 + + east_angle + 3.1415927410125732 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.3999996185302734 + 0.0010000000474974513 + -0.33000001311302185 + 1 + + haze_density + + 1.8899999856948853 + 0 + 0 + 1 + + haze_horizon + + 0.23999999463558197 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -8.1484252234531596e-008 + 0.36227512359619141 + 0.93207120895385742 + 0 + + max_y + + 671 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0.2199999988079071 + sun_angle + 2.7708849906921387 + sunlight_color + + 1.3799998760223389 + 1.3799998760223389 + 1.3799998760223389 + 1.3799998760223389 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Eridu.xml b/indra/newview/app_settings/windlight/skies/Places%20Eridu.xml index d93310016..900a8c188 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Eridu.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Eridu.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.50999999046325684 - 0.57310229539871216 - 0.59999996423721313 - 0.59999996423721313 - - blue_density - - 0.14522500336170197 - 0.39999699592590332 - 0.80000197887420654 - 1 - - blue_horizon - - 0.15130999684333801 - 0.30000001192092896 - 0.35131001472473145 - 1 - - cloud_color - - 0.12862999737262726 - 0.12862999737262726 - 0.12862999737262726 - 1 - - cloud_pos_density1 - - 0.88419097661972046 - 0.53047597408294678 - 0.4270470142364502 - 1 - - cloud_pos_density2 - - 0.38419300317764282 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.41999998688697815 - 0 - 0 - 1 - - cloud_scroll_rate - - 10 - 10 - - cloud_shadow - - 0.61711597442626953 - 0 - 0 - 1 - - density_multiplier - - 0.0001250890054507181 - 0 - 0 - 1 - - distance_multiplier - - 11.40000057220459 - 0 - 0 - 1 - - east_angle - 5.4035391807556152 - enable_cloud_scroll - - 1 - 1 - - gamma - - 0.87999999523162842 - 0 - 0 - 1 - - glow - - 6.4079799652099609 - 0.0012815999798476696 - -0.42292699217796326 - 1 - - haze_density - - 4 - 0 - 0 - 1 - - haze_horizon - - 0.21744099259376526 - 0.21744099259376526 - 0.21744099259376526 - 1 - - lightnorm - - 0.76102709770202637 - 0.15643447637557983 - 0.62957614660263062 - 0 - - max_y - - 4000 - 0 - 0 - 1 - - preset_num - 2 - star_brightness - 0 - sun_angle - 0.15707963705062866 - sunlight_color - - 3 - 3 - 3 - 1 - - - + + + ambient + + 0.50999999046325684 + 0.57310229539871216 + 0.59999996423721313 + 0.59999996423721313 + + blue_density + + 0.14522500336170197 + 0.39999699592590332 + 0.80000197887420654 + 1 + + blue_horizon + + 0.15130999684333801 + 0.30000001192092896 + 0.35131001472473145 + 1 + + cloud_color + + 0.12862999737262726 + 0.12862999737262726 + 0.12862999737262726 + 1 + + cloud_pos_density1 + + 0.88419097661972046 + 0.53047597408294678 + 0.4270470142364502 + 1 + + cloud_pos_density2 + + 0.38419300317764282 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10 + 10 + + cloud_shadow + + 0.61711597442626953 + 0 + 0 + 1 + + density_multiplier + + 0.0001250890054507181 + 0 + 0 + 1 + + distance_multiplier + + 11.40000057220459 + 0 + 0 + 1 + + east_angle + 5.4035391807556152 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.87999999523162842 + 0 + 0 + 1 + + glow + + 6.4079799652099609 + 0.0012815999798476696 + -0.42292699217796326 + 1 + + haze_density + + 4 + 0 + 0 + 1 + + haze_horizon + + 0.21744099259376526 + 0.21744099259376526 + 0.21744099259376526 + 1 + + lightnorm + + 0.76102709770202637 + 0.15643447637557983 + 0.62957614660263062 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 2 + star_brightness + 0 + sun_angle + 0.15707963705062866 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Erie.xml b/indra/newview/app_settings/windlight/skies/Places%20Erie.xml index 7be0e3ffd..8105ceef7 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Erie.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Erie.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.26999998092651367 - 0.26999998092651367 - 0.26999998092651367 - 0.08999999612569809 - - blue_density - - 0.35999998450279236 - 0.35999998450279236 - 0.35999998450279236 - 0.17999999225139618 - - blue_horizon - - 0.16199998557567596 - 0.76855206489562988 - 1.9799998998641968 - 1.9799998998641968 - - cloud_color - - 0.69999998807907104 - 0.69999998807907104 - 0.69999998807907104 - 0.69999998807907104 - - cloud_pos_density1 - - 0.5 - 0.5 - 0.53999996185302734 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.29999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.39999997615814209 - 0 - 0 - 1 - - density_multiplier - - 0.00054999999701976776 - 0 - 0 - 1 - - distance_multiplier - - 6.0999999046325684 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.5499999523162842 - 0 - 0 - 1 - - glow - - 3.7999999523162842 - 0.0010000000474974513 - -0.5 - 1 - - haze_density - - 4 - 0 - 0 - 1 - - haze_horizon - - 0.64999997615814209 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0 - 1 - -4.3711388286737929e-008 - 0 - - max_y - - 1745 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 1.5707963705062866 - sunlight_color - - 0.08999999612569809 - 0.070000007748603821 - 0.08999999612569809 - 0.029999999329447746 - - - + + + ambient + + 0.26999998092651367 + 0.26999998092651367 + 0.26999998092651367 + 0.08999999612569809 + + blue_density + + 0.35999998450279236 + 0.35999998450279236 + 0.35999998450279236 + 0.17999999225139618 + + blue_horizon + + 0.16199998557567596 + 0.76855206489562988 + 1.9799998998641968 + 1.9799998998641968 + + cloud_color + + 0.69999998807907104 + 0.69999998807907104 + 0.69999998807907104 + 0.69999998807907104 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.53999996185302734 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.29999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.39999997615814209 + 0 + 0 + 1 + + density_multiplier + + 0.00054999999701976776 + 0 + 0 + 1 + + distance_multiplier + + 6.0999999046325684 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.5499999523162842 + 0 + 0 + 1 + + glow + + 3.7999999523162842 + 0.0010000000474974513 + -0.5 + 1 + + haze_density + + 4 + 0 + 0 + 1 + + haze_horizon + + 0.64999997615814209 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 1 + -4.3711388286737929e-008 + 0 + + max_y + + 1745 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 1.5707963705062866 + sunlight_color + + 0.08999999612569809 + 0.070000007748603821 + 0.08999999612569809 + 0.029999999329447746 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Eugene%202.xml b/indra/newview/app_settings/windlight/skies/Places%20Eugene%202.xml index 85a0a2d93..424bcbb11 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Eugene%202.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Eugene%202.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.21000000834465027 - 0.029999997466802597 - 0 - 0.070000000298023224 - - blue_density - - 0.29999998211860657 - 0.29999998211860657 - 0.29999998211860657 - 0.14999999105930328 - - blue_horizon - - 0.47999998927116394 - 0.47999998927116394 - 0.47999998927116394 - 0.47999998927116394 - - cloud_color - - 0.29999998211860657 - 0.34999999403953552 - 0.029999999329447746 - 0.34999999403953552 - - cloud_pos_density1 - - 0.85999995470046997 - 0.42999997735023499 - 0.45999997854232788 - 1 - - cloud_pos_density2 - - 1 - 1 - 0.099999994039535522 - 1 - - cloud_scale - - 0.14000000059604645 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.644780158996582 - 10.423800468444824 - - cloud_shadow - - 0.2800000011920929 - 0 - 0 - 1 - - density_multiplier - - 0.00013999998918734491 - 0 - 0 - 1 - - distance_multiplier - - 37.799999237060547 - 0 - 0 - 1 - - east_angle - 1.382300853729248 - enable_cloud_scroll - - 1 - 1 - - gamma - - 4.190000057220459 - 0 - 0 - 1 - - glow - - 8.8000011444091797 - 0.0013735899701714516 - -0.94999998807907104 - 1 - - haze_density - - 4 - 0 - 0 - 1 - - haze_horizon - - 0.019999999552965164 - 0.13210900127887726 - 0.13210900127887726 - 1 - - lightnorm - - -0.98228728771209717 - 0 - 0.18738122284412384 - 0 - - max_y - - 1396 - 0 - 0 - 1 - - preset_num - 5 - star_brightness - 2 - sun_angle - 0 - sunlight_color - - 1.2300000190734863 - 0.82000011205673218 - 0.84000003337860107 - 1.2899999618530273 - - - + + + ambient + + 0.21000000834465027 + 0.029999997466802597 + 0 + 0.070000000298023224 + + blue_density + + 0.29999998211860657 + 0.29999998211860657 + 0.29999998211860657 + 0.14999999105930328 + + blue_horizon + + 0.47999998927116394 + 0.47999998927116394 + 0.47999998927116394 + 0.47999998927116394 + + cloud_color + + 0.29999998211860657 + 0.34999999403953552 + 0.029999999329447746 + 0.34999999403953552 + + cloud_pos_density1 + + 0.85999995470046997 + 0.42999997735023499 + 0.45999997854232788 + 1 + + cloud_pos_density2 + + 1 + 1 + 0.099999994039535522 + 1 + + cloud_scale + + 0.14000000059604645 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.644780158996582 + 10.423800468444824 + + cloud_shadow + + 0.2800000011920929 + 0 + 0 + 1 + + density_multiplier + + 0.00013999998918734491 + 0 + 0 + 1 + + distance_multiplier + + 37.799999237060547 + 0 + 0 + 1 + + east_angle + 1.382300853729248 + enable_cloud_scroll + + 1 + 1 + + gamma + + 4.190000057220459 + 0 + 0 + 1 + + glow + + 8.8000011444091797 + 0.0013735899701714516 + -0.94999998807907104 + 1 + + haze_density + + 4 + 0 + 0 + 1 + + haze_horizon + + 0.019999999552965164 + 0.13210900127887726 + 0.13210900127887726 + 1 + + lightnorm + + -0.98228728771209717 + 0 + 0.18738122284412384 + 0 + + max_y + + 1396 + 0 + 0 + 1 + + preset_num + 5 + star_brightness + 2 + sun_angle + 0 + sunlight_color + + 1.2300000190734863 + 0.82000011205673218 + 0.84000003337860107 + 1.2899999618530273 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Eugene%20BL.xml b/indra/newview/app_settings/windlight/skies/Places%20Eugene%20BL.xml index 2402f44d0..d5feeb1ac 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Eugene%20BL.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Eugene%20BL.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.21000000834465027 - 0.029999997466802597 - 0 - 0.070000000298023224 - - blue_density - - 0.29999998211860657 - 0.29999998211860657 - 0.29999998211860657 - 0.14999999105930328 - - blue_horizon - - 0.47999998927116394 - 0.17142856121063232 - 0 - 0.23999999463558197 - - cloud_color - - 0.29999998211860657 - 0.34999999403953552 - 0.029999999329447746 - 0.34999999403953552 - - cloud_pos_density1 - - 0.85999995470046997 - 0.42999997735023499 - 0.45999997854232788 - 1 - - cloud_pos_density2 - - 1 - 1 - 0.099999994039535522 - 1 - - cloud_scale - - 0.14000000059604645 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.644780158996582 - 10.423800468444824 - - cloud_shadow - - 0.2800000011920929 - 0 - 0 - 1 - - density_multiplier - - 0.00013999998918734491 - 0 - 0 - 1 - - distance_multiplier - - 37.799999237060547 - 0 - 0 - 1 - - east_angle - 1.382300853729248 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.1499999761581421 - 0 - 0 - 1 - - glow - - 8.8000011444091797 - 0.0013735899701714516 - -0.94999998807907104 - 1 - - haze_density - - 1.7300000190734863 - 0 - 0 - 1 - - haze_horizon - - 0.14999999105930328 - 0.13210900127887726 - 0.13210900127887726 - 1 - - lightnorm - - -0.98228728771209717 - 0 - 0.18738122284412384 - 0 - - max_y - - 1396 - 0 - 0 - 1 - - preset_num - 5 - star_brightness - 2 - sun_angle - 0 - sunlight_color - - 1.2300000190734863 - 0.82000011205673218 - 0 - 0.40999999642372131 - - - + + + ambient + + 0.21000000834465027 + 0.029999997466802597 + 0 + 0.070000000298023224 + + blue_density + + 0.29999998211860657 + 0.29999998211860657 + 0.29999998211860657 + 0.14999999105930328 + + blue_horizon + + 0.47999998927116394 + 0.17142856121063232 + 0 + 0.23999999463558197 + + cloud_color + + 0.29999998211860657 + 0.34999999403953552 + 0.029999999329447746 + 0.34999999403953552 + + cloud_pos_density1 + + 0.85999995470046997 + 0.42999997735023499 + 0.45999997854232788 + 1 + + cloud_pos_density2 + + 1 + 1 + 0.099999994039535522 + 1 + + cloud_scale + + 0.14000000059604645 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.644780158996582 + 10.423800468444824 + + cloud_shadow + + 0.2800000011920929 + 0 + 0 + 1 + + density_multiplier + + 0.00013999998918734491 + 0 + 0 + 1 + + distance_multiplier + + 37.799999237060547 + 0 + 0 + 1 + + east_angle + 1.382300853729248 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.1499999761581421 + 0 + 0 + 1 + + glow + + 8.8000011444091797 + 0.0013735899701714516 + -0.94999998807907104 + 1 + + haze_density + + 1.7300000190734863 + 0 + 0 + 1 + + haze_horizon + + 0.14999999105930328 + 0.13210900127887726 + 0.13210900127887726 + 1 + + lightnorm + + -0.98228728771209717 + 0 + 0.18738122284412384 + 0 + + max_y + + 1396 + 0 + 0 + 1 + + preset_num + 5 + star_brightness + 2 + sun_angle + 0 + sunlight_color + + 1.2300000190734863 + 0.82000011205673218 + 0 + 0.40999999642372131 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Greed.xml b/indra/newview/app_settings/windlight/skies/Places%20Greed.xml index 268716b94..8c4cdbb39 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Greed.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Greed.xml @@ -1,141 +1,141 @@ - - - ambient - - 1.1699999570846558 - 0.95727264881134033 - 0.95727264881134033 - 0.38999998569488525 - - blue_density - - 0.14522500336170197 - 0.39999699592590332 - 0.80000197887420654 - 1 - - blue_horizon - - 0.10767599940299988 - 0.21348699927330017 - 0.25 - 1 - - cloud_color - - 0.22615399956703186 - 0.22615399956703186 - 0.22615399956703186 - 1 - - cloud_pos_density1 - - 1.6884100437164307 - 0.52609699964523315 - 0.87999999523162842 - 1 - - cloud_pos_density2 - - 1.6884100437164307 - 0.52609699964523315 - 0.125 - 1 - - cloud_scale - - 0.41999998688697815 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.26999998092651367 - 0 - 0 - 1 - - density_multiplier - - 0.00046000001020729542 - 0 - 0 - 1 - - distance_multiplier - - 1 - 0 - 0 - 1 - - east_angle - 5.4035391807556152 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.6200000047683716 - 0 - 0 - 1 - - glow - - 4.2000007629394531 - 0.0010000000474974513 - -0 - 1 - - haze_density - - 0.69999998807907104 - 0 - 0 - 1 - - haze_horizon - - 0.15999999642372131 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.75594335794448853 - 0.19354932010173798 - -0.6253705620765686 - 0 - - max_y - - 562.5 - 0 - 0 - 1 - - preset_num - 22 - star_brightness - 0 - sun_angle - 2.9468140602111816 - sunlight_color - - 2.8385701179504395 - 2.8385701179504395 - 2.8385701179504395 - 1 - - - + + + ambient + + 1.1699999570846558 + 0.95727264881134033 + 0.95727264881134033 + 0.38999998569488525 + + blue_density + + 0.14522500336170197 + 0.39999699592590332 + 0.80000197887420654 + 1 + + blue_horizon + + 0.10767599940299988 + 0.21348699927330017 + 0.25 + 1 + + cloud_color + + 0.22615399956703186 + 0.22615399956703186 + 0.22615399956703186 + 1 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.87999999523162842 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00046000001020729542 + 0 + 0 + 1 + + distance_multiplier + + 1 + 0 + 0 + 1 + + east_angle + 5.4035391807556152 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.6200000047683716 + 0 + 0 + 1 + + glow + + 4.2000007629394531 + 0.0010000000474974513 + -0 + 1 + + haze_density + + 0.69999998807907104 + 0 + 0 + 1 + + haze_horizon + + 0.15999999642372131 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.75594335794448853 + 0.19354932010173798 + -0.6253705620765686 + 0 + + max_y + + 562.5 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 2.9468140602111816 + sunlight_color + + 2.8385701179504395 + 2.8385701179504395 + 2.8385701179504395 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Greed2.xml b/indra/newview/app_settings/windlight/skies/Places%20Greed2.xml index ec5282f7e..e9cbacddc 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Greed2.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Greed2.xml @@ -1,141 +1,141 @@ - - - ambient - - 1.1699999570846558 - 0.95727264881134033 - 0.95727264881134033 - 0.38999998569488525 - - blue_density - - 0.14522500336170197 - 0.39999699592590332 - 0.80000197887420654 - 1 - - blue_horizon - - 0.10767599940299988 - 0.21348699927330017 - 0.25 - 1 - - cloud_color - - 0.22615399956703186 - 0.22615399956703186 - 0.22615399956703186 - 1 - - cloud_pos_density1 - - 1.6884100437164307 - 0.52609699964523315 - 0.87999999523162842 - 1 - - cloud_pos_density2 - - 1.6884100437164307 - 0.52609699964523315 - 0.125 - 1 - - cloud_scale - - 0.41999998688697815 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.26999998092651367 - 0 - 0 - 1 - - density_multiplier - - 0.00046000001020729542 - 0 - 0 - 1 - - distance_multiplier - - 1 - 0 - 0 - 1 - - east_angle - 2.9530971050262451 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.2200000286102295 - 0 - 0 - 1 - - glow - - 4.2000007629394531 - 0.0010000000474974513 - -0 - 1 - - haze_density - - 0.69999998807907104 - 0 - 0 - 1 - - haze_horizon - - 0.15999999642372131 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.18383802473545074 - 0.19354932010173798 - 0.96371269226074219 - 0 - - max_y - - 562.5 - 0 - 0 - 1 - - preset_num - 22 - star_brightness - 0 - sun_angle - 2.9468140602111816 - sunlight_color - - 2.8385701179504395 - 2.8385701179504395 - 2.8385701179504395 - 1 - - - + + + ambient + + 1.1699999570846558 + 0.95727264881134033 + 0.95727264881134033 + 0.38999998569488525 + + blue_density + + 0.14522500336170197 + 0.39999699592590332 + 0.80000197887420654 + 1 + + blue_horizon + + 0.10767599940299988 + 0.21348699927330017 + 0.25 + 1 + + cloud_color + + 0.22615399956703186 + 0.22615399956703186 + 0.22615399956703186 + 1 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.87999999523162842 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00046000001020729542 + 0 + 0 + 1 + + distance_multiplier + + 1 + 0 + 0 + 1 + + east_angle + 2.9530971050262451 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.2200000286102295 + 0 + 0 + 1 + + glow + + 4.2000007629394531 + 0.0010000000474974513 + -0 + 1 + + haze_density + + 0.69999998807907104 + 0 + 0 + 1 + + haze_horizon + + 0.15999999642372131 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.18383802473545074 + 0.19354932010173798 + 0.96371269226074219 + 0 + + max_y + + 562.5 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 2.9468140602111816 + sunlight_color + + 2.8385701179504395 + 2.8385701179504395 + 2.8385701179504395 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Imagine.xml b/indra/newview/app_settings/windlight/skies/Places%20Imagine.xml index 48fba1e31..16f07309a 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Imagine.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Imagine.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.68999993801116943 - 0.68999993801116943 - 0.68999993801116943 - 0.68999993801116943 - - blue_density - - 0.97999995946884155 - 0.97999995946884155 - 0.97999995946884155 - 0.48999997973442078 - - blue_horizon - - 0.25999999046325684 - 0.29999998211860657 - 0.37999999523162842 - 0.37999999523162842 - - cloud_color - - 0.50999999046325684 - 0.50999999046325684 - 0.50999999046325684 - 1 - - cloud_pos_density1 - - 0.5 - 0.5 - 1 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.079999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.25999999046325684 - 0 - 0 - 1 - - density_multiplier - - 0.00038999997195787728 - 0 - 0 - 1 - - distance_multiplier - - 11.5 - 0 - 0 - 1 - - east_angle - 5.7176985740661621 - enable_cloud_scroll - - 1 - 1 - - gamma - - 0.68000000715255737 - 0 - 0 - 1 - - glow - - 12.399999618530273 - 0.0010000000474974513 - -1.8500000238418579 - 1 - - haze_density - - 1.8899999856948853 - 0 - 0 - 1 - - haze_horizon - - 0.23999999463558197 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.41922605037689209 - 0.6227877140045166 - -0.6605944037437439 - 0 - - max_y - - 940 - 0 - 0 - 1 - - preset_num - 21 - star_brightness - 0 - sun_angle - 2.4692919254302979 - sunlight_color - - 2.6700000762939453 - 2.6700000762939453 - 2.6700000762939453 - 0.88999998569488525 - - - + + + ambient + + 0.68999993801116943 + 0.68999993801116943 + 0.68999993801116943 + 0.68999993801116943 + + blue_density + + 0.97999995946884155 + 0.97999995946884155 + 0.97999995946884155 + 0.48999997973442078 + + blue_horizon + + 0.25999999046325684 + 0.29999998211860657 + 0.37999999523162842 + 0.37999999523162842 + + cloud_color + + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.25999999046325684 + 0 + 0 + 1 + + density_multiplier + + 0.00038999997195787728 + 0 + 0 + 1 + + distance_multiplier + + 11.5 + 0 + 0 + 1 + + east_angle + 5.7176985740661621 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.68000000715255737 + 0 + 0 + 1 + + glow + + 12.399999618530273 + 0.0010000000474974513 + -1.8500000238418579 + 1 + + haze_density + + 1.8899999856948853 + 0 + 0 + 1 + + haze_horizon + + 0.23999999463558197 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.41922605037689209 + 0.6227877140045166 + -0.6605944037437439 + 0 + + max_y + + 940 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.4692919254302979 + sunlight_color + + 2.6700000762939453 + 2.6700000762939453 + 2.6700000762939453 + 0.88999998569488525 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Kingsport.xml b/indra/newview/app_settings/windlight/skies/Places%20Kingsport.xml index dfaf68596..ca9d735b8 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Kingsport.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Kingsport.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.32999998331069946 - 0.32999998331069946 - 0.32999998331069946 - 0.32999998331069946 - - blue_density - - 0 - 0 - 0 - 0 - - blue_horizon - - 0.16199998557567596 - 0.76855206489562988 - 0.89999997615814209 - 0.44999998807907104 - - cloud_color - - 0.69999998807907104 - 0.69999998807907104 - 0.69999998807907104 - 0.69999998807907104 - - cloud_pos_density1 - - 0.5 - 0.5 - 0.53999996185302734 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.29999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.39999997615814209 - 0 - 0 - 1 - - density_multiplier - - 0.00058999995235353708 - 0 - 0 - 1 - - distance_multiplier - - 12.800000190734863 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.4199999570846558 - 0 - 0 - 1 - - glow - - 3.7999999523162842 - 0.0010000000474974513 - -0.5 - 1 - - haze_density - - 4 - 0 - 0 - 1 - - haze_horizon - - 0.64999997615814209 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0 - 1 - -4.3711388286737929e-008 - 0 - - max_y - - 2013 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 1.5707963705062866 - sunlight_color - - 0.53999996185302734 - 0.53999996185302734 - 0.53999996185302734 - 0.17999999225139618 - - - + + + ambient + + 0.32999998331069946 + 0.32999998331069946 + 0.32999998331069946 + 0.32999998331069946 + + blue_density + + 0 + 0 + 0 + 0 + + blue_horizon + + 0.16199998557567596 + 0.76855206489562988 + 0.89999997615814209 + 0.44999998807907104 + + cloud_color + + 0.69999998807907104 + 0.69999998807907104 + 0.69999998807907104 + 0.69999998807907104 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.53999996185302734 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.29999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.39999997615814209 + 0 + 0 + 1 + + density_multiplier + + 0.00058999995235353708 + 0 + 0 + 1 + + distance_multiplier + + 12.800000190734863 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.4199999570846558 + 0 + 0 + 1 + + glow + + 3.7999999523162842 + 0.0010000000474974513 + -0.5 + 1 + + haze_density + + 4 + 0 + 0 + 1 + + haze_horizon + + 0.64999997615814209 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 1 + -4.3711388286737929e-008 + 0 + + max_y + + 2013 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 1.5707963705062866 + sunlight_color + + 0.53999996185302734 + 0.53999996185302734 + 0.53999996185302734 + 0.17999999225139618 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Kunming.xml b/indra/newview/app_settings/windlight/skies/Places%20Kunming.xml index e641bebcc..63fbf30f4 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Kunming.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Kunming.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.89999997615814209 - 0.80999994277954102 - 0.80999994277954102 - 0.89999997615814209 - - blue_density - - 0.14522500336170197 - 0.39999699592590332 - 0.80000197887420654 - 1 - - blue_horizon - - 0.10767599940299988 - 0.21348699927330017 - 0.25 - 1 - - cloud_color - - 0.22615399956703186 - 0.22615399956703186 - 0.22615399956703186 - 1 - - cloud_pos_density1 - - 0.5 - 0.5 - 0.87999999523162842 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.32999998331069946 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.48999997973442078 - 0 - 0 - 1 - - density_multiplier - - 0.00059999997029080987 - 0 - 0 - 1 - - distance_multiplier - - 18.200000762939453 - 0 - 0 - 1 - - east_angle - 3.2044246196746826 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.4199999570846558 - 0 - 0 - 1 - - glow - - 5 - 0.0010000000474974513 - -0.39999997615814209 - 1 - - haze_density - - 0.68000000715255737 - 0 - 0 - 1 - - haze_horizon - - 0.43999999761581421 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.062790632247924805 - 0 - 0.99802672863006592 - 0 - - max_y - - 859 - 0 - 0 - 1 - - preset_num - 21 - star_brightness - 0 - sun_angle - 3.2044248580932617 - sunlight_color - - 2.8385701179504395 - 2.8385701179504395 - 2.8385701179504395 - 1 - - - + + + ambient + + 0.89999997615814209 + 0.80999994277954102 + 0.80999994277954102 + 0.89999997615814209 + + blue_density + + 0.14522500336170197 + 0.39999699592590332 + 0.80000197887420654 + 1 + + blue_horizon + + 0.10767599940299988 + 0.21348699927330017 + 0.25 + 1 + + cloud_color + + 0.22615399956703186 + 0.22615399956703186 + 0.22615399956703186 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.87999999523162842 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.32999998331069946 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.48999997973442078 + 0 + 0 + 1 + + density_multiplier + + 0.00059999997029080987 + 0 + 0 + 1 + + distance_multiplier + + 18.200000762939453 + 0 + 0 + 1 + + east_angle + 3.2044246196746826 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.4199999570846558 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.39999997615814209 + 1 + + haze_density + + 0.68000000715255737 + 0 + 0 + 1 + + haze_horizon + + 0.43999999761581421 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.062790632247924805 + 0 + 0.99802672863006592 + 0 + + max_y + + 859 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 3.2044248580932617 + sunlight_color + + 2.8385701179504395 + 2.8385701179504395 + 2.8385701179504395 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Las%20Legunas.xml b/indra/newview/app_settings/windlight/skies/Places%20Las%20Legunas.xml index 4121f8fa6..5f8fe690d 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Las%20Legunas.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Las%20Legunas.xml @@ -1,141 +1,141 @@ - - - ambient - - 1.7372221946716309 - 1.7699999809265137 - 1.5899999141693115 - 1.7999999523162842 - - blue_density - - 0.5 - 0.97999995946884155 - 0.97999995946884155 - 0.48999997973442078 - - blue_horizon - - 0.31999999284744263 - 0.2800000011920929 - 0.37999999523162842 - 0.37999999523162842 - - cloud_color - - 0.50999999046325684 - 0.50999999046325684 - 0.50999999046325684 - 1 - - cloud_pos_density1 - - 0.8399999737739563 - 0.5899999737739563 - 1 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.079999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.17000000178813934 - 0 - 0 - 1 - - density_multiplier - - 0.00033999999868683517 - 0 - 0 - 1 - - distance_multiplier - - 4.0999999046325684 - 0 - 0 - 1 - - east_angle - 0.56548666954040527 - enable_cloud_scroll - - 1 - 1 - - gamma - - 0.94999998807907104 - 0 - 0 - 1 - - glow - - 11.600000381469727 - 0.0010000000474974513 - -2.2999999523162842 - 1 - - haze_density - - 1.9199999570846558 - 0 - 0 - 1 - - haze_horizon - - 0.15999999642372131 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.38828861713409424 - 0.68911367654800415 - -0.61184495687484741 - 0 - - max_y - - 403 - 0 - 0 - 1 - - preset_num - 21 - star_brightness - 0 - sun_angle - 2.3813273906707764 - sunlight_color - - 1.4399999380111694 - 1.4699999094009399 - 1.4399999380111694 - 1.4699999094009399 - - - + + + ambient + + 1.7372221946716309 + 1.7699999809265137 + 1.5899999141693115 + 1.7999999523162842 + + blue_density + + 0.5 + 0.97999995946884155 + 0.97999995946884155 + 0.48999997973442078 + + blue_horizon + + 0.31999999284744263 + 0.2800000011920929 + 0.37999999523162842 + 0.37999999523162842 + + cloud_color + + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + 1 + + cloud_pos_density1 + + 0.8399999737739563 + 0.5899999737739563 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.17000000178813934 + 0 + 0 + 1 + + density_multiplier + + 0.00033999999868683517 + 0 + 0 + 1 + + distance_multiplier + + 4.0999999046325684 + 0 + 0 + 1 + + east_angle + 0.56548666954040527 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.94999998807907104 + 0 + 0 + 1 + + glow + + 11.600000381469727 + 0.0010000000474974513 + -2.2999999523162842 + 1 + + haze_density + + 1.9199999570846558 + 0 + 0 + 1 + + haze_horizon + + 0.15999999642372131 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.38828861713409424 + 0.68911367654800415 + -0.61184495687484741 + 0 + + max_y + + 403 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.3813273906707764 + sunlight_color + + 1.4399999380111694 + 1.4699999094009399 + 1.4399999380111694 + 1.4699999094009399 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Legacies.xml b/indra/newview/app_settings/windlight/skies/Places%20Legacies.xml index a8284bb2a..23ea8c7f4 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Legacies.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Legacies.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.32999998331069946 - 0.32999998331069946 - 0.32999998331069946 - 0.10999999940395355 - - blue_density - - 0.19999998807907104 - 0.39999699592590332 - 1.0199999809265137 - 1.0199999809265137 - - blue_horizon - - 0.16199998557567596 - 0.76855206489562988 - 0.89999997615814209 - 0.44999998807907104 - - cloud_color - - 0.69999998807907104 - 0.69999998807907104 - 0.69999998807907104 - 0.69999998807907104 - - cloud_pos_density1 - - 0.5 - 0.5 - 0.53999996185302734 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.29999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.39999997615814209 - 0 - 0 - 1 - - density_multiplier - - 0.00039999998989515007 - 0 - 0 - 1 - - distance_multiplier - - 14.199999809265137 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.2799999713897705 - 0 - 0 - 1 - - glow - - 3.7999999523162842 - 0.0010000000474974513 - -0.39999997615814209 - 1 - - haze_density - - 3.8599998950958252 - 0 - 0 - 1 - - haze_horizon - - 0.77999997138977051 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0 - 0.99715888500213623 - -0.07532694935798645 - 0 - - max_y - - 1745 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 1.6461946964263916 - sunlight_color - - 0.53999996185302734 - 0.53999996185302734 - 0.53999996185302734 - 0.17999999225139618 - - - + + + ambient + + 0.32999998331069946 + 0.32999998331069946 + 0.32999998331069946 + 0.10999999940395355 + + blue_density + + 0.19999998807907104 + 0.39999699592590332 + 1.0199999809265137 + 1.0199999809265137 + + blue_horizon + + 0.16199998557567596 + 0.76855206489562988 + 0.89999997615814209 + 0.44999998807907104 + + cloud_color + + 0.69999998807907104 + 0.69999998807907104 + 0.69999998807907104 + 0.69999998807907104 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.53999996185302734 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.29999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.39999997615814209 + 0 + 0 + 1 + + density_multiplier + + 0.00039999998989515007 + 0 + 0 + 1 + + distance_multiplier + + 14.199999809265137 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.2799999713897705 + 0 + 0 + 1 + + glow + + 3.7999999523162842 + 0.0010000000474974513 + -0.39999997615814209 + 1 + + haze_density + + 3.8599998950958252 + 0 + 0 + 1 + + haze_horizon + + 0.77999997138977051 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.99715888500213623 + -0.07532694935798645 + 0 + + max_y + + 1745 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 1.6461946964263916 + sunlight_color + + 0.53999996185302734 + 0.53999996185302734 + 0.53999996185302734 + 0.17999999225139618 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Midian.xml b/indra/newview/app_settings/windlight/skies/Places%20Midian.xml index 40a34a4a9..a9952a279 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Midian.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Midian.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.85248766300455259 - 0.69348653809556993 - 0.71145841248196007 - 0.83318269234937503 - - blue_density - - 0.20779243499502797 - 0.41026214234642566 - 0.72814986965084927 - 1 - - blue_horizon - - 0.13484086845960519 - 0.21892986884401466 - 0.24794709491764877 - 1 - - cloud_color - - 0.22615399956703186 - 0.22615399956703186 - 0.22615399956703186 - 1 - - cloud_pos_density1 - - 1.6884100437164307 - 0.52609699964523315 - 0.87999999523162842 - 1 - - cloud_pos_density2 - - 1.6884100437164307 - 0.52609699964523315 - 0.125 - 1 - - cloud_scale - - 0.41999998688697815 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.26999998092651367 - 0 - 0 - 1 - - density_multiplier - - 0.00029999998514540493 - 0 - 0 - 1 - - distance_multiplier - - 4.0999999046325684 - 0 - 0 - 1 - - east_angle - 6.2831854820251465 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.3500000238418579 - 0 - 0 - 1 - - glow - - 5 - 0.0010000000474974513 - -0.47999998927116394 - 1 - - haze_density - - 1.3774588671593051 - 0 - 0 - 1 - - haze_horizon - - 0.29999998211860657 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 1.7484556735780643e-007 - 0 - -1 - 0 - - max_y - - 564 - 0 - 0 - 1 - - preset_num - 22 - star_brightness - 0.41058114171028137 - sun_angle - 3.2044248580932617 - sunlight_color - - 2.3274268943138168 - 2.3288588977004565 - 2.3913246215581694 - 0.83987117651068388 - - - + + + ambient + + 0.85248766300455259 + 0.69348653809556993 + 0.71145841248196007 + 0.83318269234937503 + + blue_density + + 0.20779243499502797 + 0.41026214234642566 + 0.72814986965084927 + 1 + + blue_horizon + + 0.13484086845960519 + 0.21892986884401466 + 0.24794709491764877 + 1 + + cloud_color + + 0.22615399956703186 + 0.22615399956703186 + 0.22615399956703186 + 1 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.87999999523162842 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.26999998092651367 + 0 + 0 + 1 + + density_multiplier + + 0.00029999998514540493 + 0 + 0 + 1 + + distance_multiplier + + 4.0999999046325684 + 0 + 0 + 1 + + east_angle + 6.2831854820251465 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.3500000238418579 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 1.3774588671593051 + 0 + 0 + 1 + + haze_horizon + + 0.29999998211860657 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 1.7484556735780643e-007 + 0 + -1 + 0 + + max_y + + 564 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.41058114171028137 + sun_angle + 3.2044248580932617 + sunlight_color + + 2.3274268943138168 + 2.3288588977004565 + 2.3913246215581694 + 0.83987117651068388 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Mother.xml b/indra/newview/app_settings/windlight/skies/Places%20Mother.xml index 753cf0706..f023530df 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Mother.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Mother.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.71999996900558472 - 0.54638898372650146 - 0.58705025911331177 - 0.71999996900558472 - - blue_density - - 0.28678349408657766 - 0.42322183665254443 - 0.63743695308465931 - 1 - - blue_horizon - - 0.16913637525681224 - 0.22580146354854946 - 0.24535531286049661 - 1 - - cloud_color - - 0.22615399956703186 - 0.22615399956703186 - 0.22615399956703186 - 1 - - cloud_pos_density1 - - 1.6884100437164307 - 0.52609699964523315 - 0.70999997854232788 - 1 - - cloud_pos_density2 - - 1.6884100437164307 - 0.20999999344348907 - 0.125 - 1 - - cloud_scale - - 0.3399999737739563 - 0 - 0 - 1 - - cloud_scroll_rate - - 8.6099996566772461 - 6.2799997329711914 - - cloud_shadow - - 0.23999999463558197 - 0 - 0 - 1 - - density_multiplier - - 0.00031999999191612005 - 0 - 0 - 1 - - distance_multiplier - - 40.5 - 0 - 0 - 1 - - east_angle - 1.8849555253982544 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.7599999904632568 - 0 - 0 - 1 - - glow - - 5.7999992370605469 - 0.0010000000474974513 - -1.1000000238418579 - 1 - - haze_density - - 2.2327472009226881 - 0 - 0 - 1 - - haze_horizon - - 0.085684981703968377 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.60160976648330688 - 0.77450323104858398 - -0.19547481834888458 - 1 - - max_y - - 644 - 0 - 0 - 1 - - preset_num - 22 - star_brightness - 0.92893773317337036 - sun_angle - 4.027522087097168 - sunlight_color - - 2.624443531036377 - 2.6294984817504883 - 2.8499999046325684 - 0.94999998807907104 - - - + + + ambient + + 0.71999996900558472 + 0.54638898372650146 + 0.58705025911331177 + 0.71999996900558472 + + blue_density + + 0.28678349408657766 + 0.42322183665254443 + 0.63743695308465931 + 1 + + blue_horizon + + 0.16913637525681224 + 0.22580146354854946 + 0.24535531286049661 + 1 + + cloud_color + + 0.22615399956703186 + 0.22615399956703186 + 0.22615399956703186 + 1 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.70999997854232788 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.20999999344348907 + 0.125 + 1 + + cloud_scale + + 0.3399999737739563 + 0 + 0 + 1 + + cloud_scroll_rate + + 8.6099996566772461 + 6.2799997329711914 + + cloud_shadow + + 0.23999999463558197 + 0 + 0 + 1 + + density_multiplier + + 0.00031999999191612005 + 0 + 0 + 1 + + distance_multiplier + + 40.5 + 0 + 0 + 1 + + east_angle + 1.8849555253982544 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.7599999904632568 + 0 + 0 + 1 + + glow + + 5.7999992370605469 + 0.0010000000474974513 + -1.1000000238418579 + 1 + + haze_density + + 2.2327472009226881 + 0 + 0 + 1 + + haze_horizon + + 0.085684981703968377 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.60160976648330688 + 0.77450323104858398 + -0.19547481834888458 + 1 + + max_y + + 644 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.92893773317337036 + sun_angle + 4.027522087097168 + sunlight_color + + 2.624443531036377 + 2.6294984817504883 + 2.8499999046325684 + 0.94999998807907104 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Old%20New%20York.xml b/indra/newview/app_settings/windlight/skies/Places%20Old%20New%20York.xml index df356084b..c08afdc3f 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Old%20New%20York.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Old%20New%20York.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.56999999284744263 - 0.59999996423721313 - 0.71999996900558472 - 0.71999996900558472 - - blue_density - - 0.14522500336170197 - 0.39999699592590332 - 0.80000197887420654 - 1 - - blue_horizon - - 0.23999999463558197 - 0.30000001192092896 - 0.35131001472473145 - 0.37999999523162842 - - cloud_color - - 0.12862999737262726 - 0.12862999737262726 - 0.12862999737262726 - 1 - - cloud_pos_density1 - - 0.88419097661972046 - 0.53047597408294678 - 0.4270470142364502 - 1 - - cloud_pos_density2 - - 0.38419300317764282 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.41999998688697815 - 0 - 0 - 1 - - cloud_scroll_rate - - 10 - 10 - - cloud_shadow - - 0.61711597442626953 - 0 - 0 - 1 - - density_multiplier - - 0.00013000000035390258 - 0 - 0 - 1 - - distance_multiplier - - 18.899999618530273 - 0 - 0 - 1 - - east_angle - 5.4035391807556152 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.6899999380111694 - 0 - 0 - 1 - - glow - - 4.4000005722045898 - 0.0012815999798476696 - -0.64999997615814209 - 1 - - haze_density - - 4 - 0 - 0 - 1 - - haze_horizon - - 0.17000000178813934 - 0.21744099259376526 - 0.21744099259376526 - 1 - - lightnorm - - 0.76102709770202637 - 0.15643447637557983 - 0.62957614660263062 - 0 - - max_y - - 4000 - 0 - 0 - 1 - - preset_num - 2 - star_brightness - 0.65999996662139893 - sun_angle - 0.15707963705062866 - sunlight_color - - 1.3199999332427979 - 0.69959986209869385 - 0.71279996633529663 - 0.43999999761581421 - - - + + + ambient + + 0.56999999284744263 + 0.59999996423721313 + 0.71999996900558472 + 0.71999996900558472 + + blue_density + + 0.14522500336170197 + 0.39999699592590332 + 0.80000197887420654 + 1 + + blue_horizon + + 0.23999999463558197 + 0.30000001192092896 + 0.35131001472473145 + 0.37999999523162842 + + cloud_color + + 0.12862999737262726 + 0.12862999737262726 + 0.12862999737262726 + 1 + + cloud_pos_density1 + + 0.88419097661972046 + 0.53047597408294678 + 0.4270470142364502 + 1 + + cloud_pos_density2 + + 0.38419300317764282 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10 + 10 + + cloud_shadow + + 0.61711597442626953 + 0 + 0 + 1 + + density_multiplier + + 0.00013000000035390258 + 0 + 0 + 1 + + distance_multiplier + + 18.899999618530273 + 0 + 0 + 1 + + east_angle + 5.4035391807556152 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.6899999380111694 + 0 + 0 + 1 + + glow + + 4.4000005722045898 + 0.0012815999798476696 + -0.64999997615814209 + 1 + + haze_density + + 4 + 0 + 0 + 1 + + haze_horizon + + 0.17000000178813934 + 0.21744099259376526 + 0.21744099259376526 + 1 + + lightnorm + + 0.76102709770202637 + 0.15643447637557983 + 0.62957614660263062 + 0 + + max_y + + 4000 + 0 + 0 + 1 + + preset_num + 2 + star_brightness + 0.65999996662139893 + sun_angle + 0.15707963705062866 + sunlight_color + + 1.3199999332427979 + 0.69959986209869385 + 0.71279996633529663 + 0.43999999761581421 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Paris%202.xml b/indra/newview/app_settings/windlight/skies/Places%20Paris%202.xml index 431ee1867..3dec0a6ba 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Paris%202.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Paris%202.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.85248766300455259 - 0.69348653809556993 - 0.71145841248196007 - 0.83318269234937503 - - blue_density - - 0.20779243499502797 - 0.41026214234642566 - 0.72814986965084927 - 1 - - blue_horizon - - 0.13484086845960519 - 0.21892986884401466 - 0.24794709491764877 - 1 - - cloud_color - - 0.22615399956703186 - 0.22615399956703186 - 0.22615399956703186 - 1 - - cloud_pos_density1 - - 1.6884100437164307 - 0.52609699964523315 - 0.87999999523162842 - 1 - - cloud_pos_density2 - - 1.6884100437164307 - 0.52609699964523315 - 0.125 - 1 - - cloud_scale - - 0.34999999403953552 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.31999999284744263 - 0 - 0 - 1 - - density_multiplier - - 0.00029999998514540493 - 0 - 0 - 1 - - distance_multiplier - - 4.0999999046325684 - 0 - 0 - 1 - - east_angle - 3.0787608623504639 - enable_cloud_scroll - - 1 - 1 - - gamma - - 2.1599998474121094 - 0 - 0 - 1 - - glow - - 8.4000015258789063 - 0.0010000000474974513 - -0.34999999403953552 - 1 - - haze_density - - 1.3774588671593051 - 0 - 0 - 1 - - haze_horizon - - 0.29999998211860657 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.062790460884571075 - 0 - 0.99802672863006592 - 0 - - max_y - - 564 - 0 - 0 - 1 - - preset_num - 22 - star_brightness - 0.41058114171028137 - sun_angle - 3.2044248580932617 - sunlight_color - - 2.3274268943138168 - 2.3288588977004565 - 2.3913246215581694 - 0.83987117651068388 - - - + + + ambient + + 0.85248766300455259 + 0.69348653809556993 + 0.71145841248196007 + 0.83318269234937503 + + blue_density + + 0.20779243499502797 + 0.41026214234642566 + 0.72814986965084927 + 1 + + blue_horizon + + 0.13484086845960519 + 0.21892986884401466 + 0.24794709491764877 + 1 + + cloud_color + + 0.22615399956703186 + 0.22615399956703186 + 0.22615399956703186 + 1 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.87999999523162842 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.34999999403953552 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.31999999284744263 + 0 + 0 + 1 + + density_multiplier + + 0.00029999998514540493 + 0 + 0 + 1 + + distance_multiplier + + 4.0999999046325684 + 0 + 0 + 1 + + east_angle + 3.0787608623504639 + enable_cloud_scroll + + 1 + 1 + + gamma + + 2.1599998474121094 + 0 + 0 + 1 + + glow + + 8.4000015258789063 + 0.0010000000474974513 + -0.34999999403953552 + 1 + + haze_density + + 1.3774588671593051 + 0 + 0 + 1 + + haze_horizon + + 0.29999998211860657 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.062790460884571075 + 0 + 0.99802672863006592 + 0 + + max_y + + 564 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.41058114171028137 + sun_angle + 3.2044248580932617 + sunlight_color + + 2.3274268943138168 + 2.3288588977004565 + 2.3913246215581694 + 0.83987117651068388 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Paris.xml b/indra/newview/app_settings/windlight/skies/Places%20Paris.xml index ebd2970c9..0d793c02e 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Paris.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Paris.xml @@ -1,141 +1,141 @@ - - - ambient - - 1.2300000190734863 - 1.0553969144821167 - 1.0920002460479736 - 1.2300000190734863 - - blue_density - - 0.57999998331069946 - 0.59999996423721313 - 0.77111077308654785 - 0.55220913887023926 - - blue_horizon - - 0.29999998211860657 - 0.41715732216835022 - 0.53167486190795898 - 0.65999996662139893 - - cloud_color - - 0.35893553611745688 - 0.35893553611745688 - 0.35893553611745688 - 0.57387644052505493 - - cloud_pos_density1 - - 1.6884100437164307 - 0.52609699964523315 - 0.96666919575807242 - 1 - - cloud_pos_density2 - - 1.6884100437164307 - 0.52609699964523315 - 0.125 - 1 - - cloud_scale - - 0.41999999993404913 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.283160487214445 - 10.010999818490745 - - cloud_shadow - - 0.23999999463558197 - 0 - 0 - 1 - - density_multiplier - - 7.0000001869630069e-005 - 0 - 0 - 1 - - distance_multiplier - - 2 - 0 - 0 - 1 - - east_angle - 3.8955750465393066 - enable_cloud_scroll - - 1 - 1 - - gamma - - 2.2300000190734863 - 0 - 0 - 1 - - glow - - 7.4000000953674316 - 0.0010000000474974513 - -0 - 1 - - haze_density - - 1.0499999523162842 - 0 - 0 - 1 - - haze_horizon - - 0.37999999523162842 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.68454724550247192 - 0 - 0.72896856069564819 - 0 - - max_y - - 268 - 0 - 0 - 1 - - preset_num - 22 - star_brightness - 0 - sun_angle - 3.2044248580932617 - sunlight_color - - 1.3187105655670166 - 1.3529220819473267 - 1.7100000381469727 - 1.7100000381469727 - - - + + + ambient + + 1.2300000190734863 + 1.0553969144821167 + 1.0920002460479736 + 1.2300000190734863 + + blue_density + + 0.57999998331069946 + 0.59999996423721313 + 0.77111077308654785 + 0.55220913887023926 + + blue_horizon + + 0.29999998211860657 + 0.41715732216835022 + 0.53167486190795898 + 0.65999996662139893 + + cloud_color + + 0.35893553611745688 + 0.35893553611745688 + 0.35893553611745688 + 0.57387644052505493 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.96666919575807242 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999999993404913 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.283160487214445 + 10.010999818490745 + + cloud_shadow + + 0.23999999463558197 + 0 + 0 + 1 + + density_multiplier + + 7.0000001869630069e-005 + 0 + 0 + 1 + + distance_multiplier + + 2 + 0 + 0 + 1 + + east_angle + 3.8955750465393066 + enable_cloud_scroll + + 1 + 1 + + gamma + + 2.2300000190734863 + 0 + 0 + 1 + + glow + + 7.4000000953674316 + 0.0010000000474974513 + -0 + 1 + + haze_density + + 1.0499999523162842 + 0 + 0 + 1 + + haze_horizon + + 0.37999999523162842 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.68454724550247192 + 0 + 0.72896856069564819 + 0 + + max_y + + 268 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 3.2044248580932617 + sunlight_color + + 1.3187105655670166 + 1.3529220819473267 + 1.7100000381469727 + 1.7100000381469727 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Pathfinder.xml b/indra/newview/app_settings/windlight/skies/Places%20Pathfinder.xml index 43e69daea..594b71c6e 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Pathfinder.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Pathfinder.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.47999998927116394 - 0.39111119508743286 - 0.31999999284744263 - 0.47999998927116394 - - blue_density - - 0.059999998658895493 - 0.059999998658895493 - 0.059999998658895493 - 0.029999999329447746 - - blue_horizon - - 1.8600000143051147 - 0.47999998927116394 - 0.47999998927116394 - 1.8600000143051147 - - cloud_color - - 0.28999999165534973 - 0.28999999165534973 - 0.31999999284744263 - 0.31999999284744263 - - cloud_pos_density1 - - 0.5 - 0.5 - 1 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.079999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 9.9299993515014648 - - cloud_shadow - - 0.32999998331069946 - 0 - 0 - 1 - - density_multiplier - - 0.00019999999494757503 - 0 - 0 - 1 - - distance_multiplier - - 3.4000000953674316 - 0 - 0 - 1 - - east_angle - 1.8849555253982544 - enable_cloud_scroll - - 1 - 1 - - gamma - - 0.74000000953674316 - 0 - 0 - 1 - - glow - - 5 - 0.0010000000474974513 - -0.33000001311302185 - 1 - - haze_density - - 2.809999942779541 - 0 - 0 - 1 - - haze_horizon - - 0.23999999463558197 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.87044608592987061 - 0.4029063880443573 - 0.28282502293586731 - 0 - - max_y - - 752 - 0 - 0 - 1 - - preset_num - 21 - star_brightness - 0 - sun_angle - 2.7269024848937988 - sunlight_color - - 1.8600000143051147 - 1.7699999809265137 - 1.6537500619888306 - 1.8600000143051147 - - - + + + ambient + + 0.47999998927116394 + 0.39111119508743286 + 0.31999999284744263 + 0.47999998927116394 + + blue_density + + 0.059999998658895493 + 0.059999998658895493 + 0.059999998658895493 + 0.029999999329447746 + + blue_horizon + + 1.8600000143051147 + 0.47999998927116394 + 0.47999998927116394 + 1.8600000143051147 + + cloud_color + + 0.28999999165534973 + 0.28999999165534973 + 0.31999999284744263 + 0.31999999284744263 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 9.9299993515014648 + + cloud_shadow + + 0.32999998331069946 + 0 + 0 + 1 + + density_multiplier + + 0.00019999999494757503 + 0 + 0 + 1 + + distance_multiplier + + 3.4000000953674316 + 0 + 0 + 1 + + east_angle + 1.8849555253982544 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.74000000953674316 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.33000001311302185 + 1 + + haze_density + + 2.809999942779541 + 0 + 0 + 1 + + haze_horizon + + 0.23999999463558197 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.87044608592987061 + 0.4029063880443573 + 0.28282502293586731 + 0 + + max_y + + 752 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.7269024848937988 + sunlight_color + + 1.8600000143051147 + 1.7699999809265137 + 1.6537500619888306 + 1.8600000143051147 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Sand.xml b/indra/newview/app_settings/windlight/skies/Places%20Sand.xml index da66198d5..e05ed8c01 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Sand.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Sand.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.59999996423721313 - 0.4888889491558075 - 0.40000000596046448 - 0.19999998807907104 - - blue_density - - 2 - 0.97999995946884155 - 0.97999995946884155 - 2 - - blue_horizon - - 0.71999996900558472 - 0.50086963176727295 - 0.50086963176727295 - 0.35999998450279236 - - cloud_color - - 0.28999999165534973 - 0.28999999165534973 - 0.31999999284744263 - 0.31999999284744263 - - cloud_pos_density1 - - 0.5 - 0.5 - 1 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.079999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 9.9299993515014648 - - cloud_shadow - - 0.32999998331069946 - 0 - 0 - 1 - - density_multiplier - - 0.00031000000308267772 - 0 - 0 - 1 - - distance_multiplier - - 6.8000001907348633 - 0 - 0 - 1 - - east_angle - 5.6548666954040527 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.1499999761581421 - 0 - 0 - 1 - - glow - - 5 - 0.0010000000474974513 - -0.33000001311302185 - 1 - - haze_density - - 1.8899999856948853 - 0 - 0 - 1 - - haze_horizon - - 0.23999999463558197 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.53796529769897461 - 0.4029063880443573 - -0.74044561386108398 - 0 - - max_y - - 752 - 0 - 0 - 1 - - preset_num - 21 - star_brightness - 0 - sun_angle - 2.7269024848937988 - sunlight_color - - 2.25 - 1.8899999856948853 - 1.6800000667572021 - 2.25 - - - + + + ambient + + 0.59999996423721313 + 0.4888889491558075 + 0.40000000596046448 + 0.19999998807907104 + + blue_density + + 2 + 0.97999995946884155 + 0.97999995946884155 + 2 + + blue_horizon + + 0.71999996900558472 + 0.50086963176727295 + 0.50086963176727295 + 0.35999998450279236 + + cloud_color + + 0.28999999165534973 + 0.28999999165534973 + 0.31999999284744263 + 0.31999999284744263 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 9.9299993515014648 + + cloud_shadow + + 0.32999998331069946 + 0 + 0 + 1 + + density_multiplier + + 0.00031000000308267772 + 0 + 0 + 1 + + distance_multiplier + + 6.8000001907348633 + 0 + 0 + 1 + + east_angle + 5.6548666954040527 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.1499999761581421 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.33000001311302185 + 1 + + haze_density + + 1.8899999856948853 + 0 + 0 + 1 + + haze_horizon + + 0.23999999463558197 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.53796529769897461 + 0.4029063880443573 + -0.74044561386108398 + 0 + + max_y + + 752 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.7269024848937988 + sunlight_color + + 2.25 + 1.8899999856948853 + 1.6800000667572021 + 2.25 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Terre%20Des%20Mortes.xml b/indra/newview/app_settings/windlight/skies/Places%20Terre%20Des%20Mortes.xml index 00ae35765..f0546e260 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Terre%20Des%20Mortes.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Terre%20Des%20Mortes.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.21000000834465027 - 0.26999998092651367 - 0.35999998450279236 - 0.35999998450279236 - - blue_density - - 0.97999995946884155 - 0.97999995946884155 - 0.97999995946884155 - 0.48999997973442078 - - blue_horizon - - 0.25999999046325684 - 0.29999998211860657 - 0.37999999523162842 - 0.37999999523162842 - - cloud_color - - 0.50999999046325684 - 0.50999999046325684 - 0.50999999046325684 - 1 - - cloud_pos_density1 - - 0.5 - 0.5 - 1 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.079999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.25999999046325684 - 0 - 0 - 1 - - density_multiplier - - 0.00076999998418614268 - 0 - 0 - 1 - - distance_multiplier - - 16.899999618530273 - 0 - 0 - 1 - - east_angle - 4.0840702056884766 - enable_cloud_scroll - - 1 - 1 - - gamma - - 0.74000000953674316 - 0 - 0 - 1 - - glow - - 5 - 0.0010000000474974513 - -0.33000001311302185 - 1 - - haze_density - - 1.8899999856948853 - 0 - 0 - 1 - - haze_horizon - - 0.23999999463558197 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.63296741247177124 - 0.6227877140045166 - 0.45987796783447266 - 0 - - max_y - - 752 - 0 - 0 - 1 - - preset_num - 21 - star_brightness - 0 - sun_angle - 2.4692919254302979 - sunlight_color - - 1.4399999380111694 - 1.4399999380111694 - 1.4399999380111694 - 0.47999998927116394 - - - + + + ambient + + 0.21000000834465027 + 0.26999998092651367 + 0.35999998450279236 + 0.35999998450279236 + + blue_density + + 0.97999995946884155 + 0.97999995946884155 + 0.97999995946884155 + 0.48999997973442078 + + blue_horizon + + 0.25999999046325684 + 0.29999998211860657 + 0.37999999523162842 + 0.37999999523162842 + + cloud_color + + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.25999999046325684 + 0 + 0 + 1 + + density_multiplier + + 0.00076999998418614268 + 0 + 0 + 1 + + distance_multiplier + + 16.899999618530273 + 0 + 0 + 1 + + east_angle + 4.0840702056884766 + enable_cloud_scroll + + 1 + 1 + + gamma + + 0.74000000953674316 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.33000001311302185 + 1 + + haze_density + + 1.8899999856948853 + 0 + 0 + 1 + + haze_horizon + + 0.23999999463558197 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.63296741247177124 + 0.6227877140045166 + 0.45987796783447266 + 0 + + max_y + + 752 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.4692919254302979 + sunlight_color + + 1.4399999380111694 + 1.4399999380111694 + 1.4399999380111694 + 0.47999998927116394 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Urbania.xml b/indra/newview/app_settings/windlight/skies/Places%20Urbania.xml index 4aed800ea..75543efad 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Urbania.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Urbania.xml @@ -1,141 +1,141 @@ - - - ambient - - 0 - 0.029999997466802597 - 0 - 0.029999999329447746 - - blue_density - - 0.29999998211860657 - 0.29999998211860657 - 0.29999998211860657 - 0.14999999105930328 - - blue_horizon - - 0.39999997615814209 - 0.17142856121063232 - 0 - 0.39999997615814209 - - cloud_color - - 0.29999998211860657 - 0.34999999403953552 - 0.029999999329447746 - 0.34999999403953552 - - cloud_pos_density1 - - 0.85999995470046997 - 0.42999997735023499 - 0.45999997854232788 - 1 - - cloud_pos_density2 - - 1 - 1 - 0.099999994039535522 - 1 - - cloud_scale - - 0.14000000059604645 - 0 - 0 - 1 - - cloud_scroll_rate - - 9.644780158996582 - 10.423800468444824 - - cloud_shadow - - 0.2800000011920929 - 0 - 0 - 1 - - density_multiplier - - 0.00058999995235353708 - 0 - 0 - 1 - - distance_multiplier - - 20.30000114440918 - 0 - 0 - 1 - - east_angle - 1.2566369771957397 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.9599999189376831 - 0 - 0 - 1 - - glow - - 8.8000011444091797 - 0.0013735899701714516 - -0.94999998807907104 - 1 - - haze_density - - 1.7300000190734863 - 0 - 0 - 1 - - haze_horizon - - 0.45999997854232788 - 0.13210900127887726 - 0.13210900127887726 - 1 - - lightnorm - - -0.95105648040771484 - 0 - 0.30901706218719482 - 0 - - max_y - - 1450 - 0 - 0 - 1 - - preset_num - 5 - star_brightness - 2 - sun_angle - 0 - sunlight_color - - 1.2300000190734863 - 0.82000011205673218 - 0 - 0.40999999642372131 - - - + + + ambient + + 0 + 0.029999997466802597 + 0 + 0.029999999329447746 + + blue_density + + 0.29999998211860657 + 0.29999998211860657 + 0.29999998211860657 + 0.14999999105930328 + + blue_horizon + + 0.39999997615814209 + 0.17142856121063232 + 0 + 0.39999997615814209 + + cloud_color + + 0.29999998211860657 + 0.34999999403953552 + 0.029999999329447746 + 0.34999999403953552 + + cloud_pos_density1 + + 0.85999995470046997 + 0.42999997735023499 + 0.45999997854232788 + 1 + + cloud_pos_density2 + + 1 + 1 + 0.099999994039535522 + 1 + + cloud_scale + + 0.14000000059604645 + 0 + 0 + 1 + + cloud_scroll_rate + + 9.644780158996582 + 10.423800468444824 + + cloud_shadow + + 0.2800000011920929 + 0 + 0 + 1 + + density_multiplier + + 0.00058999995235353708 + 0 + 0 + 1 + + distance_multiplier + + 20.30000114440918 + 0 + 0 + 1 + + east_angle + 1.2566369771957397 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.9599999189376831 + 0 + 0 + 1 + + glow + + 8.8000011444091797 + 0.0013735899701714516 + -0.94999998807907104 + 1 + + haze_density + + 1.7300000190734863 + 0 + 0 + 1 + + haze_horizon + + 0.45999997854232788 + 0.13210900127887726 + 0.13210900127887726 + 1 + + lightnorm + + -0.95105648040771484 + 0 + 0.30901706218719482 + 0 + + max_y + + 1450 + 0 + 0 + 1 + + preset_num + 5 + star_brightness + 2 + sun_angle + 0 + sunlight_color + + 1.2300000190734863 + 0.82000011205673218 + 0 + 0.40999999642372131 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20Wiccan.xml b/indra/newview/app_settings/windlight/skies/Places%20Wiccan.xml index 7e220c9ff..43b3b2c95 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20Wiccan.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20Wiccan.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.71999996900558472 - 0.54638898372650146 - 0.58705025911331177 - 0.71999996900558472 - - blue_density - - 0.28678349408657766 - 0.42322183665254443 - 0.63743695308465931 - 1 - - blue_horizon - - 0.16913637525681224 - 0.22580146354854946 - 0.24535531286049661 - 1 - - cloud_color - - 0.22615399956703186 - 0.22615399956703186 - 0.22615399956703186 - 1 - - cloud_pos_density1 - - 1.6884100437164307 - 0.52609699964523315 - 0.70999997854232788 - 1 - - cloud_pos_density2 - - 1.6884100437164307 - 0.20999999344348907 - 0.125 - 1 - - cloud_scale - - 0.3399999737739563 - 0 - 0 - 1 - - cloud_scroll_rate - - 8.6099996566772461 - 6.2799997329711914 - - cloud_shadow - - 0.23999999463558197 - 0 - 0 - 1 - - density_multiplier - - 0.00038568499229132969 - 0 - 0 - 1 - - distance_multiplier - - 0.53555402121232365 - 0 - 0 - 1 - - east_angle - 6.2831854820251465 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.6899999380111694 - 0 - 0 - 1 - - glow - - 5 - 0.0010000000474974513 - -0.47999998927116394 - 1 - - haze_density - - 2.2327472009226881 - 0 - 0 - 1 - - haze_horizon - - 0.085684981703968377 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -1.6790306744951522e-007 - 0.27899131178855896 - 0.96029365062713623 - 1 - - max_y - - 722.13795372575987 - 0 - 0 - 1 - - preset_num - 22 - star_brightness - 0.92893773317337036 - sun_angle - 3.4243361949920654 - sunlight_color - - 2.624443531036377 - 2.6294984817504883 - 2.8499999046325684 - 0.94999998807907104 - - - + + + ambient + + 0.71999996900558472 + 0.54638898372650146 + 0.58705025911331177 + 0.71999996900558472 + + blue_density + + 0.28678349408657766 + 0.42322183665254443 + 0.63743695308465931 + 1 + + blue_horizon + + 0.16913637525681224 + 0.22580146354854946 + 0.24535531286049661 + 1 + + cloud_color + + 0.22615399956703186 + 0.22615399956703186 + 0.22615399956703186 + 1 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 0.70999997854232788 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.20999999344348907 + 0.125 + 1 + + cloud_scale + + 0.3399999737739563 + 0 + 0 + 1 + + cloud_scroll_rate + + 8.6099996566772461 + 6.2799997329711914 + + cloud_shadow + + 0.23999999463558197 + 0 + 0 + 1 + + density_multiplier + + 0.00038568499229132969 + 0 + 0 + 1 + + distance_multiplier + + 0.53555402121232365 + 0 + 0 + 1 + + east_angle + 6.2831854820251465 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.6899999380111694 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.47999998927116394 + 1 + + haze_density + + 2.2327472009226881 + 0 + 0 + 1 + + haze_horizon + + 0.085684981703968377 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -1.6790306744951522e-007 + 0.27899131178855896 + 0.96029365062713623 + 1 + + max_y + + 722.13795372575987 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.92893773317337036 + sun_angle + 3.4243361949920654 + sunlight_color + + 2.624443531036377 + 2.6294984817504883 + 2.8499999046325684 + 0.94999998807907104 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%20alirium.xml b/indra/newview/app_settings/windlight/skies/Places%20alirium.xml index 6bed05a85..a90ceffe1 100644 --- a/indra/newview/app_settings/windlight/skies/Places%20alirium.xml +++ b/indra/newview/app_settings/windlight/skies/Places%20alirium.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.26999998092651367 - 0.21000000834465027 - 0.08999999612569809 - 0.26999998092651367 - - blue_density - - 0.47886797785758972 - 0.90452831983566284 - 0.93999999761581421 - 0.4699999988079071 - - blue_horizon - - 0.28636360168457031 - 0.36272725462913513 - 0.41999998688697815 - 0.20999999344348907 - - cloud_color - - 0.50999999046325684 - 0.50999999046325684 - 0.50999999046325684 - 0.50999999046325684 - - cloud_pos_density1 - - 0.5 - 0.5 - 1 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.10999999940395355 - 1 - - cloud_scale - - 0.079999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.800000190734863 - 10.01099967956543 - - cloud_shadow - - 0.22999998927116394 - 0 - 0 - 1 - - density_multiplier - - 0.00013000000035390258 - 0 - 0 - 1 - - distance_multiplier - - 6.8000001907348633 - 0 - 0 - 1 - - east_angle - 4.2725663185119629 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.7599999904632568 - 0 - 0 - 1 - - glow - - 16.600000381469727 - 0.0010000000474974513 - -0.24999998509883881 - 1 - - haze_density - - 1.1899999380111694 - 0 - 0 - 1 - - haze_horizon - - 0.2199999988079071 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.84336334466934204 - 0.36227512359619141 - 0.39685636758804321 - 0 - - max_y - - 564 - 0 - 0 - 1 - - preset_num - 21 - star_brightness - 0 - sun_angle - 2.7708849906921387 - sunlight_color - - 2.4600000381469727 - 2.4600000381469727 - 2.4600000381469727 - 0.81999999284744263 - - - + + + ambient + + 0.26999998092651367 + 0.21000000834465027 + 0.08999999612569809 + 0.26999998092651367 + + blue_density + + 0.47886797785758972 + 0.90452831983566284 + 0.93999999761581421 + 0.4699999988079071 + + blue_horizon + + 0.28636360168457031 + 0.36272725462913513 + 0.41999998688697815 + 0.20999999344348907 + + cloud_color + + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.10999999940395355 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.800000190734863 + 10.01099967956543 + + cloud_shadow + + 0.22999998927116394 + 0 + 0 + 1 + + density_multiplier + + 0.00013000000035390258 + 0 + 0 + 1 + + distance_multiplier + + 6.8000001907348633 + 0 + 0 + 1 + + east_angle + 4.2725663185119629 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.7599999904632568 + 0 + 0 + 1 + + glow + + 16.600000381469727 + 0.0010000000474974513 + -0.24999998509883881 + 1 + + haze_density + + 1.1899999380111694 + 0 + 0 + 1 + + haze_horizon + + 0.2199999988079071 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.84336334466934204 + 0.36227512359619141 + 0.39685636758804321 + 0 + + max_y + + 564 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.7708849906921387 + sunlight_color + + 2.4600000381469727 + 2.4600000381469727 + 2.4600000381469727 + 0.81999999284744263 + + + diff --git a/indra/newview/app_settings/windlight/skies/Places%2DEmbryo.xml b/indra/newview/app_settings/windlight/skies/Places%2DEmbryo.xml index 66d490aa9..4308b456f 100644 --- a/indra/newview/app_settings/windlight/skies/Places%2DEmbryo.xml +++ b/indra/newview/app_settings/windlight/skies/Places%2DEmbryo.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.35999998450279236 - 0.23999999463558197 - 0 - 0.35999998450279236 - - blue_density - - 0.15999999642372131 - 0.15999999642372131 - 0.15999999642372131 - 0.079999998211860657 - - blue_horizon - - 0.19999998807907104 - 0.19999998807907104 - 0.19999998807907104 - 0.099999994039535522 - - cloud_color - - 0.50999999046325684 - 0.50999999046325684 - 0.50999999046325684 - 0.50999999046325684 - - cloud_pos_density1 - - 0.53999996185302734 - 0.50999999046325684 - 0.2199999988079071 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.039999999105930328 - 1 - - cloud_scale - - 0.15999999642372131 - 0 - 0 - 1 - - cloud_scroll_rate - - 20 - 20 - - cloud_shadow - - 0.68000000715255737 - 0 - 0 - 1 - - density_multiplier - - 0.00020999999833293259 - 0 - 0 - 1 - - distance_multiplier - - 23 - 0 - 0 - 1 - - east_angle - 2.2619466781616211 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.94999998807907104 - 0 - 0 - 1 - - glow - - 20 - 0.0010000000474974513 - 0 - 1 - - haze_density - - 4 - 0 - 0 - 1 - - haze_horizon - - 0.17000000178813934 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.70520544052124023 - 0.4029063880443573 - 0.58339667320251465 - 0 - - max_y - - 322 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 0 - sun_angle - 2.7269024848937988 - sunlight_color - - 0.71999996900558472 - 0.71999996900558472 - 0.71999996900558472 - 0.23999999463558197 - - - + + + ambient + + 0.35999998450279236 + 0.23999999463558197 + 0 + 0.35999998450279236 + + blue_density + + 0.15999999642372131 + 0.15999999642372131 + 0.15999999642372131 + 0.079999998211860657 + + blue_horizon + + 0.19999998807907104 + 0.19999998807907104 + 0.19999998807907104 + 0.099999994039535522 + + cloud_color + + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + + cloud_pos_density1 + + 0.53999996185302734 + 0.50999999046325684 + 0.2199999988079071 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.039999999105930328 + 1 + + cloud_scale + + 0.15999999642372131 + 0 + 0 + 1 + + cloud_scroll_rate + + 20 + 20 + + cloud_shadow + + 0.68000000715255737 + 0 + 0 + 1 + + density_multiplier + + 0.00020999999833293259 + 0 + 0 + 1 + + distance_multiplier + + 23 + 0 + 0 + 1 + + east_angle + 2.2619466781616211 + enable_cloud_scroll + + 0 + 0 + + gamma + + 0.94999998807907104 + 0 + 0 + 1 + + glow + + 20 + 0.0010000000474974513 + 0 + 1 + + haze_density + + 4 + 0 + 0 + 1 + + haze_horizon + + 0.17000000178813934 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0.70520544052124023 + 0.4029063880443573 + 0.58339667320251465 + 0 + + max_y + + 322 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 0 + sun_angle + 2.7269024848937988 + sunlight_color + + 0.71999996900558472 + 0.71999996900558472 + 0.71999996900558472 + 0.23999999463558197 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Desert%20Sunset%20mod%202.xml b/indra/newview/app_settings/windlight/skies/Raymond%27s%20Bright%20%26%20Hazy%20Day.xml similarity index 50% rename from indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Desert%20Sunset%20mod%202.xml rename to indra/newview/app_settings/windlight/skies/Raymond%27s%20Bright%20%26%20Hazy%20Day.xml index 68a20afc7..0affa6bda 100644 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Desert%20Sunset%20mod%202.xml +++ b/indra/newview/app_settings/windlight/skies/Raymond%27s%20Bright%20%26%20Hazy%20Day.xml @@ -2,81 +2,81 @@ ambient - 0.57999998331069946 - 0.088169597089290619 - 0.11999999731779099 - 0.57999998331069946 + 1.0499999523162841796875 + 1.0499999523162841796875 + 1.0499999523162841796875 + 0.3499999940395355224609375 blue_density - 0.2199999988079071 - 0.39999997615814209 - 0.80000197887420654 - 1 + 0.53999996185302734375 + 0.4799999892711639404296875 + 0.319999992847442626953125 + 0.579999983310699462890625 blue_horizon - 0.28999999165534973 - 0.18999999761581421 - 0.25 - 0.28999999165534973 + 0.495483815670013427734375 + 0.495483815670013427734375 + 0.63999998569488525390625 + 0.319999992847442626953125 cloud_color - 0.22615399956703186 - 0.37000000476837158 - 0.22615399956703186 - 0.37000000476837158 + 0.4099999964237213134765625 + 0.4099999964237213134765625 + 0.4099999964237213134765625 + 0.4099999964237213134765625 cloud_pos_density1 - 0.56999999284744263 - 0 + 1.6884100437164306640625 + 0.526096999645233154296875 1 1 cloud_pos_density2 - 1.6884100437164307 - 0.52609699964523315 + 1.6884100437164306640625 + 0.526096999645233154296875 0.125 1 cloud_scale - 0.41999998688697815 + 0.4199999868869781494140625 0 0 1 cloud_scroll_rate - 10.199999809265137 - 10.01099967956543 + 10.19999980926513671875 + 10.0109996795654296875 cloud_shadow - 0.28999999165534973 + 0.269999980926513671875 0 0 1 density_multiplier - 0.00046999999904073775 + 0.0001799999881768599152565002 0 0 1 distance_multiplier - 7.4000000953674316 + 43.200000762939453125 0 0 1 east_angle - 5.2778754234313965 + 1.88495552539825439453125 enable_cloud_scroll 1 @@ -84,42 +84,42 @@ gamma - 1.6100000143051147 + 1 0 0 1 glow - 3.8000011444091797 - 0.0010000000474974513 - -0.64999997615814209 + 5 + 0.001000000047497451305389404 + -0.4799999892711639404296875 1 haze_density - 0.87000000476837158 + 0.699999988079071044921875 0 0 1 haze_horizon - 0.12999999523162842 - 0.19915600121021271 - 0.19915600121021271 + 0.189999997615814208984375 + 0.1991560012102127075195312 + 0.1991560012102127075195312 1 lightnorm - 0.83308660984039307 - 0.16263717412948608 - 0.52869260311126709 + 0.769420921802520751953125 + 0.587785184383392333984375 + 0.2499999552965164184570312 0 max_y - 553 + 1605 0 0 1 @@ -129,13 +129,13 @@ star_brightness 0 sun_angle - 0.16336283087730408 + 2.51327419281005859375 sunlight_color - 2.4600000381469727 - 2.8385701179504395 - 2.8385701179504395 - 1 + 0.89999997615814208984375 + 0.89999997615814208984375 + 0.89999997615814208984375 + 0.89999997615814208984375 diff --git a/indra/newview/app_settings/windlight/skies/Raymond%27s%20Brighter%20Day.xml b/indra/newview/app_settings/windlight/skies/Raymond%27s%20Brighter%20Day.xml new file mode 100644 index 000000000..e3c238f7e --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Raymond%27s%20Brighter%20Day.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.89999997615814208984375 + 0.719999969005584716796875 + 0.4799999892711639404296875 + 0.2999999821186065673828125 + + blue_density + + 0.9783562571870206836521788 + 0.9788547493670831656231712 + 0.9796367159822298997795542 + 0.4908023676304022475669342 + + blue_horizon + + 0.3197928413207978826093836 + 0.3201468082648280533142326 + 0.3202801310258822642396126 + 0.1608149427331061198653828 + + cloud_color + + 0.5094149261757657809468469 + 0.5094149261757657809468469 + 0.5094149261757657809468469 + 0.9999544207519790450788832 + + cloud_pos_density1 + + 1.6884100437164306640625 + 0.526096999645233154296875 + 0.9997559096869214068092901 + 1 + + cloud_pos_density2 + + 1.6884100437164306640625 + 0.526096999645233154296875 + 0.125 + 1 + + cloud_scale + + 0.0807178267483726757935969 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499377033943767756341 + 10.01130920436540350237919 + + cloud_shadow + + 0.269999980926513671875 + 0 + 0 + 1 + + density_multiplier + + 0.0003105271921420105847751192 + 0 + 0 + 1 + + distance_multiplier + + 6.790409672353710845982278 + 0 + 0 + 1 + + east_angle + 2.0117828845977783203125 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.000001740755894097389955 + 0.001000000047489843025064205 + -0.3303167039287465689412215 + 1 + + haze_density + + 1.888171427414458980464929 + 0 + 0 + 1 + + haze_horizon + + 0.2397867363402066687161351 + 0.1991560012111358024533558 + 0.1991560012111358024533558 + 1 + + lightnorm + + 0.840806066989898681640625 + 0.368179380893707275390625 + 0.3968489468097686767578125 + 0 + + max_y + + 751.7814964907049670728156 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0.004203271120786666870117188 + sun_angle + 2.76454257965087890625 + sunlight_color + + 1.37982952594757080078125 + 1.37983667850494384765625 + 1.3799998760223388671875 + 0.459999978542327880859375 + + + diff --git a/indra/newview/app_settings/windlight/skies/Raymond%27s%20Day.xml b/indra/newview/app_settings/windlight/skies/Raymond%27s%20Day.xml new file mode 100644 index 000000000..3fdbff4a4 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Raymond%27s%20Day.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.3008706494088628224936599 + 0.1805203274344016617369846 + 0.001209150813661352685812744 + 0.2998946418502931310356985 + + blue_density + + 0.978404503239420519911107 + 0.9788898388715625564771017 + 0.979651840404163198883225 + 0.4908151961036645305469506 + + blue_horizon + + 0.3197781179696183029292911 + 0.3201339792881513490740986 + 0.3202568034514952088898099 + 0.1608068907809158676336381 + + cloud_color + + 0.5094195533890382154851295 + 0.5094195533890382154851295 + 0.5094195533890382154851295 + 0.9999999512866533102339872 + + cloud_pos_density1 + + 0.5 + 0.5 + 0.9997546033545836596800882 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.08069528994628516471721014 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013891807844004234 + 10.01099967969004644885445 + + cloud_shadow + + 0.2599999904632568359375 + 0 + 0 + 1 + + density_multiplier + + 0.0003105400994743042191598148 + 0 + 0 + 1 + + distance_multiplier + + 6.790823848502993698161845 + 0 + 0 + 1 + + east_angle + 2.0106194019317626953125 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.00000175007214142652856 + 0.001000000047489802259062519 + -0.3303067612328005053790037 + 1 + + haze_density + + 1.888253966035572606330106 + 0 + 0 + 1 + + haze_horizon + + 0.2397894742078074403757171 + 0.1991560012111407429458154 + 0.1991560012111407429458154 + 1 + + lightnorm + + 0.8412868976593017578125 + 0.3681243956089019775390625 + 0.3958797156810760498046875 + 0 + + max_y + + 751.7141480769507779768901 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0.0005865296116098761558532715 + sun_angle + 2.76460170745849609375 + sunlight_color + + 1.381506018886927922295627 + 1.381509552070855573191466 + 1.381663675888002096314722 + 0.4605545784569189393664601 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Mighty%20moon.xml b/indra/newview/app_settings/windlight/skies/Raymond%27s%20Night.xml similarity index 52% rename from indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Mighty%20moon.xml rename to indra/newview/app_settings/windlight/skies/Raymond%27s%20Night.xml index dda72b059..5b9257b05 100644 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Mighty%20moon.xml +++ b/indra/newview/app_settings/windlight/skies/Raymond%27s%20Night.xml @@ -2,85 +2,85 @@ ambient - 0.2226002961397171 - 0.26450914144515991 - 0.35999998450279236 - 0.11999999731779099 + 0.08999999612569808959960938 + 0.05399999767541885375976562 + 0 + 0.02999999932944774627685547 blue_density - 0.5 - 0.5 - 0.5 - 0.25 + 0.979999959468841552734375 + 0.979999959468841552734375 + 0.979999959468841552734375 + 0.4899999797344207763671875 blue_horizon - 1 - 1 - 1 - 0.5 + 0.319999992847442626953125 + 0.319999992847442626953125 + 0.319999992847442626953125 + 0.1599999964237213134765625 cloud_color - 0.22615399956703186 - 0.22615399956703186 - 0.22615399956703186 + 0.5099999904632568359375 + 0.5099999904632568359375 + 0.5099999904632568359375 1 cloud_pos_density1 - 0 - 0.23999999463558197 - 0.87999999523162842 + 0.5 + 0.5 + 1 1 cloud_pos_density2 - 5.9584097862243652 - 6.9909601211547852 - 0.0099999997764825821 + 0.5 + 0.5 + 0.125 1 cloud_scale - 0.41999998688697815 + 0.07999999821186065673828125 0 0 1 cloud_scroll_rate - 10.49940013885498 - 10.01099967956543 + 10.49940013885498046875 + 10.06999969482421875 cloud_shadow - 0.22999998927116394 + 0.2599999904632568359375 0 0 1 density_multiplier - 0.00029999998514540493 + 0.0003100000030826777219772339 0 0 1 distance_multiplier - 0 + 6.80000019073486328125 0 0 1 east_angle - 0 + 2.26194667816162109375 enable_cloud_scroll - 0 - 0 + 1 + 1 gamma @@ -92,50 +92,50 @@ glow 5 - 0.0010000000474974513 - -0.49999997019767761 + 0.001000000047497451305389404 + -0.3300000131130218505859375 1 haze_density - 2 + 1.88999998569488525390625 0 0 1 haze_horizon - 1 - 0.19915600121021271 - 0.19915600121021271 + 0.2399999946355819702148438 + 0.1991560012102127075195312 + 0.1991560012102127075195312 1 lightnorm + 0.718173205852508544921875 + 0.36227512359619140625 + 0.5941245555877685546875 0 - 0.25477027893066406 - -0.96700161695480347 - 1 max_y - 22 + 752 0 0 1 preset_num - 24 + 21 star_brightness - 2 + 0.689999997615814208984375 sun_angle - 6.0255751609802246 + 2.770884990692138671875 sunlight_color - 1.5853042602539063 - 1.6170113086700439 - 3 - 1 + 0.02999999932944774627685547 + 0.02999999932944774627685547 + 0.02999999932944774627685547 + 0.009999999776482582092285156 diff --git a/indra/newview/app_settings/windlight/skies/Raymond%27s%20Sunrise.xml b/indra/newview/app_settings/windlight/skies/Raymond%27s%20Sunrise.xml new file mode 100644 index 000000000..51eadc1f1 --- /dev/null +++ b/indra/newview/app_settings/windlight/skies/Raymond%27s%20Sunrise.xml @@ -0,0 +1,141 @@ + + + ambient + + 0.809999942779541015625 + 0.462897837162017822265625 + 0.629999935626983642578125 + 0.269999980926513671875 + + blue_density + + 0.157931804656982421875 + 0.4349956810474395751953125 + 0.87000000476837158203125 + 0.87000000476837158203125 + + blue_horizon + + 0.2067319601774215698242188 + 0.40988314151763916015625 + 0.4799999892711639404296875 + 0.4799999892711639404296875 + + cloud_color + + 0.226166042263287181413034 + 0.226166042263287181413034 + 0.226166042263287181413034 + 0.9999721908552601234987378 + + cloud_pos_density1 + + 1.6884100437164306640625 + 0.526096999645233154296875 + 0.8800002527248125261394307 + 1 + + cloud_pos_density2 + + 1.6884100437164306640625 + 0.526096999645233154296875 + 0.125 + 1 + + cloud_scale + + 0.4199999868869781494140625 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013883860956411809 + 10.01099967957634362392128 + + cloud_shadow + + 0.269999980926513671875 + 0 + 0 + 1 + + density_multiplier + + 0.0006200000061653554439544678 + 0 + 0 + 1 + + distance_multiplier + + 9.5 + 0 + 0 + 1 + + east_angle + 5.4663715362548828125 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5.000999069306999444961548 + 0.001000000047496341082364779 + -0.4800010192381591878074687 + 1 + + haze_density + + 1.37999999523162841796875 + 0 + 0 + 1 + + haze_horizon + + 0.2399999946355819702148438 + 0.1991560012102127075195312 + 0.1991560012102127075195312 + 1 + + lightnorm + + 0.72614991664886474609375 + 0.08785120397806167602539062 + 0.68190062046051025390625 + 0 + + max_y + + 563 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 0.08796460181474685668945312 + sunlight_color + + 2.36999988555908203125 + 2.36999988555908203125 + 2.36999988555908203125 + 0.78999996185302734375 + + + diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Desert%20Sunset%20mod.xml b/indra/newview/app_settings/windlight/skies/Riverrock%20Night.xml similarity index 63% rename from indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Desert%20Sunset%20mod.xml rename to indra/newview/app_settings/windlight/skies/Riverrock%20Night.xml index 2e2a2f3fc..d846120cc 100644 --- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Desert%20Sunset%20mod.xml +++ b/indra/newview/app_settings/windlight/skies/Riverrock%20Night.xml @@ -2,36 +2,36 @@ ambient - 0.48999997973442078 - 0.088169597089290619 - 0.11999999731779099 - 0.48999997973442078 + 1.619999885559082 + 1.2307695150375366 + 1.4399999380111694 + 1.619999885559082 blue_density - 0.14522500336170197 - 0.39999997615814209 - 0.80000197887420654 + 0.6441006064414978 + 1.1808507442474365 + 2 1 blue_horizon - 0.10767599940299988 - 0.18999999761581421 - 0.25 - 0.26999998092651367 + 0.13935482501983643 + 0.13935482501983643 + 0.17999999225139618 + 0.08999999612569809 cloud_color - 0.22615399956703186 - 0.37000000476837158 - 0.22615399956703186 - 0.37000000476837158 + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 cloud_pos_density1 1.6884100437164307 - 0.50999999046325684 + 0.52609699964523315 1 1 @@ -56,27 +56,27 @@ cloud_shadow - 0.35999998450279236 + 0.029999999329447746 0 0 1 density_multiplier - 0.00046999999904073775 + 0.00017999998817685992 0 0 1 distance_multiplier - 7.4000000953674316 + 2 0 0 1 east_angle - 5.2778754234313965 + 1.0053097009658813 enable_cloud_scroll 1 @@ -84,42 +84,42 @@ gamma - 1.6100000143051147 + 1.0900000333786011 0 0 1 glow - 3.8000011444091797 + 5 0.0010000000474974513 - -0.64999997615814209 + -0.49999997019767761 1 haze_density - 0.87000000476837158 + 0.64999997615814209 0 0 1 haze_horizon - 0.12999999523162842 + 0.14999999105930328 0.19915600121021271 0.19915600121021271 1 lightnorm - -0.84266197681427002 - 0.062790460884571075 - -0.53476929664611816 - 0 + 0.11108358949422836 + 0.99130761623382568 + -0.070495784282684326 + 1 max_y - 553 + 188 0 0 1 @@ -127,15 +127,15 @@ preset_num 22 star_brightness - 0 + 2 sun_angle - 3.0787608623504639 + 4.8443360328674316 sunlight_color - 2.1899998188018799 - 2.8385701179504395 - 2.8385701179504395 - 1 + 0.42000001668930054 + 0.42000001668930054 + 0.42000001668930054 + 0.14000000059604645 diff --git a/indra/newview/app_settings/windlight/skies/Rouge%201.xml b/indra/newview/app_settings/windlight/skies/Rouge%201.xml deleted file mode 100644 index 896abf68b..000000000 --- a/indra/newview/app_settings/windlight/skies/Rouge%201.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.35999998450279236 - 0.42000001668930054 - 0.42000001668930054 - 0.42000001668930054 - - blue_density - - 0.51999998092651367 - 0.2800000011920929 - 0.51999998092651367 - 0.51999998092651367 - - blue_horizon - - 0.69999998807907104 - 0.69999998807907104 - 0.68000000715255737 - 0.69999998807907104 - - cloud_color - - 1 - 0.79000002145767212 - 0.80000001192092896 - 1 - - cloud_pos_density1 - - 0.40999999642372131 - 0.39999997615814209 - 0.88999998569488525 - 1 - - cloud_pos_density2 - - 0.28999999165534973 - 0.32999998331069946 - 0.039999999105930328 - 1 - - cloud_scale - - 0.37999999523162842 - 0 - 0 - 1 - - cloud_scroll_rate - - 11.809999465942383 - 12.799999237060547 - - cloud_shadow - - 0.31999999284744263 - 0 - 0 - 1 - - density_multiplier - - 0.00021999998716637492 - 0 - 0 - 1 - - distance_multiplier - - 4 - 0 - 0 - 1 - - east_angle - 3.8327431678771973 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.5399999618530273 - 0 - 0 - 1 - - glow - - 14.40000057220459 - 0.0010000000474974513 - -0.85000002384185791 - 1 - - haze_density - - 2.0399999618530273 - 0 - 0 - 1 - - haze_horizon - - 0.049999997019767761 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.63680768013000488 - 0.043968122452497482 - -0.76976805925369263 - 0 - - max_y - - 676.10003662109375 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 2 - sun_angle - 0.043982300907373428 - sunlight_color - - 2.369999885559082 - 1.4099999666213989 - 1.0199999809265137 - 2.369999885559082 - - - diff --git a/indra/newview/app_settings/windlight/skies/Rouge%202.xml b/indra/newview/app_settings/windlight/skies/Rouge%202.xml deleted file mode 100644 index 3b170acd7..000000000 --- a/indra/newview/app_settings/windlight/skies/Rouge%202.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.84000003337860107 - 0.56999999284744263 - 0.56999999284744263 - 0.84000003337860107 - - blue_density - - 1.0799999237060547 - 0.51999998092651367 - 0.51999998092651367 - 1.0799999237060547 - - blue_horizon - - 0.57999998331069946 - 0.25999999046325684 - 0.25999999046325684 - 0.57999998331069946 - - cloud_color - - 1 - 0.79000002145767212 - 0.80000001192092896 - 1 - - cloud_pos_density1 - - 0.40999999642372131 - 0.39999997615814209 - 0.88999998569488525 - 1 - - cloud_pos_density2 - - 0.28999999165534973 - 0.32999998331069946 - 0.039999999105930328 - 1 - - cloud_scale - - 0.37999999523162842 - 0 - 0 - 1 - - cloud_scroll_rate - - 11.809999465942383 - 12.799999237060547 - - cloud_shadow - - 0.31999999284744263 - 0 - 0 - 1 - - density_multiplier - - 0.0002899999963119626 - 0 - 0 - 1 - - distance_multiplier - - 5.5999999046325684 - 0 - 0 - 1 - - east_angle - 3.8327431678771973 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.5399999618530273 - 0 - 0 - 1 - - glow - - 14.40000057220459 - 0.0010000000474974513 - -0.85000002384185791 - 1 - - haze_density - - 2.0399999618530273 - 0 - 0 - 1 - - haze_horizon - - 0.049999997019767761 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.63495957851409912 - 0.087851203978061676 - -0.76753407716751099 - 0 - - max_y - - 676.10003662109375 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 2 - sun_angle - 0.087964601814746857 - sunlight_color - - 2.2799999713897705 - 0.75 - 0.59999996423721313 - 2.2799999713897705 - - - diff --git a/indra/newview/app_settings/windlight/skies/Rouge%203.xml b/indra/newview/app_settings/windlight/skies/Rouge%203.xml deleted file mode 100644 index 5cc7a61fa..000000000 --- a/indra/newview/app_settings/windlight/skies/Rouge%203.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.71999996900558472 - 0.71999996900558472 - 0.71999996900558472 - 0.23999999463558197 - - blue_density - - 0.31999999284744263 - 0.094117648899555206 - 0.094117648899555206 - 0.15999999642372131 - - blue_horizon - - 0.45999997854232788 - 0 - 0.039999999105930328 - 0.45999997854232788 - - cloud_color - - 0.14000000059604645 - 0.14000000059604645 - 0.14000000059604645 - 0.14000000059604645 - - cloud_pos_density1 - - 0.74000000953674316 - 0.93999999761581421 - 0.20999999344348907 - 1 - - cloud_pos_density2 - - 0.65999996662139893 - 0.52999997138977051 - 0.0099999997764825821 - 1 - - cloud_scale - - 0.070000000298023224 - 0 - 0 - 1 - - cloud_scroll_rate - - 18 - 20 - - cloud_shadow - - 0.34000000357627869 - 0 - 0 - 1 - - density_multiplier - - 0.00018000000272877514 - 0 - 0 - 1 - - distance_multiplier - - 6.7000002861022949 - 0 - 0 - 1 - - east_angle - 3.5185837745666504 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.0399999618530273 - 0 - 0 - 1 - - glow - - 17.399999618530273 - 0.0010000000474974513 - -0.64999997615814209 - 1 - - haze_density - - 0.40999999642372131 - 0 - 0 - 1 - - haze_horizon - - 0.17000000178813934 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.3677685558795929 - 0.043968122452497482 - -0.92887735366821289 - 0 - - max_y - - 263 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 1.0399999618530273 - sun_angle - 0.043982300907373428 - sunlight_color - - 1.5899999141693115 - 1.5899999141693115 - 1.5899999141693115 - 1.5899999141693115 - - - diff --git a/indra/newview/app_settings/windlight/skies/Rouge%204.xml b/indra/newview/app_settings/windlight/skies/Rouge%204.xml deleted file mode 100644 index d48a4a201..000000000 --- a/indra/newview/app_settings/windlight/skies/Rouge%204.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.42000001668930054 - 0.29999998211860657 - 0.29999998211860657 - 0.42000001668930054 - - blue_density - - 0.59999996423721313 - 0.15999999642372131 - 0.2199999988079071 - 0.59999996423721313 - - blue_horizon - - 0.029999999329447746 - 0 - 0 - 0.079999998211860657 - - cloud_color - - 0.81999999284744263 - 0.18999999761581421 - 0.039999999105930328 - 0.81999999284744263 - - cloud_pos_density1 - - 0.74000000953674316 - 0.93999999761581421 - 0.20999999344348907 - 1 - - cloud_pos_density2 - - 0.65999996662139893 - 0.52999997138977051 - 0.0099999997764825821 - 1 - - cloud_scale - - 0.14000000059604645 - 0 - 0 - 1 - - cloud_scroll_rate - - 18 - 20 - - cloud_shadow - - 0.37999999523162842 - 0 - 0 - 1 - - density_multiplier - - 0.00015999999595806003 - 0 - 0 - 1 - - distance_multiplier - - 17.399999618530273 - 0 - 0 - 1 - - east_angle - 2.3247785568237305 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.5299999713897705 - 0 - 0 - 1 - - glow - - 17.399999618530273 - 0.0010000000474974513 - -0.64999997615814209 - 1 - - haze_density - - 0.32999998331069946 - 0 - 0 - 1 - - haze_horizon - - 0.079999998211860657 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.72615015506744385 - 0.087851203978061676 - -0.68190038204193115 - 0 - - max_y - - 1048 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 1.3199999332427979 - sun_angle - 0.087964601814746857 - sunlight_color - - 1.5899999141693115 - 0.47999998927116394 - 0.53999996185302734 - 1.5899999141693115 - - - diff --git a/indra/newview/app_settings/windlight/skies/Rouge%205.xml b/indra/newview/app_settings/windlight/skies/Rouge%205.xml deleted file mode 100644 index 3ceb600c3..000000000 --- a/indra/newview/app_settings/windlight/skies/Rouge%205.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - ambient - - 0.77999997138977051 - 0.29999998211860657 - 0.29999998211860657 - 0.77999997138977051 - - blue_density - - 1.5799999237060547 - 0.45999997854232788 - 0.45999997854232788 - 1.5799999237060547 - - blue_horizon - - 0.97999995946884155 - 0.34000000357627869 - 0.35999998450279236 - 0.97999995946884155 - - cloud_color - - 0 - 0 - 0 - 0 - - cloud_pos_density1 - - 0.74000000953674316 - 0.93999999761581421 - 0.19999998807907104 - 1 - - cloud_pos_density2 - - 0.65999996662139893 - 0.69999998807907104 - 0 - 1 - - cloud_scale - - 0.070000000298023224 - 0 - 0 - 1 - - cloud_scroll_rate - - 2.8600001335144043 - 17.589999675750732 - - cloud_shadow - - 0.42999997735023499 - 0 - 0 - 1 - - density_multiplier - - 0.00015999999595806003 - 0 - 0 - 1 - - distance_multiplier - - 2.1000001430511475 - 0 - 0 - 1 - - east_angle - 3.7699110507965088 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.1100000143051147 - 0 - 0 - 1 - - glow - - 14.000000953674316 - 0.0010000000474974513 - -0.89999997615814209 - 1 - - haze_density - - 0.82999998331069946 - 0 - 0 - 1 - - haze_horizon - - 0.48999997973442078 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0.58778512477874756 - 0 - -0.80901706218719482 - 0 - - max_y - - 276 - 0 - 0 - 1 - - preset_num - 24 - star_brightness - 1.1699999570846558 - sun_angle - 0 - sunlight_color - - 0.29999998211860657 - 0.29999998211860657 - 0.29999998211860657 - 0.099999994039535522 - - - diff --git a/indra/newview/app_settings/windlight/skies/Shadows_Bright_day.xml b/indra/newview/app_settings/windlight/skies/Shadows%20Bright%20day.xml similarity index 100% rename from indra/newview/app_settings/windlight/skies/Shadows_Bright_day.xml rename to indra/newview/app_settings/windlight/skies/Shadows%20Bright%20day.xml diff --git a/indra/newview/app_settings/windlight/skies/silent%20hill.xml b/indra/newview/app_settings/windlight/skies/Silent%20Hill.xml similarity index 100% rename from indra/newview/app_settings/windlight/skies/silent%20hill.xml rename to indra/newview/app_settings/windlight/skies/Silent%20Hill.xml diff --git a/indra/newview/app_settings/windlight/skies/StrawberrySingh%2Ecom%20%2D%20Closeups.xml b/indra/newview/app_settings/windlight/skies/StrawberrySingh%2Ecom%20%2D%20Closeups.xml index d9a45e832..a1d80652f 100644 --- a/indra/newview/app_settings/windlight/skies/StrawberrySingh%2Ecom%20%2D%20Closeups.xml +++ b/indra/newview/app_settings/windlight/skies/StrawberrySingh%2Ecom%20%2D%20Closeups.xml @@ -1,141 +1,141 @@ - - - ambient - - 1.9524954557418823 - 2.0699999332427979 - 2.059481143951416 - 0.68999999761581421 - - blue_density - - 2 - 2 - 2 - 1 - - blue_horizon - - 1.5 - 1.5 - 1.5 - 0.75 - - cloud_color - - 0.40999999642372131 - 0.40999999642372131 - 0.40999999642372131 - 0.40999999642372131 - - cloud_pos_density1 - - 1.6884100437164307 - 0.52609699964523315 - 1 - 1 - - cloud_pos_density2 - - 1.6884100437164307 - 0.52609699964523315 - 0.125 - 1 - - cloud_scale - - 0.41999998688697815 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.199999809265137 - 10.01099967956543 - - cloud_shadow - - 0.12999999523162842 - 0 - 0 - 1 - - density_multiplier - - 0.0002899999963119626 - 0 - 0 - 1 - - distance_multiplier - - 0 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1.2599999904632568 - 0 - 0 - 1 - - glow - - 10.199999809265137 - 0.0010000000474974513 - -1.3999999761581421 - 1 - - haze_density - - 1.0099999904632568 - 0 - 0 - 1 - - haze_horizon - - 0.5 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0 - 0 - 1 - 0 - - max_y - - 493 - 0 - 0 - 1 - - preset_num - 22 - star_brightness - 0 - sun_angle - 0 - sunlight_color - - 1.5299999713897705 - 1.5299999713897705 - 1.5299999713897705 - 0.50999999046325684 - - - + + + ambient + + 1.9524954557418823 + 2.0699999332427979 + 2.059481143951416 + 0.68999999761581421 + + blue_density + + 2 + 2 + 2 + 1 + + blue_horizon + + 1.5 + 1.5 + 1.5 + 0.75 + + cloud_color + + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + 0.40999999642372131 + + cloud_pos_density1 + + 1.6884100437164307 + 0.52609699964523315 + 1 + 1 + + cloud_pos_density2 + + 1.6884100437164307 + 0.52609699964523315 + 0.125 + 1 + + cloud_scale + + 0.41999998688697815 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.199999809265137 + 10.01099967956543 + + cloud_shadow + + 0.12999999523162842 + 0 + 0 + 1 + + density_multiplier + + 0.0002899999963119626 + 0 + 0 + 1 + + distance_multiplier + + 0 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1.2599999904632568 + 0 + 0 + 1 + + glow + + 10.199999809265137 + 0.0010000000474974513 + -1.3999999761581421 + 1 + + haze_density + + 1.0099999904632568 + 0 + 0 + 1 + + haze_horizon + + 0.5 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0 + 0 + 1 + 0 + + max_y + + 493 + 0 + 0 + 1 + + preset_num + 22 + star_brightness + 0 + sun_angle + 0 + sunlight_color + + 1.5299999713897705 + 1.5299999713897705 + 1.5299999713897705 + 0.50999999046325684 + + + diff --git a/indra/newview/app_settings/windlight/skies/Sunset%20Pink%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Sunset%20Pink%20%28Paulina%29.xml index 9b5b74f03..c89ea7fd4 100644 --- a/indra/newview/app_settings/windlight/skies/Sunset%20Pink%20%28Paulina%29.xml +++ b/indra/newview/app_settings/windlight/skies/Sunset%20Pink%20%28Paulina%29.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.65999996662139893 - 0.30564266443252563 - 0.31655827164649963 - 0.2199999988079071 - - blue_density - - 1.1599999666213989 - 0.59999996423721313 - 1.3199999332427979 - 1.3199999332427979 - - blue_horizon - - 0.71153849363327026 - 0.74000000953674316 - 0.74000000953674316 - 0.37000000476837158 - - cloud_color - - 0 - 0 - 0.0099999997764825821 - 0.0099999997764825821 - - cloud_pos_density1 - - 0.53999996185302734 - 0.50999999046325684 - 0.23999999463558197 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.059999998658895493 - 1 - - cloud_scale - - 0.15999999642372131 - 0 - 0 - 1 - - cloud_scroll_rate - - 20 - 20 - - cloud_shadow - - 0.2199999988079071 - 0 - 0 - 1 - - density_multiplier - - 4.9999998736893758e-005 - 0 - 0 - 1 - - distance_multiplier - - 8.1000003814697266 - 0 - 0 - 1 - - east_angle - 3.5185837745666504 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.61000001430511475 - 0 - 0 - 1 - - glow - - 0.59999942779541016 - 0.0010000000474974513 - -0.59999996423721313 - 1 - - haze_density - - 1.8600000143051147 - 0 - 0 - 1 - - haze_horizon - - 0.76999998092651367 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - -0.36805915832519531 - 0.01884840801358223 - 0.92961132526397705 - 0 - - max_y - - 2443 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.8600000143051147 - sun_angle - 3.1227431297302246 - sunlight_color - - 1.1999999284744263 - 0.7486223578453064 - 0.39302670955657959 - 1.1999999284744263 - - - + + + ambient + + 0.65999996662139893 + 0.30564266443252563 + 0.31655827164649963 + 0.2199999988079071 + + blue_density + + 1.1599999666213989 + 0.59999996423721313 + 1.3199999332427979 + 1.3199999332427979 + + blue_horizon + + 0.71153849363327026 + 0.74000000953674316 + 0.74000000953674316 + 0.37000000476837158 + + cloud_color + + 0 + 0 + 0.0099999997764825821 + 0.0099999997764825821 + + cloud_pos_density1 + + 0.53999996185302734 + 0.50999999046325684 + 0.23999999463558197 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.059999998658895493 + 1 + + cloud_scale + + 0.15999999642372131 + 0 + 0 + 1 + + cloud_scroll_rate + + 20 + 20 + + cloud_shadow + + 0.2199999988079071 + 0 + 0 + 1 + + density_multiplier + + 4.9999998736893758e-005 + 0 + 0 + 1 + + distance_multiplier + + 8.1000003814697266 + 0 + 0 + 1 + + east_angle + 3.5185837745666504 + enable_cloud_scroll + + 0 + 0 + + gamma + + 0.61000001430511475 + 0 + 0 + 1 + + glow + + 0.59999942779541016 + 0.0010000000474974513 + -0.59999996423721313 + 1 + + haze_density + + 1.8600000143051147 + 0 + 0 + 1 + + haze_horizon + + 0.76999998092651367 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + -0.36805915832519531 + 0.01884840801358223 + 0.92961132526397705 + 0 + + max_y + + 2443 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 1.8600000143051147 + sun_angle + 3.1227431297302246 + sunlight_color + + 1.1999999284744263 + 0.7486223578453064 + 0.39302670955657959 + 1.1999999284744263 + + + diff --git a/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Brazil%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Brazil%20%28Paulina%29.xml index 97044da7b..28d294167 100644 --- a/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Brazil%20%28Paulina%29.xml +++ b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Brazil%20%28Paulina%29.xml @@ -1,141 +1,141 @@ - - - ambient - - 1.5 - 2.2799999713897705 - 0.93000000715255737 - 2.2799999713897705 - - blue_density - - 1.2799999713897705 - 1.2999999523162842 - 1.3999999761581421 - 1.3999999761581421 - - blue_horizon - - 1 - 1.1200000047683716 - 0.068059712648391724 - 1.1200000047683716 - - cloud_color - - 0.52756190160579308 - 0.52756190160579308 - 0.52756190160579308 - 1 - - cloud_pos_density1 - - 0.72999995946884155 - 0.34000000357627869 - 0.32999998331069946 - 1 - - cloud_pos_density2 - - 0.28999999165534973 - 0.84999996423721313 - 0.019999999552965164 - 1 - - cloud_scale - - 0.32999998058761548 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.499399946934318 - 10.010999746491507 - - cloud_shadow - - 0.34999999403953552 - 0 - 0 - 1 - - density_multiplier - - 5.999999848427251e-005 - 0 - 0 - 1 - - distance_multiplier - - 12.800000190734863 - 0 - 0 - 1 - - east_angle - 3.8327431678771973 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.14000000059604645 - 0 - 0 - 1 - - glow - - 10 - 0.0010000000474974513 - -1.0499999523162842 - 1 - - haze_density - - 0.18999999761581421 - 0 - 0 - 1 - - haze_horizon - - 0.5899999737739563 - 0.19915598630905151 - 0.19915598630905151 - 1 - - lightnorm - - -0.60370332002639771 - 0.32094338536262512 - 0.72975176572799683 - 0 - - max_y - - 537 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.2200000286102295 - sun_angle - 2.8148672580718994 - sunlight_color - - 3 - 2.3461534976959229 - 3 - 1 - - - + + + ambient + + 1.5 + 2.2799999713897705 + 0.93000000715255737 + 2.2799999713897705 + + blue_density + + 1.2799999713897705 + 1.2999999523162842 + 1.3999999761581421 + 1.3999999761581421 + + blue_horizon + + 1 + 1.1200000047683716 + 0.068059712648391724 + 1.1200000047683716 + + cloud_color + + 0.52756190160579308 + 0.52756190160579308 + 0.52756190160579308 + 1 + + cloud_pos_density1 + + 0.72999995946884155 + 0.34000000357627869 + 0.32999998331069946 + 1 + + cloud_pos_density2 + + 0.28999999165534973 + 0.84999996423721313 + 0.019999999552965164 + 1 + + cloud_scale + + 0.32999998058761548 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499399946934318 + 10.010999746491507 + + cloud_shadow + + 0.34999999403953552 + 0 + 0 + 1 + + density_multiplier + + 5.999999848427251e-005 + 0 + 0 + 1 + + distance_multiplier + + 12.800000190734863 + 0 + 0 + 1 + + east_angle + 3.8327431678771973 + enable_cloud_scroll + + 0 + 0 + + gamma + + 0.14000000059604645 + 0 + 0 + 1 + + glow + + 10 + 0.0010000000474974513 + -1.0499999523162842 + 1 + + haze_density + + 0.18999999761581421 + 0 + 0 + 1 + + haze_horizon + + 0.5899999737739563 + 0.19915598630905151 + 0.19915598630905151 + 1 + + lightnorm + + -0.60370332002639771 + 0.32094338536262512 + 0.72975176572799683 + 0 + + max_y + + 537 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 1.2200000286102295 + sun_angle + 2.8148672580718994 + sunlight_color + + 3 + 2.3461534976959229 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Fire%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Fire%20%28Paulina%29.xml index 5519f5ec9..b16510a54 100644 --- a/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Fire%20%28Paulina%29.xml +++ b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Fire%20%28Paulina%29.xml @@ -1,141 +1,141 @@ - - - ambient - - 3 - 3 - 3 - 3 - - blue_density - - 0.89999997615814209 - 0 - 0.41999998688697815 - 0.89999997615814209 - - blue_horizon - - 1.4800000190734863 - 1.6799999475479126 - 2 - 2 - - cloud_color - - 0.52756190160579308 - 0.52756190160579308 - 0.52756190160579308 - 1 - - cloud_pos_density1 - - 0.72999995946884155 - 0.34000000357627869 - 0.32999998331069946 - 1 - - cloud_pos_density2 - - 0.28999999165534973 - 0.84999996423721313 - 0.019999999552965164 - 1 - - cloud_scale - - 0.32999998058761548 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.499399946934318 - 10.010999746491507 - - cloud_shadow - - 0.28999999165534973 - 0 - 0 - 1 - - density_multiplier - - 0.00020999999833293259 - 0 - 0 - 1 - - distance_multiplier - - 8.1000003814697266 - 0 - 0 - 1 - - east_angle - 3.2044246196746826 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.070000000298023224 - 0 - 0 - 1 - - glow - - 3.0000019073486328 - 0.0010000000474974513 - -1.0499999523162842 - 1 - - haze_density - - 2.8899998664855957 - 0 - 0 - 1 - - haze_horizon - - 0.62000000476837158 - 0.19915598630905151 - 0.19915598630905151 - 1 - - lightnorm - - 0.061363283544778824 - 0.21200713515281677 - -0.97533971071243286 - 0 - - max_y - - 752 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.2200000286102295 - sun_angle - 0.21362832188606262 - sunlight_color - - 3 - 3 - 3 - 3 - - - + + + ambient + + 3 + 3 + 3 + 3 + + blue_density + + 0.89999997615814209 + 0 + 0.41999998688697815 + 0.89999997615814209 + + blue_horizon + + 1.4800000190734863 + 1.6799999475479126 + 2 + 2 + + cloud_color + + 0.52756190160579308 + 0.52756190160579308 + 0.52756190160579308 + 1 + + cloud_pos_density1 + + 0.72999995946884155 + 0.34000000357627869 + 0.32999998331069946 + 1 + + cloud_pos_density2 + + 0.28999999165534973 + 0.84999996423721313 + 0.019999999552965164 + 1 + + cloud_scale + + 0.32999998058761548 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499399946934318 + 10.010999746491507 + + cloud_shadow + + 0.28999999165534973 + 0 + 0 + 1 + + density_multiplier + + 0.00020999999833293259 + 0 + 0 + 1 + + distance_multiplier + + 8.1000003814697266 + 0 + 0 + 1 + + east_angle + 3.2044246196746826 + enable_cloud_scroll + + 0 + 0 + + gamma + + 0.070000000298023224 + 0 + 0 + 1 + + glow + + 3.0000019073486328 + 0.0010000000474974513 + -1.0499999523162842 + 1 + + haze_density + + 2.8899998664855957 + 0 + 0 + 1 + + haze_horizon + + 0.62000000476837158 + 0.19915598630905151 + 0.19915598630905151 + 1 + + lightnorm + + 0.061363283544778824 + 0.21200713515281677 + -0.97533971071243286 + 0 + + max_y + + 752 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 1.2200000286102295 + sun_angle + 0.21362832188606262 + sunlight_color + + 3 + 3 + 3 + 3 + + + diff --git a/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Flirt%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Flirt%20%28Paulina%29.xml index 70dd0d106..89dc79b66 100644 --- a/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Flirt%20%28Paulina%29.xml +++ b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Flirt%20%28Paulina%29.xml @@ -1,141 +1,141 @@ - - - ambient - - 3 - 3 - 3 - 3 - - blue_density - - 1 - 0 - 0.41999998688697815 - 1 - - blue_horizon - - 1.4399999380111694 - 2 - 2 - 2 - - cloud_color - - 0.52756190160579308 - 0.52756190160579308 - 0.52756190160579308 - 1 - - cloud_pos_density1 - - 0.72999995946884155 - 0.34000000357627869 - 0.32999998331069946 - 1 - - cloud_pos_density2 - - 0.28999999165534973 - 0.84999996423721313 - 0.019999999552965164 - 1 - - cloud_scale - - 0.32999998058761548 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.499399946934318 - 10.010999746491507 - - cloud_shadow - - 0.28999999165534973 - 0 - 0 - 1 - - density_multiplier - - 0.0006399999838322401 - 0 - 0 - 1 - - distance_multiplier - - 5.4000000953674316 - 0 - 0 - 1 - - east_angle - 1.8221237659454346 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.070000000298023224 - 0 - 0 - 1 - - glow - - 2.2000002861022949 - 0.0010000000474974513 - -1.4499999284744263 - 1 - - haze_density - - 2.8899998664855957 - 0 - 0 - 1 - - haze_horizon - - 0.62000000476837158 - 0.19915598630905151 - 0.19915598630905151 - 1 - - lightnorm - - -0.96764647960662842 - 0.043968122452497482 - -0.2484494149684906 - 0 - - max_y - - 27 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 2 - sun_angle - 0.043982300907373428 - sunlight_color - - 3 - 3 - 3 - 1 - - - + + + ambient + + 3 + 3 + 3 + 3 + + blue_density + + 1 + 0 + 0.41999998688697815 + 1 + + blue_horizon + + 1.4399999380111694 + 2 + 2 + 2 + + cloud_color + + 0.52756190160579308 + 0.52756190160579308 + 0.52756190160579308 + 1 + + cloud_pos_density1 + + 0.72999995946884155 + 0.34000000357627869 + 0.32999998331069946 + 1 + + cloud_pos_density2 + + 0.28999999165534973 + 0.84999996423721313 + 0.019999999552965164 + 1 + + cloud_scale + + 0.32999998058761548 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499399946934318 + 10.010999746491507 + + cloud_shadow + + 0.28999999165534973 + 0 + 0 + 1 + + density_multiplier + + 0.0006399999838322401 + 0 + 0 + 1 + + distance_multiplier + + 5.4000000953674316 + 0 + 0 + 1 + + east_angle + 1.8221237659454346 + enable_cloud_scroll + + 0 + 0 + + gamma + + 0.070000000298023224 + 0 + 0 + 1 + + glow + + 2.2000002861022949 + 0.0010000000474974513 + -1.4499999284744263 + 1 + + haze_density + + 2.8899998664855957 + 0 + 0 + 1 + + haze_horizon + + 0.62000000476837158 + 0.19915598630905151 + 0.19915598630905151 + 1 + + lightnorm + + -0.96764647960662842 + 0.043968122452497482 + -0.2484494149684906 + 0 + + max_y + + 27 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 2 + sun_angle + 0.043982300907373428 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Night%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Night%20%28Paulina%29.xml index 80ee99ef6..b9edb48a7 100644 --- a/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Night%20%28Paulina%29.xml +++ b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Night%20%28Paulina%29.xml @@ -1,141 +1,141 @@ - - - ambient - - 3 - 3 - 3 - 3 - - blue_density - - 1 - 0 - 0.41999998688697815 - 1 - - blue_horizon - - 1.4800000190734863 - 1.6799999475479126 - 2 - 2 - - cloud_color - - 0.52756190160579308 - 0.52756190160579308 - 0.52756190160579308 - 1 - - cloud_pos_density1 - - 0.72999995946884155 - 0.34000000357627869 - 0.32999998331069946 - 1 - - cloud_pos_density2 - - 0.28999999165534973 - 0.84999996423721313 - 0.019999999552965164 - 1 - - cloud_scale - - 0.32999998058761548 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.499399946934318 - 10.010999746491507 - - cloud_shadow - - 0.28999999165534973 - 0 - 0 - 1 - - density_multiplier - - 0 - 0 - 0 - 1 - - distance_multiplier - - 22.30000114440918 - 0 - 0 - 1 - - east_angle - 1.8221237659454346 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.070000000298023224 - 0 - 0 - 1 - - glow - - 3.0000019073486328 - 0.0010000000474974513 - -1.0499999523162842 - 1 - - haze_density - - 2.8899998664855957 - 0 - 0 - 1 - - haze_horizon - - 0.62000000476837158 - 0.19915598630905151 - 0.19915598630905151 - 1 - - lightnorm - - -0.96764647960662842 - 0.043968122452497482 - -0.2484494149684906 - 0 - - max_y - - 1289 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.2200000286102295 - sun_angle - 0.043982300907373428 - sunlight_color - - 3 - 3 - 3 - 1 - - - + + + ambient + + 3 + 3 + 3 + 3 + + blue_density + + 1 + 0 + 0.41999998688697815 + 1 + + blue_horizon + + 1.4800000190734863 + 1.6799999475479126 + 2 + 2 + + cloud_color + + 0.52756190160579308 + 0.52756190160579308 + 0.52756190160579308 + 1 + + cloud_pos_density1 + + 0.72999995946884155 + 0.34000000357627869 + 0.32999998331069946 + 1 + + cloud_pos_density2 + + 0.28999999165534973 + 0.84999996423721313 + 0.019999999552965164 + 1 + + cloud_scale + + 0.32999998058761548 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499399946934318 + 10.010999746491507 + + cloud_shadow + + 0.28999999165534973 + 0 + 0 + 1 + + density_multiplier + + 0 + 0 + 0 + 1 + + distance_multiplier + + 22.30000114440918 + 0 + 0 + 1 + + east_angle + 1.8221237659454346 + enable_cloud_scroll + + 0 + 0 + + gamma + + 0.070000000298023224 + 0 + 0 + 1 + + glow + + 3.0000019073486328 + 0.0010000000474974513 + -1.0499999523162842 + 1 + + haze_density + + 2.8899998664855957 + 0 + 0 + 1 + + haze_horizon + + 0.62000000476837158 + 0.19915598630905151 + 0.19915598630905151 + 1 + + lightnorm + + -0.96764647960662842 + 0.043968122452497482 + -0.2484494149684906 + 0 + + max_y + + 1289 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 1.2200000286102295 + sun_angle + 0.043982300907373428 + sunlight_color + + 3 + 3 + 3 + 1 + + + diff --git a/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Summer%20%28Paulina%29.xml b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Summer%20%28Paulina%29.xml index 6929904cc..d4ff66f24 100644 --- a/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Summer%20%28Paulina%29.xml +++ b/indra/newview/app_settings/windlight/skies/Surreal%20%2D%20Summer%20%28Paulina%29.xml @@ -1,141 +1,141 @@ - - - ambient - - 1.5 - 2.2799999713897705 - 0.93000000715255737 - 2.2799999713897705 - - blue_density - - 1.4800000190734863 - 1.4399999380111694 - 2 - 2 - - blue_horizon - - 1.2400000095367432 - 1.1399999856948853 - 0.71999996900558472 - 1.2799999713897705 - - cloud_color - - 0.2199999988079071 - 0.23999999463558197 - 0.68999999761581421 - 0.68999999761581421 - - cloud_pos_density1 - - 0.72999995946884155 - 0.34000000357627869 - 0.32999998331069946 - 1 - - cloud_pos_density2 - - 0.28999999165534973 - 0.84999996423721313 - 0.019999999552965164 - 1 - - cloud_scale - - 0.42999997735023499 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.499399946934318 - 10.010999746491507 - - cloud_shadow - - 0.65999996662139893 - 0 - 0 - 1 - - density_multiplier - - 1.9999999494757503e-005 - 0 - 0 - 1 - - distance_multiplier - - 15.5 - 0 - 0 - 1 - - east_angle - 4.1469020843505859 - enable_cloud_scroll - - 0 - 0 - - gamma - - 0.14000000059604645 - 0 - 0 - 1 - - glow - - 10 - 0.0010000000474974513 - -1.0499999523162842 - 1 - - haze_density - - 1.6999999284744263 - 0 - 0 - 1 - - haze_horizon - - 0.52999997138977051 - 0.19915598630905151 - 0.19915598630905151 - 1 - - lightnorm - - -0.82513469457626343 - 0.21200692653656006 - 0.52364665269851685 - 1 - - max_y - - 456 - 0 - 0 - 1 - - preset_num - 18 - star_brightness - 1.2200000286102295 - sun_angle - 6.0695571899414062 - sunlight_color - - 3 - 1.3499999046325684 - 3 - 3 - - - + + + ambient + + 1.5 + 2.2799999713897705 + 0.93000000715255737 + 2.2799999713897705 + + blue_density + + 1.4800000190734863 + 1.4399999380111694 + 2 + 2 + + blue_horizon + + 1.2400000095367432 + 1.1399999856948853 + 0.71999996900558472 + 1.2799999713897705 + + cloud_color + + 0.2199999988079071 + 0.23999999463558197 + 0.68999999761581421 + 0.68999999761581421 + + cloud_pos_density1 + + 0.72999995946884155 + 0.34000000357627869 + 0.32999998331069946 + 1 + + cloud_pos_density2 + + 0.28999999165534973 + 0.84999996423721313 + 0.019999999552965164 + 1 + + cloud_scale + + 0.42999997735023499 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.499399946934318 + 10.010999746491507 + + cloud_shadow + + 0.65999996662139893 + 0 + 0 + 1 + + density_multiplier + + 1.9999999494757503e-005 + 0 + 0 + 1 + + distance_multiplier + + 15.5 + 0 + 0 + 1 + + east_angle + 4.1469020843505859 + enable_cloud_scroll + + 0 + 0 + + gamma + + 0.14000000059604645 + 0 + 0 + 1 + + glow + + 10 + 0.0010000000474974513 + -1.0499999523162842 + 1 + + haze_density + + 1.6999999284744263 + 0 + 0 + 1 + + haze_horizon + + 0.52999997138977051 + 0.19915598630905151 + 0.19915598630905151 + 1 + + lightnorm + + -0.82513469457626343 + 0.21200692653656006 + 0.52364665269851685 + 1 + + max_y + + 456 + 0 + 0 + 1 + + preset_num + 18 + star_brightness + 1.2200000286102295 + sun_angle + 6.0695571899414062 + sunlight_color + + 3 + 1.3499999046325684 + 3 + 3 + + + diff --git a/indra/newview/app_settings/windlight/skies/Wastes_12pm.xml b/indra/newview/app_settings/windlight/skies/Wastes%2012pm.xml similarity index 100% rename from indra/newview/app_settings/windlight/skies/Wastes_12pm.xml rename to indra/newview/app_settings/windlight/skies/Wastes%2012pm.xml diff --git a/indra/newview/app_settings/windlight/skies/Wastes_Midnight.xml b/indra/newview/app_settings/windlight/skies/Wastes%20Midnight.xml similarity index 100% rename from indra/newview/app_settings/windlight/skies/Wastes_Midnight.xml rename to indra/newview/app_settings/windlight/skies/Wastes%20Midnight.xml diff --git a/indra/newview/app_settings/windlight/skies/Wastes_Morning.xml b/indra/newview/app_settings/windlight/skies/Wastes%20Morning.xml similarity index 100% rename from indra/newview/app_settings/windlight/skies/Wastes_Morning.xml rename to indra/newview/app_settings/windlight/skies/Wastes%20Morning.xml diff --git a/indra/newview/app_settings/windlight/skies/wastelands.xml b/indra/newview/app_settings/windlight/skies/wastelands.xml index ffb22cf37..313111fbb 100644 --- a/indra/newview/app_settings/windlight/skies/wastelands.xml +++ b/indra/newview/app_settings/windlight/skies/wastelands.xml @@ -1,141 +1,141 @@ - - - ambient - - 0.29999998211860657 - 0.17999999225139618 - 0 - 0.29999998211860657 - - blue_density - - 0.97999995946884155 - 0.97999995946884155 - 0.97999995946884155 - 0.48999997973442078 - - blue_horizon - - 0.31999999284744263 - 0.31999999284744263 - 0.31999999284744263 - 0.15999999642372131 - - cloud_color - - 0.50999999046325684 - 0.50999999046325684 - 0.50999999046325684 - 1 - - cloud_pos_density1 - - 0.5 - 0.5 - 1 - 1 - - cloud_pos_density2 - - 0.5 - 0.5 - 0.125 - 1 - - cloud_scale - - 0.079999998211860657 - 0 - 0 - 1 - - cloud_scroll_rate - - 10.49940013885498 - 10.01099967956543 - - cloud_shadow - - 0.25999999046325684 - 0 - 0 - 1 - - density_multiplier - - 0.00031000000308267772 - 0 - 0 - 1 - - distance_multiplier - - 6.8000001907348633 - 0 - 0 - 1 - - east_angle - 0 - enable_cloud_scroll - - 1 - 1 - - gamma - - 1 - 0 - 0 - 1 - - glow - - 5 - 0.0010000000474974513 - -0.33000001311302185 - 1 - - haze_density - - 1.8899999856948853 - 0 - 0 - 1 - - haze_horizon - - 0.23999999463558197 - 0.19915600121021271 - 0.19915600121021271 - 1 - - lightnorm - - 0 - 0.36227512359619141 - -0.93207120895385742 - 0 - - max_y - - 752 - 0 - 0 - 1 - - preset_num - 21 - star_brightness - 0 - sun_angle - 2.7708849906921387 - sunlight_color - - 1.3799998760223389 - 1.3799998760223389 - 1.3799998760223389 - 0.45999997854232788 - - + + + ambient + + 0.29999998211860657 + 0.17999999225139618 + 0 + 0.29999998211860657 + + blue_density + + 0.97999995946884155 + 0.97999995946884155 + 0.97999995946884155 + 0.48999997973442078 + + blue_horizon + + 0.31999999284744263 + 0.31999999284744263 + 0.31999999284744263 + 0.15999999642372131 + + cloud_color + + 0.50999999046325684 + 0.50999999046325684 + 0.50999999046325684 + 1 + + cloud_pos_density1 + + 0.5 + 0.5 + 1 + 1 + + cloud_pos_density2 + + 0.5 + 0.5 + 0.125 + 1 + + cloud_scale + + 0.079999998211860657 + 0 + 0 + 1 + + cloud_scroll_rate + + 10.49940013885498 + 10.01099967956543 + + cloud_shadow + + 0.25999999046325684 + 0 + 0 + 1 + + density_multiplier + + 0.00031000000308267772 + 0 + 0 + 1 + + distance_multiplier + + 6.8000001907348633 + 0 + 0 + 1 + + east_angle + 0 + enable_cloud_scroll + + 1 + 1 + + gamma + + 1 + 0 + 0 + 1 + + glow + + 5 + 0.0010000000474974513 + -0.33000001311302185 + 1 + + haze_density + + 1.8899999856948853 + 0 + 0 + 1 + + haze_horizon + + 0.23999999463558197 + 0.19915600121021271 + 0.19915600121021271 + 1 + + lightnorm + + 0 + 0.36227512359619141 + -0.93207120895385742 + 0 + + max_y + + 752 + 0 + 0 + 1 + + preset_num + 21 + star_brightness + 0 + sun_angle + 2.7708849906921387 + sunlight_color + + 1.3799998760223389 + 1.3799998760223389 + 1.3799998760223389 + 0.45999997854232788 + + \ No newline at end of file diff --git a/indra/newview/app_settings/windlight/water/%5BNB%5D%20Hidden%20Depths.xml b/indra/newview/app_settings/windlight/water/%5BNB%5D%20Hidden%20Depths.xml new file mode 100644 index 000000000..a433f8ffb --- /dev/null +++ b/indra/newview/app_settings/windlight/water/%5BNB%5D%20Hidden%20Depths.xml @@ -0,0 +1,43 @@ + + + blurMultiplier + 0.01700000092387199401855469 + fresnelOffset + 0.699999988079071044921875 + fresnelScale + 0.599999964237213134765625 + normScale + + 2 + 1 + 0 + + normalMap + 822ded49-9a6c-f61c-cb89-6df54f42cdf4 + scaleAbove + 0.3499999940395355224609375 + scaleBelow + 0.0999999940395355224609375 + underWaterFogMod + 0 + waterFogColor + + 0.131378173828125 + 0.17223358154296875 + 0.196746826171875 + 1 + + waterFogDensity + 1 + wave1Dir + + -1.33000004291534423828125 + -1.87999999523162841796875 + + wave2Dir + + -1.81000006198883056640625 + -1.33000004291534423828125 + + + diff --git a/indra/newview/app_settings/windlight/water/%5BNB%5D%20Sparkling%20Depths.xml b/indra/newview/app_settings/windlight/water/%5BNB%5D%20Sparkling%20Depths.xml new file mode 100644 index 000000000..a235d7ce0 --- /dev/null +++ b/indra/newview/app_settings/windlight/water/%5BNB%5D%20Sparkling%20Depths.xml @@ -0,0 +1,43 @@ + + + blurMultiplier + 0.06500000506639480590820312 + fresnelOffset + 0.4799999892711639404296875 + fresnelScale + 1 + normScale + + 0 + 4.30000019073486328125 + 4.400000095367431640625 + + normalMap + 822ded49-9a6c-f61c-cb89-6df54f42cdf4 + scaleAbove + 0.37999999523162841796875 + scaleBelow + 0.1499999910593032836914062 + underWaterFogMod + 0 + waterFogColor + + 0.0506744384765625 + 0.1772628128528594970703125 + 0.2696380615234375 + 1 + + waterFogDensity + 1.07177340984344482421875 + wave1Dir + + -1.610000133514404296875 + 0.56999969482421875 + + wave2Dir + + 1.139999866485595703125 + -1.559999942779541015625 + + + diff --git a/indra/newview/app_settings/windlight/water/%5BNB%5D%20Turbid%20Reflections.xml b/indra/newview/app_settings/windlight/water/%5BNB%5D%20Turbid%20Reflections.xml new file mode 100644 index 000000000..8c0eaf94e --- /dev/null +++ b/indra/newview/app_settings/windlight/water/%5BNB%5D%20Turbid%20Reflections.xml @@ -0,0 +1,43 @@ + + + blurMultiplier + 0.03400000184774398803710938 + fresnelOffset + 0.550000011920928955078125 + fresnelScale + 0.5099999904632568359375 + normScale + + 0.60000002384185791015625 + 3.400000095367431640625 + 4.30000019073486328125 + + normalMap + 822ded49-9a6c-f61c-cb89-6df54f42cdf4 + scaleAbove + 0.62000000476837158203125 + scaleBelow + 0.310000002384185791015625 + underWaterFogMod + 1.30000007152557373046875 + waterFogColor + + 0.1102294921875 + 0.0965824127197265625 + 0.0772705078125 + 1 + + waterFogDensity + 3.03143310546875 + wave1Dir + + -0.88000011444091796875 + 0.049999713897705078125 + + wave2Dir + + 0.469999790191650390625 + 0 + + + diff --git a/indra/newview/app_settings/windlight/water/Blacknight%20Water.xml b/indra/newview/app_settings/windlight/water/Blacknight%20Water.xml new file mode 100644 index 000000000..26b51fa31 --- /dev/null +++ b/indra/newview/app_settings/windlight/water/Blacknight%20Water.xml @@ -0,0 +1,43 @@ + + + blurMultiplier + 0.13400000333786011 + fresnelOffset + 0.53999996185302734 + fresnelScale + 0.61000001430511475 + normScale + + 5.8000001907348633 + 1.7000000476837158 + 5.5 + + normalMap + 822ded49-9a6c-f61c-cb89-6df54f42cdf4 + scaleAbove + 0.079999998211860657 + scaleBelow + 0.39999997615814209 + underWaterFogMod + 1 + waterFogColor + + 0.019683837890625 + 0.027191162109375 + 0.027191162109375 + 1 + + waterFogDensity + 59.714115142822266 + wave1Dir + + 0.099999904632568359 + -0.3600001335144043 + + wave2Dir + + 0.099999904632568359 + -0.67000001668930054 + + + diff --git a/indra/newview/app_settings/windlight/water/Raymond%27s%20Water%20At%20Night.xml b/indra/newview/app_settings/windlight/water/Raymond%27s%20Water%20At%20Night.xml new file mode 100644 index 000000000..e6463f685 --- /dev/null +++ b/indra/newview/app_settings/windlight/water/Raymond%27s%20Water%20At%20Night.xml @@ -0,0 +1,43 @@ + + + blurMultiplier + 0.04000000283122062683105469 + fresnelOffset + 0.5 + fresnelScale + 0.39999997615814208984375 + normScale + + 2 + 2 + 2 + + normalMap + 822ded49-9a6c-f61c-cb89-6df54f42cdf4 + scaleAbove + 0.02999999932944774627685547 + scaleBelow + 0.2000000029802322387695312 + underWaterFogMod + 0.25 + waterFogColor + + 0.0518798828125 + 0.0809326171875 + 0.0761661529541015625 + 1 + + waterFogDensity + 16 + wave1Dir + + 1.049999713897705078125 + -0.4200000762939453125 + + wave2Dir + + 1.10999965667724609375 + -1.1600000858306884765625 + + + diff --git a/indra/newview/app_settings/windlight/water/Raymond%27s%20Water.xml b/indra/newview/app_settings/windlight/water/Raymond%27s%20Water.xml new file mode 100644 index 000000000..9b3929f25 --- /dev/null +++ b/indra/newview/app_settings/windlight/water/Raymond%27s%20Water.xml @@ -0,0 +1,43 @@ + + + blurMultiplier + 0.04000000283122062683105469 + fresnelOffset + 0.5 + fresnelScale + 0.39999997615814208984375 + normScale + + 2 + 2 + 2 + + normalMap + 822ded49-9a6c-f61c-cb89-6df54f42cdf4 + scaleAbove + 0.02999999932944774627685547 + scaleBelow + 0.2000000029802322387695312 + underWaterFogMod + 0.25 + waterFogColor + + 0.055694580078125 + 0.139617919921875 + 0.1219153329730033874511719 + 1 + + waterFogDensity + 16 + wave1Dir + + 1.049999713897705078125 + -0.4200000762939453125 + + wave2Dir + + 1.10999965667724609375 + -1.1600000858306884765625 + + + diff --git a/indra/newview/ascentprefschat.cpp b/indra/newview/ascentprefschat.cpp index f80d86a22..0410ce2aa 100644 --- a/indra/newview/ascentprefschat.cpp +++ b/indra/newview/ascentprefschat.cpp @@ -42,6 +42,10 @@ #include "llviewercontrol.h" #include "lgghunspell_wrapper.h" +#include "llstartup.h" + +LLDropTarget* mObjectDropTarget; +LLPrefsAscentChat* LLPrefsAscentChat::sInst; LLPrefsAscentChat::LLPrefsAscentChat() { @@ -63,6 +67,28 @@ LLPrefsAscentChat::LLPrefsAscentChat() childSetCommitCallback("AscentInstantMessageShowResponded", onCommitAutoResponse, this); childSetCommitCallback("AscentInstantMessageResponseRepeat", onCommitAutoResponse, this); childSetCommitCallback("AscentInstantMessageResponseItem", onCommitAutoResponse, this); + + if(sInst)delete sInst; sInst = this; + LLView* target_view = getChild("im_give_drop_target_rect"); + if (target_view) + { + const std::string drop="drop target"; + if (mObjectDropTarget) delete mObjectDropTarget; + mObjectDropTarget = new LLDropTarget(drop, target_view->getRect(), SinguIMResponseItemDrop);//, mAvatarID); + addChild(mObjectDropTarget); + } + + if (LLStartUp::getStartupState() == STATE_STARTED) + { + LLUUID itemid = (LLUUID)gSavedPerAccountSettings.getString("AscentInstantMessageResponseItemData"); + LLViewerInventoryItem* item = gInventory.getItem(itemid); + + if (item) childSetValue("im_give_disp_rect_txt","Currently set to: "+item->getName()); + else if (itemid.isNull()) childSetValue("im_give_disp_rect_txt","Currently not set"); + else childSetValue("im_give_disp_rect_txt","Currently set to an item not on this account"); + } + else childSetValue("im_give_disp_rect_txt","Not logged in"); + childSetCommitCallback("im_response", onCommitAutoResponse, this); childSetCommitCallback("KeywordsOn", onCommitKeywords, this); @@ -80,6 +106,8 @@ LLPrefsAscentChat::LLPrefsAscentChat() LLPrefsAscentChat::~LLPrefsAscentChat() { + sInst=NULL; + delete mObjectDropTarget; mObjectDropTarget=NULL; } //static @@ -202,6 +230,13 @@ void LLPrefsAscentChat::onCommitAutoResponse(LLUICtrl* ctrl, void* user_data) gSavedPerAccountSettings.setString("AscentInstantMessageResponse", self->childGetValue("im_response")); } +//static +void LLPrefsAscentChat::SinguIMResponseItemDrop(LLViewerInventoryItem* item) +{ + gSavedPerAccountSettings.setString("AscentInstantMessageResponseItemData", item->getUUID().asString()); + sInst->childSetValue("im_give_disp_rect_txt","Currently set to: "+item->getName()); +} + //static void LLPrefsAscentChat::onCommitKeywords(LLUICtrl* ctrl, void* user_data) { @@ -496,3 +531,4 @@ void LLPrefsAscentChat::apply() refreshValues(); refresh(); } + diff --git a/indra/newview/ascentprefschat.h b/indra/newview/ascentprefschat.h index 85b8d45d6..15c7a44be 100644 --- a/indra/newview/ascentprefschat.h +++ b/indra/newview/ascentprefschat.h @@ -34,6 +34,7 @@ #include "llpanel.h" +#include "lldroptarget.h" class LLPrefsAscentChat : public LLPanel @@ -101,6 +102,9 @@ protected: LLColor4 mKeywordsColor; BOOL mKeywordsPlaySound; LLUUID mKeywordsSound; +private: + static LLPrefsAscentChat* sInst; + static void SinguIMResponseItemDrop(LLViewerInventoryItem* item); }; #endif diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp index 493bb7a69..c9f883c05 100644 --- a/indra/newview/ascentprefssys.cpp +++ b/indra/newview/ascentprefssys.cpp @@ -41,14 +41,19 @@ #include "llcombobox.h" #include "llfloaterchat.h" //For POWER USER affirmation. #include "llradiogroup.h" +#include "lltexturectrl.h" #include "lluictrlfactory.h" #include "llviewercontrol.h" +#include "llstartup.h" +LLDropTarget* mBuildDropTarget; +LLPrefsAscentSys* LLPrefsAscentSys::sInst; LLPrefsAscentSys::LLPrefsAscentSys() { LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_system.xml"); + //General ----------------------------------------------------------------------------- childSetCommitCallback("speed_rez_check", onCommitCheckBox, this); childSetCommitCallback("double_click_teleport_check", onCommitCheckBox, this); childSetCommitCallback("system_folder_check", onCommitCheckBox, this); @@ -57,6 +62,7 @@ LLPrefsAscentSys::LLPrefsAscentSys() childSetCommitCallback("power_user_check", onCommitCheckBox, this); childSetCommitCallback("power_user_confirm_check", onCommitCheckBox, this); + //Command Line ------------------------------------------------------------------------ childSetCommitCallback("chat_cmd_toggle", onCommitCmdLine, this); childSetCommitCallback("AscentCmdLinePos", onCommitCmdLine, this); childSetCommitCallback("AscentCmdLineGround", onCommitCmdLine, this); @@ -73,12 +79,43 @@ LLPrefsAscentSys::LLPrefsAscentSys() childSetCommitCallback("AscentCmdLineTP2", onCommitCmdLine, this); childSetCommitCallback("SinguCmdLineAway", onCommitCmdLine, this); - refreshValues(); + //Build ------------------------------------------------------------------------------- + childSetCommitCallback("next_owner_copy", onCommitCheckBox, this); + childSetEnabled("next_owner_transfer", gSavedSettings.getBOOL("NextOwnerCopy")); + childSetCommitCallback("material", onCommitComboBox, this); + childSetCommitCallback("combobox shininess", onCommitComboBox, this); + getChild("texture control")->setDefaultImageAssetID(LLUUID(gSavedSettings.getString("EmeraldBuildPrefs_Texture"))); + childSetCommitCallback("texture control", onCommitTexturePicker, this); + + if(sInst)delete sInst; sInst = this; + LLView* target_view = getChild("build_item_drop_target_rect"); + if (target_view) + { + const std::string drop="drop target"; + if (mBuildDropTarget) delete mBuildDropTarget; + mBuildDropTarget = new LLDropTarget(drop, target_view->getRect(), SinguBuildItemDrop);//, mAvatarID); + addChild(mBuildDropTarget); + } + + if (LLStartUp::getStartupState() == STATE_STARTED) + { + LLUUID itemid = (LLUUID)gSavedPerAccountSettings.getString("EmeraldBuildPrefs_Item"); + LLViewerInventoryItem* item = gInventory.getItem(itemid); + + if (item) childSetValue("build_item_add_disp_rect_txt", "Currently set to:\n"+item->getName()); + else if (itemid.isNull()) childSetValue("build_item_add_disp_rect_txt", "Currently\nnot set"); + else childSetValue("build_item_add_disp_rect_txt", "Currently set to\nan item not on this account"); + } + else childSetValue("build_item_add_disp_rect_txt", "You are\nnot logged in"); + + refreshValues(); refresh(); } LLPrefsAscentSys::~LLPrefsAscentSys() { + sInst=NULL; + delete mBuildDropTarget; mBuildDropTarget=NULL; } //static @@ -132,6 +169,12 @@ void LLPrefsAscentSys::onCommitCheckBox(LLUICtrl* ctrl, void* user_data) LLFloaterChat::addChat(chat); } } + else if (ctrl->getName() == "next_owner_copy") + { + bool copy = gSavedSettings.getBOOL("NextOwnerCopy"); + if (!copy) gSavedSettings.setBOOL("NextOwnerTransfer", true); + self->childSetEnabled("next_owner_transfer", copy); + } } //static @@ -189,6 +232,24 @@ void LLPrefsAscentSys::onCommitCmdLine(LLUICtrl* ctrl, void* user_data) gSavedSettings.setString("SinguCmdLineAway", self->childGetValue("SinguCmdLineAway")); } +void LLPrefsAscentSys::onCommitComboBox(LLUICtrl* ctrl, void* userdata) +{ + LLComboBox* box = (LLComboBox*)ctrl; + if(box) gSavedSettings.setString(box->getControlName(), box->getValue().asString()); +} + +void LLPrefsAscentSys::onCommitTexturePicker(LLUICtrl* ctrl, void* userdata) +{ + LLTextureCtrl* image_ctrl = (LLTextureCtrl*)ctrl; + if(image_ctrl) gSavedSettings.setString("EmeraldBuildPrefs_Texture", image_ctrl->getImageAssetID().asString()); +} + +void LLPrefsAscentSys::SinguBuildItemDrop(LLViewerInventoryItem* item) +{ + gSavedPerAccountSettings.setString("EmeraldBuildPrefs_Item", item->getUUID().asString()); + sInst->childSetValue("build_item_add_disp_rect_txt","Currently set to:\n"+item->getName()); +} + void LLPrefsAscentSys::refreshValues() { //General ----------------------------------------------------------------------------- @@ -240,10 +301,29 @@ void LLPrefsAscentSys::refreshValues() mDisableClickSit = gSavedSettings.getBOOL("DisableClickSit"); mDisplayScriptJumps = gSavedSettings.getBOOL("AscentDisplayTotalScriptJumps"); mNumScriptDiff = gSavedSettings.getF32("Ascentnumscriptdiff"); + + //Build ------------------------------------------------------------------------------- + mAlpha = gSavedSettings.getF32("EmeraldBuildPrefs_Alpha"); + mColor = gSavedSettings.getColor4("EmeraldBuildPrefs_Color"); + mFullBright = gSavedSettings.getBOOL("EmeraldBuildPrefs_FullBright"); + mGlow = gSavedSettings.getF32("EmeraldBuildPrefs_Glow"); + mMaterial = gSavedSettings.getString("BuildPrefs_Material"); + mNextCopy = gSavedSettings.getBOOL("NextOwnerCopy"); + mNextMod = gSavedSettings.getBOOL("NextOwnerModify"); + mNextTrans = gSavedSettings.getBOOL("NextOwnerTransfer"); + mShiny = gSavedSettings.getString("EmeraldBuildPrefs_Shiny"); + mTemporary = gSavedSettings.getBOOL("EmeraldBuildPrefs_Temporary"); + mTexture = gSavedSettings.getString("EmeraldBuildPrefs_Texture"); + mPhantom = gSavedSettings.getBOOL("EmeraldBuildPrefs_Phantom"); + mPhysical = gSavedSettings.getBOOL("EmeraldBuildPrefs_Physical"); + mXsize = gSavedSettings.getF32("BuildPrefs_Xsize"); + mYsize = gSavedSettings.getF32("BuildPrefs_Ysize"); + mZsize = gSavedSettings.getF32("BuildPrefs_Zsize"); } void LLPrefsAscentSys::refresh() { + //General ----------------------------------------------------------------------------- childSetEnabled("center_after_teleport_check", mDoubleClickTeleport); childSetEnabled("offset_teleport_check", mDoubleClickTeleport); childSetValue("power_user_check", mPowerUser); @@ -252,6 +332,7 @@ void LLPrefsAscentSys::refresh() childSetEnabled("speed_rez_interval", mSpeedRez); childSetEnabled("speed_rez_seconds", mSpeedRez); + //Command Line ------------------------------------------------------------------------ childSetEnabled("cmd_line_text_2", mCmdLine); childSetEnabled("cmd_line_text_3", mCmdLine); childSetEnabled("cmd_line_text_4", mCmdLine); @@ -282,6 +363,7 @@ void LLPrefsAscentSys::refresh() childSetEnabled("AscentCmdLineTP2", mCmdLine); childSetEnabled("SinguCmdLineAway", mCmdLine); + //Security ---------------------------------------------------------------------------- childSetValue("AscentCmdLinePos", mCmdLinePos); childSetValue("AscentCmdLineGround", mCmdLineGround); childSetValue("AscentCmdLineHeight", mCmdLineHeight); @@ -296,6 +378,24 @@ void LLPrefsAscentSys::refresh() childSetValue("AscentCmdLineMapTo", mCmdLineMapTo); childSetValue("AscentCmdLineTP2", mCmdLineTP2); childSetValue("SinguCmdLineAway", mCmdLineAway); + + //Build ------------------------------------------------------------------------------- + childSetValue("EmeraldBuildPrefs_Alpha", mAlpha); + getChild("EmeraldBuildPrefs_Color")->setOriginal(mColor); + childSetValue("EmeraldBuildPrefs_FullBright", mFullBright); + childSetValue("EmeraldBuildPrefs_Glow", mGlow); + childSetValue("BuildPrefs_Material", mMaterial); + childSetValue("NextOwnerCopy", mNextCopy); + childSetValue("NextOwnerModify", mNextMod); + childSetValue("NextOwnerTransfer", mNextTrans); + childSetValue("EmeraldBuildPrefs_Phantom", mPhantom); + childSetValue("EmeraldBuildPrefs_Physical", mPhysical); + childSetValue("EmeraldBuildPrefs_Shiny", mShiny); + childSetValue("EmeraldBuildPrefs_Temporary", mTemporary); + childSetValue("EmeraldBuildPrefs_Texture", mTexture); + childSetValue("BuildPrefs_Xsize", mXsize); + childSetValue("BuildPrefs_Ysize", mYsize); + childSetValue("BuildPrefs_Zsize", mZsize); } void LLPrefsAscentSys::cancel() @@ -348,6 +448,24 @@ void LLPrefsAscentSys::cancel() gSavedSettings.setBOOL("DisableClickSit", mDisableClickSit); gSavedSettings.setBOOL("AscentDisplayTotalScriptJumps", mDisplayScriptJumps); gSavedSettings.setF32("Ascentnumscriptdiff", mNumScriptDiff); + + //Build ------------------------------------------------------------------------------- + gSavedSettings.setF32("EmeraldBuildPrefs_Alpha", mAlpha); + gSavedSettings.setColor4("EmeraldBuildPrefs_Color", mColor); + gSavedSettings.setBOOL("EmeraldBuildPrefs_FullBright", mFullBright); + gSavedSettings.setF32("EmeraldBuildPrefs_Glow", mGlow); + gSavedSettings.setString("BuildPrefs_Material", mMaterial); + gSavedSettings.setBOOL("NextOwnerCopy", mNextCopy); + gSavedSettings.setBOOL("NextOwnerModify", mNextMod); + gSavedSettings.setBOOL("NextOwnerTransfer", mNextTrans); + gSavedSettings.setBOOL("EmeraldBuildPrefs_Phantom", mPhantom); + gSavedSettings.setBOOL("EmeraldBuildPrefs_Physical", mPhysical); + gSavedSettings.setString("EmeraldBuildPrefs_Shiny", mShiny); + gSavedSettings.setBOOL("EmeraldBuildPrefs_Temporary", mTemporary); + gSavedSettings.setString("EmeraldBuildPrefs_Texture", mTexture); + gSavedSettings.setF32("BuildPrefs_Xsize", mXsize); + gSavedSettings.setF32("BuildPrefs_Ysize", mYsize); + gSavedSettings.setF32("BuildPrefs_Zsize", mZsize); } void LLPrefsAscentSys::apply() diff --git a/indra/newview/ascentprefssys.h b/indra/newview/ascentprefssys.h index c31751574..deb0b6a3f 100644 --- a/indra/newview/ascentprefssys.h +++ b/indra/newview/ascentprefssys.h @@ -34,6 +34,7 @@ #include "llpanel.h" +#include "lldroptarget.h" class LLPrefsAscentSys : public LLPanel @@ -50,6 +51,8 @@ public: protected: static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data); static void onCommitCmdLine(LLUICtrl* ctrl, void* user_data); + static void onCommitComboBox(LLUICtrl* ctrl, void* user_data); + static void onCommitTexturePicker(LLUICtrl* ctrl, void* user_data); //General ----------------------------------------------------------------------------- BOOL mDoubleClickTeleport; @@ -100,6 +103,26 @@ protected: BOOL mDisableClickSit; BOOL mDisplayScriptJumps; F32 mNumScriptDiff; + //Build ------------------------------------------------------------------------------- + F32 mAlpha; + LLColor4 mColor; + BOOL mFullBright; + F32 mGlow; + std::string mMaterial; + BOOL mNextCopy; + BOOL mNextMod; + BOOL mNextTrans; + std::string mShiny; + BOOL mTemporary; + std::string mTexture; + BOOL mPhantom; + BOOL mPhysical; + F32 mXsize; + F32 mYsize; + F32 mZsize; +private: + static LLPrefsAscentSys* sInst; + static void SinguBuildItemDrop(LLViewerInventoryItem* item); }; #endif diff --git a/indra/newview/importtracker.cpp b/indra/newview/importtracker.cpp index af61eec5c..b926d7aac 100644 --- a/indra/newview/importtracker.cpp +++ b/indra/newview/importtracker.cpp @@ -7,31 +7,30 @@ #include "llviewerprecompiledheaders.h" #include "llagent.h" -#include "llframetimer.h" -#include "llprimitive.h" -#include "llviewercontrol.h" +//#include "llprimitive.h" +#include "llcontrol.h" #include "llviewerobjectlist.h" #include "llviewerregion.h" -#include "llvolumemessage.h" -#include "llchat.h" +//#include "llvolumemessage.h" +//#include "llchat.h" #include "importtracker.h" -#include "llsdserialize.h" +//#include "llsdserialize.h" #include "lltooldraganddrop.h" -#include "llassetuploadresponders.h" -#include "lleconomy.h" +//#include "llassetuploadresponders.h" +//#include "lleconomy.h" -#include "llfloaterperms.h" +//#include "llfloaterperms.h" -#include "llviewertexteditor.h" +//#include "llviewertexteditor.h" -#include "jclslpreproc.h" +//#include "jclslpreproc.h" ImportTracker gImportTracker; extern LLAgent gAgent; -void ImportTracker::importer(std::string file, void (*callback)(LLViewerObject*)) +/*void ImportTracker::importer(std::string file, void (*callback)(LLViewerObject*)) { mDownCallback = callback; asset_insertions = 0; @@ -71,7 +70,7 @@ void ImportTracker::import(LLSD& ls_data) state = BUILDING; //llinfos << "IMPORTED, BUILDING.." << llendl; plywood_above_head(); -} +}*/ void ImportTracker::expectRez() { @@ -80,7 +79,7 @@ void ImportTracker::expectRez() //llinfos << "EXPECTING CUBE..." << llendl; } -void ImportTracker::clear() +/*void ImportTracker::clear() { if(linkset.isDefined())lastrootid = linkset[0]["LocalID"].asInteger(); localids.clear(); @@ -88,7 +87,7 @@ void ImportTracker::clear() state = IDLE; finish(); } -void cmdline_printchat(std::string message); +void cmdline_printchat(std::string message);*/ LLViewerObject* find(U32 local) { S32 i; @@ -104,7 +103,7 @@ LLViewerObject* find(U32 local) } return NULL; } -void ImportTracker::finish() +/*void ImportTracker::finish() { if(asset_insertions == 0) { @@ -144,13 +143,13 @@ void ImportTracker::cleanUp() } } else cleargroups(); -} +}*/ void ImportTracker::get_update(S32 newid, BOOL justCreated, BOOL createSelected) { switch (state) { - //lgg crap + //lgg crap to change remaining prim parameters from the ascent system build preferences subtab case WAND: if(justCreated && createSelected) { @@ -165,14 +164,16 @@ void ImportTracker::get_update(S32 newid, BOOL justCreated, BOOL createSelected) msg->nextBlockFast(_PREHASH_ObjectData); msg->addU32Fast(_PREHASH_ObjectLocalID, (U32)newid); msg->addStringFast(_PREHASH_MediaURL, NULL); - +//sets texture stuff LLPrimitive obj; obj.setNumTEs(U8(10)); S32 shinnyLevel = 0; - if(gSavedSettings.getString("EmeraldBuildPrefs_Shiny")== "None") shinnyLevel = 0; - if(gSavedSettings.getString("EmeraldBuildPrefs_Shiny")== "Low") shinnyLevel = 1; - if(gSavedSettings.getString("EmeraldBuildPrefs_Shiny")== "Medium") shinnyLevel = 2; - if(gSavedSettings.getString("EmeraldBuildPrefs_Shiny")== "High") shinnyLevel = 3; + static LLCachedControl sshinystr(gSavedSettings, "EmeraldBuildPrefs_Shiny"); + std::string shinystr = sshinystr; + //if(shinystr == "None") shinnyLevel = 0; //We're already 0. + if(shinystr == "Low") shinnyLevel = 1; + else if(shinystr == "Medium") shinnyLevel = 2; + else if(shinystr == "High") shinnyLevel = 3; for (int i = 0; i < 10; i++) { @@ -193,21 +194,21 @@ void ImportTracker::get_update(S32 newid, BOOL justCreated, BOOL createSelected) obj.packTEMessage(gMessageSystem); msg->sendReliable(gAgent.getRegion()->getHost()); - +//sets some object parameters msg->newMessage("ObjectFlagUpdate"); msg->nextBlockFast(_PREHASH_AgentData); msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() ); msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); msg->addU32Fast(_PREHASH_ObjectLocalID, (U32)newid ); msg->addBOOLFast(_PREHASH_UsePhysics, gSavedSettings.getBOOL("EmeraldBuildPrefs_Physical")); - msg->addBOOL("IsTemporary", gSavedSettings.getBOOL("EmeraldBuildPrefs_Temporary")); - msg->addBOOL("IsPhantom", gSavedSettings.getBOOL("EmeraldBuildPrefs_Phantom") ); + msg->addBOOLFast(_PREHASH_IsTemporary, gSavedSettings.getBOOL("EmeraldBuildPrefs_Temporary")); + msg->addBOOLFast(_PREHASH_IsPhantom, gSavedSettings.getBOOL("EmeraldBuildPrefs_Phantom") ); msg->addBOOL("CastsShadows", true ); msg->sendReliable(gAgent.getRegion()->getHost()); if(gSavedSettings.getBOOL("EmeraldBuildPrefs_EmbedItem")) { - LLViewerInventoryItem* item = (LLViewerInventoryItem*)gInventory.getItem((LLUUID)gSavedSettings.getString("EmeraldBuildPrefs_Item")); + LLViewerInventoryItem* item = (LLViewerInventoryItem*)gInventory.getItem((LLUUID)gSavedPerAccountSettings.getString("EmeraldBuildPrefs_Item")); LLViewerObject* objectp = find((U32)newid); if(objectp) if(item) @@ -250,12 +251,11 @@ void ImportTracker::get_update(S32 newid, BOOL justCreated, BOOL createSelected) flags |= PERM_TRANSFER; } msg->addU32Fast(_PREHASH_Mask, flags); - msg->sendReliable(gAgent.getRegion()->getHost()); - + msg->sendReliable(gAgent.getRegion()->getHost()); //llinfos << "LGG SENDING CUBE TEXTURE.." << llendl; } break; - case BUILDING: +/* case BUILDING: if (justCreated && (int)localids.size() < linkset.size()) { @@ -298,10 +298,10 @@ void ImportTracker::get_update(S32 newid, BOOL justCreated, BOOL createSelected) break; case LINKING: link(); - break; + break;*/ } } -struct InventoryImportInfo +/*struct InventoryImportInfo { U32 localid; LLAssetType::EType type; @@ -427,8 +427,8 @@ public: void fire(const LLUUID &inv_item) { S32 file_size; - LLAPRFile infile ; - infile.open(data->filename, LL_APR_RB, NULL, &file_size); + LLAPRFile infile; + infile.open(data->filename, LL_APR_RB, LLAPRFile::access_t(), &file_size); if (infile.getFileHandle()) { //cmdline_printchat("got file handle @ postinv"); @@ -445,7 +445,7 @@ public: case LLAssetType::AT_NOTECARD: //cmdline_printchat("case notecard @ postinv"); { - /*LLViewerTextEditor* edit = new LLViewerTextEditor("",LLRect(0,0,0,0),S32_MAX,""); + *//*LLViewerTextEditor* edit = new LLViewerTextEditor("",LLRect(0,0,0,0),S32_MAX,""); S32 size = gVFS->getSize(data->assetid, data->type); U8* buffer = new U8[size]; gVFS->getData(data->assetid, data->type, buffer, 0, size); @@ -461,7 +461,7 @@ public: file.remove(); LLVFile newfile(gVFS, data->assetid, data->type, LLVFile::APPEND); newfile.setMaxSize(size); - newfile.write((const U8*)card.c_str(),size);*/ + newfile.write((const U8*)card.c_str(),size);*//* //FAIL. @@ -484,14 +484,14 @@ public: U8* buffer = new U8[size]; gVFS->getData(data->assetid, data->type, buffer, 0, size); std::string script((char*)buffer); - BOOL domono = JCLSLPreprocessor::mono_directive(script); - /*if(script.find("//mono\n") != -1) + BOOL domono = FALSE;//Phox- this needs to be fixed when the preproc is added = JCLSLPreprocessor::mono_directive(script); + *//*if(script.find("//mono\n") != -1) { domono = TRUE; }else if(script.find("//lsl2\n") != -1) { domono = FALSE; - }*/ + }*//* delete buffer; buffer = 0; body["target"] = (domono == TRUE) ? "mono" : "lsl2"; @@ -592,7 +592,7 @@ void ImportTracker::send_inventory(LLSD& prim) std::string url = gAgent.getRegion()->getCapability("NewFileAgentInventory"); S32 file_size; LLAPRFile infile ; - infile.open(data->filename, LL_APR_RB, NULL, &file_size); + infile.open(data->filename, LL_APR_RB, LLAPRFile::access_t(), &file_size); if (infile.getFileHandle()) { //cmdline_printchat("got file handle"); @@ -625,8 +625,8 @@ void ImportTracker::send_inventory(LLSD& prim) //cmdline_printchat("case cloth/bodypart"); { S32 file_size; - LLAPRFile infile ; - infile.open(data->filename, LL_APR_RB, NULL, &file_size); + LLAPRFile infile; + infile.open(data->filename, LL_APR_RB, LLAPRFile::access_t(), &file_size); if (infile.getFileHandle()) { //cmdline_printchat("got file handle @ cloth"); @@ -716,7 +716,7 @@ void ImportTracker::send_properties(LLSD& prim, int counter) msg->addU8Fast(_PREHASH_Field, PERM_NEXT_OWNER); msg->addBOOLFast(_PREHASH_Set, PERM_ITEM_UNRESTRICTED); msg->addU32Fast(_PREHASH_Mask, U32(atoi(prim["next_owner_mask"].asString().c_str()))); - /*msg->sendReliable(gAgent.getRegion()->getHost()); + *//*msg->sendReliable(gAgent.getRegion()->getHost()); //LLMessageSystem* msg = gMessageSystem; msg->newMessageFast(_PREHASH_ObjectPermissions); @@ -724,13 +724,13 @@ void ImportTracker::send_properties(LLSD& prim, int counter) msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID()); msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); msg->nextBlockFast(_PREHASH_HeaderData); - msg->addBOOLFast(_PREHASH_Override, data->mOverride);*/ + msg->addBOOLFast(_PREHASH_Override, data->mOverride);*//* msg->nextBlockFast(_PREHASH_ObjectData); msg->addU32Fast(_PREHASH_ObjectLocalID, prim["LocalID"].asInteger()); msg->addU8Fast(_PREHASH_Field, PERM_GROUP); msg->addBOOLFast(_PREHASH_Set, PERM_ITEM_UNRESTRICTED); msg->addU32Fast(_PREHASH_Mask, U32(atoi(prim["group_mask"].asString().c_str()))); - /*msg->sendReliable(gAgent.getRegion()->getHost()); + *//*msg->sendReliable(gAgent.getRegion()->getHost()); //LLMessageSystem* msg = gMessageSystem; msg->newMessageFast(_PREHASH_ObjectPermissions); @@ -738,7 +738,7 @@ void ImportTracker::send_properties(LLSD& prim, int counter) msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID()); msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); msg->nextBlockFast(_PREHASH_HeaderData); - msg->addBOOLFast(_PREHASH_Override, data->mOverride);*/ + msg->addBOOLFast(_PREHASH_Override, data->mOverride);*//* msg->nextBlockFast(_PREHASH_ObjectData); msg->addU32Fast(_PREHASH_ObjectLocalID, prim["LocalID"].asInteger()); msg->addU8Fast(_PREHASH_Field, PERM_EVERYONE); @@ -1119,4 +1119,4 @@ void ImportTracker::plywood_above_head() msg->addUUIDFast(_PREHASH_RayTargetID, LLUUID::null); msg->sendReliable(region->getHost()); } - +*/ diff --git a/indra/newview/importtracker.h b/indra/newview/importtracker.h index c9a7fb4e5..73a2d3dc5 100644 --- a/indra/newview/importtracker.h +++ b/indra/newview/importtracker.h @@ -7,38 +7,38 @@ #ifndef IMPORTTRACKER_H #define IMPORTTRACKER_H -#include "llviewerobject.h" +//#include "llviewerobject.h" class ImportTracker { public: - enum ImportState { IDLE, WAND, BUILDING, LINKING, POSITIONING }; + enum ImportState { IDLE, WAND/*, BUILDING, LINKING, POSITIONING*/ }; ImportTracker() : numberExpected(0), - state(IDLE), + state(IDLE)/*, last(0), groupcounter(0), - updated(0) + updated(0)*/ { } - ImportTracker(LLSD &data) { state = IDLE; linkset = data; numberExpected=0;} - ~ImportTracker() { localids.clear(); linkset.clear(); } + ImportTracker(LLSD &data) { state = IDLE; /*linkset = data;*/ numberExpected=0;} + ~ImportTracker() { /*localids.clear(); linkset.clear();*/ } //Chalice - support import of linkset groups - void importer(std::string file, void (*callback)(LLViewerObject*)); - void cleargroups(); - void import(LLSD &ls_data); + //void importer(std::string file, void (*callback)(LLViewerObject*)); + //void cleargroups(); + //void import(LLSD &ls_data); void expectRez(); - void clear(); - void finish(); - void cleanUp(); + //void clear(); + //void finish(); + //void cleanUp(); void get_update(S32 newid, BOOL justCreated = false, BOOL createSelected = false); const int getState() { return state; } - U32 asset_insertions; +/* U32 asset_insertions; protected: void send_inventory(LLSD &prim); @@ -52,11 +52,11 @@ class ImportTracker void wear(LLSD &prim); void position(LLSD &prim); void plywood_above_head(); - +*/ private: int numberExpected; int state; - S32 last; + /* S32 last; LLVector3 root; LLQuaternion rootrot; std::list localids; @@ -71,7 +71,7 @@ class ImportTracker std::string asset_dir; void (*mDownCallback)(LLViewerObject*); - U32 lastrootid; + U32 lastrootid;*/ }; extern ImportTracker gImportTracker; diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index a330de1ff..7a426decc 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -69,7 +69,7 @@ SubCaption 0 $(LicenseSubTitleSetup) ; override "license agreement" text BrandingText "Prepare to Implode!" ; bottom of window text Icon %%SOURCE%%\installers\windows\install_icon_singularity.ico -UninstallIcon %%SOURCE%%\installers\windows\install_icon_singularity.ico +UninstallIcon %%SOURCE%%\installers\windows\uninstall_icon_singularity.ico WindowIcon off ; show our icon in left corner BGGradient 9090b0 000000 notext CRCCheck on ; make sure CRC is OK diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 4c7cd1474..96b6166e4 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -612,7 +612,7 @@ bool LLAppViewer::init() initLogging(); // Curl must be initialized before any thread is running. - AICurlInterface::initCurl(); + AICurlInterface::initCurl(&AIStateMachine::flush); // Logging is initialized. Now it's safe to start the error thread. startErrorThread(); diff --git a/indra/newview/llcurlrequest.cpp b/indra/newview/llcurlrequest.cpp index 9192de127..75706af6d 100644 --- a/indra/newview/llcurlrequest.cpp +++ b/indra/newview/llcurlrequest.cpp @@ -135,13 +135,6 @@ bool Request::post(std::string const& url, headers_t const& headers, LLSD const& return true; // We throw in case of problems. } -S32 Request::process(void) -{ - //FIXME: needs implementation - //DoutEntering(dc::warning, "Request::process()"); - return 0; -} - } // namespace AICurlInterface //================================================================================== diff --git a/indra/newview/llcurlrequest.h b/indra/newview/llcurlrequest.h index 59f3da981..d10c20b98 100644 --- a/indra/newview/llcurlrequest.h +++ b/indra/newview/llcurlrequest.h @@ -50,8 +50,6 @@ class Request { bool getByteRange(std::string const& url, headers_t const& headers, S32 offset, S32 length, ResponderPtr responder); bool post(std::string const& url, headers_t const& headers, std::string const& data, ResponderPtr responder, S32 time_out = 0); bool post(std::string const& url, headers_t const& headers, LLSD const& data, ResponderPtr responder, S32 time_out = 0); - - S32 process(void); }; } // namespace AICurlInterface diff --git a/indra/newview/llcurrencyuimanager.cpp b/indra/newview/llcurrencyuimanager.cpp index 6b72cc922..e31e9d114 100644 --- a/indra/newview/llcurrencyuimanager.cpp +++ b/indra/newview/llcurrencyuimanager.cpp @@ -266,7 +266,7 @@ bool LLCurrencyUIManager::Impl::checkTransaction() return false; } - if (!mTransaction->process()) + if (!mTransaction->is_finished()) { return false; } diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index cb57169a5..b9df32f06 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -802,6 +802,7 @@ void LLDrawable::updateTexture() } }*/ + getVOVolume()->mFaceMappingChanged = TRUE; gPipeline.markRebuild(this, LLDrawable::REBUILD_MATERIAL, TRUE); } } diff --git a/indra/newview/lldroptarget.cpp b/indra/newview/lldroptarget.cpp new file mode 100644 index 000000000..2dd2ad5a4 --- /dev/null +++ b/indra/newview/lldroptarget.cpp @@ -0,0 +1,83 @@ +/** + * @file lldroptarget.cpp + * @Class LLDropTarget + * + * This handy class is a simple way to drop something on another + * view. It handles drop events, always setting itself to the size of + * its parent. + * + * Altered to support a callback so it can return the item + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * Pulled into its own file for more widespread use + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * $LicenseInfo:firstyear=2004&license=viewergpl$ + * + * Copyright (c) 2004-2009, Linden Research, Inc. + * + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 + * + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception + * + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. + * + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. + * $/LicenseInfo$ + */ + +#include "llviewerprecompiledheaders.h" + +#include "lldroptarget.h" +#include "lltooldraganddrop.h" +#include "llinventorymodel.h" + +LLDropTarget::LLDropTarget(const std::string& name, const LLRect& rect, const LLUUID& agent_id) : + LLView(name, rect, NOT_MOUSE_OPAQUE, FOLLOWS_ALL), + mAgentID(agent_id), + mDownCallback(NULL) +{ +} + +LLDropTarget::LLDropTarget(const std::string& name, const LLRect& rect, void (*callback)(LLViewerInventoryItem*)) : + LLView(name, rect, NOT_MOUSE_OPAQUE, FOLLOWS_ALL), + mDownCallback(callback) +{ +} + +LLDropTarget::~LLDropTarget() +{ +} + +void LLDropTarget::doDrop(EDragAndDropType cargo_type, void* cargo_data) +{ + llinfos << "LLDropTarget::doDrop()" << llendl; +} + +BOOL LLDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept, std::string& tooltip_msg) +{ + if(!getParent()) return false; + if(!mDownCallback) LLToolDragAndDrop::handleGiveDragAndDrop(mAgentID, LLUUID::null, drop, cargo_type, cargo_data, accept); + else + { + LLViewerInventoryItem* inv_item = (LLViewerInventoryItem*)cargo_data; + if (gInventory.getItem(inv_item->getUUID())) + { + *accept = ACCEPT_YES_COPY_SINGLE; + if (drop) mDownCallback(inv_item); + } + else *accept = ACCEPT_NO; + } + return true; +} diff --git a/indra/newview/lldroptarget.h b/indra/newview/lldroptarget.h new file mode 100644 index 000000000..2dd421239 --- /dev/null +++ b/indra/newview/lldroptarget.h @@ -0,0 +1,64 @@ +/** + * @file lldroptarget.h + * @Class LLDropTarget + * + * This handy class is a simple way to drop something on another + * view. It handles drop events, always setting itself to the size of + * its parent. + * + * Altered to support a callback so it can return the item + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * Pulled into its own file for more widespread use + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * $LicenseInfo:firstyear=2004&license=viewergpl$ + * + * Copyright (c) 2004-2009, Linden Research, Inc. + * + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 + * + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception + * + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. + * + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. + * $/LicenseInfo$ + */ + +#ifndef LLDROPTARGET_H +#define LLDROPTARGET_H + +#include "stdtypes.h" +#include "llview.h" +class LLViewerInventoryItem; +class LLDropTarget : public LLView +{ +public: + LLDropTarget(const std::string& name, const LLRect& rect, void (*callback)(LLViewerInventoryItem*)); + LLDropTarget(const std::string& name, const LLRect& rect, const LLUUID& agent_id); + ~LLDropTarget(); + + void doDrop(EDragAndDropType cargo_type, void* cargo_data); + + // + // LLView functionality + virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept, std::string& tooltip_msg); + void setAgentID(const LLUUID &agent_id){ mAgentID = agent_id;} +protected: + LLUUID mAgentID; + void (*mDownCallback)(LLViewerInventoryItem*); +}; + +#endif // LLDROPTARGET_H diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 6a299deda..e52bb5959 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1367,7 +1367,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, static LLCachedControl use_transform_feedback("RenderUseTransformFeedback", false); -#ifdef GL_TRANSFORM_FEEDBACK_BUFFER +#if 0//#ifdef GL_TRANSFORM_FEEDBACK_BUFFER if (use_transform_feedback && gTransformPositionProgram.mProgramObject && //transform shaders are loaded mVertexBuffer->useVBOs() && //target buffer is in VRAM diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index b1e13d54e..1551744bd 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -556,6 +556,7 @@ void LLFeatureManager::setGraphicsLevel(S32 level, bool skipFeatures) LLViewerShaderMgr::sSkipReload = false; LLViewerShaderMgr::instance()->setShaders(); + gPipeline.refreshCachedSettings(); } void LLFeatureManager::applyBaseMasks() diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 8516035d3..8bf56b58d 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -151,6 +151,14 @@ LLFloaterAbout::LLFloaterAbout() support.append(llformat("Built with MSVC version %d\n\n", _MSC_VER)); #endif +#if LL_CLANG + support.append(llformat("Built with Clang version %d\n\n", CLANG_VERSION)); +#endif + +#if LL_ICC + support.append(llformat("Built with ICC version %d\n\n", __ICC)); +#endif + #if LL_GNUC support.append(llformat("Built with GCC version %d\n\n", GCC_VERSION)); #endif @@ -208,13 +216,14 @@ LLFloaterAbout::LLFloaterAbout() support.append( gSysCPU.getCPUString() ); support.append("\n"); + /* This is confusing and WRONG. support.append("SSE Support:"); if(gSysCPU.hasSSE()) support.append(" SSE2\n"); else if(gSysCPU.hasSSE()) support.append(" SSE\n"); else - support.append(" None\n"); + support.append(" None\n"); */ U32 memory = gSysMemory.getPhysicalMemoryKB() / 1024; // Moved hack adjustment to Windows memory size into llsys.cpp diff --git a/indra/newview/llfloateractivespeakers.cpp b/indra/newview/llfloateractivespeakers.cpp index 6db1c30fa..321a825f1 100644 --- a/indra/newview/llfloateractivespeakers.cpp +++ b/indra/newview/llfloateractivespeakers.cpp @@ -341,7 +341,6 @@ BOOL LLPanelActiveSpeakers::postBuild() mMuteVoiceCtrl = getChild("mute_btn"); childSetCommitCallback("mute_btn", onClickMuteVoiceCommit, this); - childSetAction("mute_btn", onClickMuteVoice, this); childSetCommitCallback("speaker_volume", onVolumeChange, this); @@ -718,11 +717,6 @@ void LLPanelActiveSpeakers::onClickMuteTextCommit(LLUICtrl* ctrl, void* user_dat } } -//static -void LLPanelActiveSpeakers::onClickMuteVoice(void* user_data) -{ - onClickMuteVoiceCommit(NULL, user_data); -} //static void LLPanelActiveSpeakers::onClickMuteVoiceCommit(LLUICtrl* ctrl, void* user_data) diff --git a/indra/newview/llfloateractivespeakers.h b/indra/newview/llfloateractivespeakers.h index 8a70e77a0..97221cb60 100644 --- a/indra/newview/llfloateractivespeakers.h +++ b/indra/newview/llfloateractivespeakers.h @@ -224,7 +224,6 @@ public: void setVoiceModerationCtrlMode(const BOOL& moderated_voice); - static void onClickMuteVoice(void* user_data); static void onClickMuteVoiceCommit(LLUICtrl* ctrl, void* user_data); static void onClickMuteTextCommit(LLUICtrl* ctrl, void* user_data); static void onVolumeChange(LLUICtrl* source, void* user_data); diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp index 852b439fe..909111ee3 100644 --- a/indra/newview/llfloaterbuyland.cpp +++ b/indra/newview/llfloaterbuyland.cpp @@ -866,7 +866,7 @@ bool LLFloaterBuyLandUI::checkTransaction() return false; } - if (!mTransaction->process()) + if (!mTransaction->is_finished()) { return false; } diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp index af37749c9..dec68245d 100644 --- a/indra/newview/llfloaterchat.cpp +++ b/indra/newview/llfloaterchat.cpp @@ -683,7 +683,8 @@ void LLFloaterChat::onClickToggleActiveSpeakers(void* userdata) void LLFloaterChat::onClickChatHistoryOpen(void* userdata) { char command[256]; - sprintf(command, "\"%s\\%s\"", gDirUtilp->getPerAccountChatLogsDir().c_str(), "chat.txt"); + + sprintf(command, "\"%s%s%s\"", gDirUtilp->getPerAccountChatLogsDir().c_str(), gDirUtilp->getDirDelimiter().c_str(), "chat.txt"); gViewerWindow->getWindow()->ShellEx(command); llinfos << command << llendl; diff --git a/indra/newview/llfloaterdaycycle.cpp b/indra/newview/llfloaterdaycycle.cpp index 12e26dbe6..4f6b5fb5a 100644 --- a/indra/newview/llfloaterdaycycle.cpp +++ b/indra/newview/llfloaterdaycycle.cpp @@ -1,4 +1,4 @@ -/** +/** * @file llfloaterdaycycle.cpp * @brief LLFloaterDayCycle class definition * @@ -40,6 +40,7 @@ #include "llsliderctrl.h" #include "llmultislider.h" #include "llmultisliderctrl.h" +#include "llnotificationsutil.h" #include "llspinctrl.h" #include "llcheckboxctrl.h" #include "lluictrlfactory.h" @@ -53,6 +54,7 @@ #include "llviewercontrol.h" #include "llviewerwindow.h" +#include "lldaycyclemanager.h" #include "llwlparamset.h" #include "llwlparammanager.h" #include "llpostprocess.h" @@ -89,6 +91,26 @@ LLFloaterDayCycle::LLFloaterDayCycle() : LLFloater(std::string("Day Cycle Floate sldr->addSlider(); + // add the combo boxes + LLComboBox* comboBox = getChild("DayCyclePresetsCombo"); + + if(comboBox != NULL) { + + LLDayCycleManager::preset_name_list_t day_presets; + LLDayCycleManager::getInstance()->getPresetNames(day_presets); + LLDayCycleManager::preset_name_list_t::const_iterator it; + for(it = day_presets.begin(); it != day_presets.end(); ++it) + { + comboBox->add(*it); + } + + // entry for when we're in estate time + comboBox->add(LLStringUtil::null); + + // set defaults on combo boxes + //comboBox->selectByValue(LLSD("Default")); + } + // load it up initCallbacks(); } @@ -128,8 +150,15 @@ void LLFloaterDayCycle::initCallbacks(void) childSetAction("WLAnimSky", onRunAnimSky, NULL); childSetAction("WLStopAnimSky", onStopAnimSky, NULL); - childSetAction("WLLoadDayCycle", onLoadDayCycle, NULL); - childSetAction("WLSaveDayCycle", onSaveDayCycle, NULL); + LLComboBox* comboBox = getChild("DayCyclePresetsCombo"); + + //childSetAction("WLLoadPreset", onLoadPreset, comboBox); + childSetAction("DayCycleNewPreset", onNewPreset, comboBox); + childSetAction("DayCycleSavePreset", onSavePreset, comboBox); + childSetAction("DayCycleDeletePreset", onDeletePreset, comboBox); + + comboBox->setCommitCallback(onChangePresetName); + childSetAction("WLAddKey", onAddKey, NULL); childSetAction("WLDeleteKey", onDeleteKey, NULL); @@ -269,10 +298,217 @@ void LLFloaterDayCycle::onClose(bool app_quitting) } } +void LLFloaterDayCycle::onNewPreset(void* userData) +{ + LLNotificationsUtil::add("NewDaycyclePreset", LLSD(), LLSD(), newPromptCallback); +} + +void LLFloaterDayCycle::onSavePreset(void* userData) +{ + // get the name + LLComboBox* comboBox = sDayCycle->getChild( + "DayCyclePresetsCombo"); + + std::string name = comboBox->getSelectedItemLabel(); + + // don't save the empty name + if(name == "") + { + return; + } + + // check to see if it's a default and shouldn't be overwritten + + if(LLDayCycleManager::getInstance()->isSystemPreset(name)) + { + LLNotificationsUtil::add("WLNoEditDefault"); + return; + } + + LLWLParamManager::getInstance()->mCurParams.mName = name; + + LLNotificationsUtil::add("WLSavePresetAlert", LLSD(), LLSD(), saveAlertCallback); +} + + +bool LLFloaterDayCycle::saveAlertCallback(const LLSD& notification, const LLSD& response) +{ + S32 option = LLNotification::getSelectedOption(notification, response); + // if they choose save, do it. Otherwise, don't do anything + if(option == 0) + { + LLComboBox* combo_box = sDayCycle->getChild("DayCyclePresetsCombo"); + // comment this back in to save to file + LLWLParamManager::getInstance()->mDay.saveDayCycle(combo_box->getSelectedValue().asString()); + } + return false; +} + +void LLFloaterDayCycle::onDeletePreset(void* userData) +{ + LLComboBox* combo_box = sDayCycle->getChild( + "DayCyclePresetsCombo"); + + if(combo_box->getSelectedValue().asString() == "") + { + return; + } + + LLSD args; + args["SKY"] = combo_box->getSelectedValue().asString(); + LLNotificationsUtil::add("WLDeletePresetAlert", args, LLSD(), + boost::bind(&LLFloaterDayCycle::deleteAlertCallback, sDayCycle, _1, _2)); +} + +bool LLFloaterDayCycle::deleteAlertCallback(const LLSD& notification, const LLSD& response) +{ + S32 option = LLNotification::getSelectedOption(notification, response); + + // if they choose delete, do it. Otherwise, don't do anything + if(option == 0) + { + LLComboBox* combo_box = getChild( + "DayCyclePresetsCombo"); + LLFloaterDayCycle* day_cycle = NULL; + LLComboBox* key_combo = NULL; + LLMultiSliderCtrl* mult_sldr = NULL; + + if(LLFloaterDayCycle::isOpen()) + { + day_cycle = LLFloaterDayCycle::instance(); + key_combo = day_cycle->getChild( + "WLKeyPresets"); + mult_sldr = day_cycle->getChild("WLDayCycleKeys"); + } + + std::string name(combo_box->getSelectedValue().asString()); + + // check to see if it's a default and shouldn't be deleted + + if(LLDayCycleManager::getInstance()->isSystemPreset(name)) + { + LLNotificationsUtil::add("WLNoEditDefault"); + return false; + } + + LLDayCycleManager::getInstance()->deletePreset(name); + + // remove and choose another + S32 new_index = combo_box->getCurrentIndex(); + + combo_box->remove(name); + if(key_combo != NULL) + { + key_combo->remove(name); + + // remove from slider, as well + day_cycle->deletePreset(name); + } + + // pick the previously selected index after delete + if(new_index > 0) + { + new_index--; + } + + if(combo_box->getItemCount() > 0) + { + combo_box->setCurrentByIndex(new_index); + } + } + return false; +} + +bool LLFloaterDayCycle::newPromptCallback(const LLSD& notification, const LLSD& response) +{ + std::string text = response["message"].asString(); + S32 option = LLNotification::getSelectedOption(notification, response); + + if(text == "") + { + return false; + } + + if(option == 0) { + LLComboBox* comboBox = sDayCycle->getChild("DayCyclePresetsCombo"); + + LLFloaterDayCycle* sDayCycle = NULL; + LLComboBox* keyCombo = NULL; + if(LLFloaterDayCycle::isOpen()) + { + sDayCycle = LLFloaterDayCycle::instance(); + keyCombo = sDayCycle->getChild("WLKeyPresets"); + } + + + // add the current parameters to the list + // see if it's there first + // if not there, add a new one + if(LLDayCycleManager::getInstance()->findPreset(text).empty()) + { + //AscentDayCycleManager::instance()->addParamSet(text, + // AscentDayCycleManager::instance()->mCurParams); + + LLDayCycleManager::getInstance()->savePreset(text, + LLWLParamManager::getInstance()->mDay.asLLSD()); + + comboBox->add(text); + comboBox->sortByName(); + + // add a blank to the bottom + comboBox->selectFirstItem(); + if(comboBox->getSimple() == "") + { + comboBox->remove(0); + } + comboBox->add(LLStringUtil::null); + + comboBox->setSelectedByValue(text, true); + if(LLFloaterDayCycle::isOpen()) + { + keyCombo->add(text); + keyCombo->sortByName(); + } + } + else // otherwise, send a message to the user + { + LLNotificationsUtil::add("ExistsSkyPresetAlert"); + } + } + return false; +} + + +void LLFloaterDayCycle::onChangePresetName(LLUICtrl* ctrl, void * userData) +{ + LLComboBox * combo_box = static_cast(ctrl); + + if(combo_box->getSimple() == "") + { + return; + } + + LLEnvManagerNew::getInstance()->useDayCycle(combo_box->getSelectedValue().asString(), LLEnvKey::SCOPE_LOCAL); + + gSavedSettings.setString("AscentActiveDayCycle", combo_box->getSelectedValue().asString()); + // sync it all up + syncSliderTrack(); + syncMenu(); + + // set the param manager's track to the new one + LLMultiSliderCtrl* tSldr; + tSldr = sDayCycle->getChild("WLTimeSlider"); + LLWLParamManager::getInstance()->resetAnimator(tSldr->getCurSliderValue() / sHoursPerDay, false); + + // and draw it + LLWLParamManager::getInstance()->mAnimator.update(LLWLParamManager::getInstance()->mCurParams); +} + + void LLFloaterDayCycle::onRunAnimSky(void* userData) { // if no keys, do nothing - if(sSliderToKey.size() == 0) + if(sSliderToKey.size() == 0) { return; } @@ -315,32 +551,6 @@ void LLFloaterDayCycle::onUseLindenTime(void* userData) LLEnvManagerNew::instance().setUseDayCycle(LLEnvManagerNew::instance().getDayCycleName()); } -void LLFloaterDayCycle::onLoadDayCycle(void* userData) -{ - LLWLParamManager::getInstance()->mDay.loadDayCycleFromFile("Default.xml"); - - // sync it all up - syncSliderTrack(); - syncMenu(); - - // set the param manager's track to the new one - LLMultiSliderCtrl* tSldr; - tSldr = sDayCycle->getChild( - "WLTimeSlider"); - LLWLParamManager::getInstance()->resetAnimator( - tSldr->getCurSliderValue() / sHoursPerDay, false); - - // and draw it - LLWLParamManager::getInstance()->mAnimator.update( - LLWLParamManager::getInstance()->mCurParams); -} - -void LLFloaterDayCycle::onSaveDayCycle(void* userData) -{ - LLWLParamManager::getInstance()->mDay.saveDayCycle("Default.xml"); -} - - void LLFloaterDayCycle::onTimeSliderMoved(LLUICtrl* ctrl, void* userData) { LLMultiSliderCtrl* sldr = sDayCycle->getChild( diff --git a/indra/newview/llfloaterdaycycle.h b/indra/newview/llfloaterdaycycle.h index d23003554..9adfc3a02 100644 --- a/indra/newview/llfloaterdaycycle.h +++ b/indra/newview/llfloaterdaycycle.h @@ -99,11 +99,25 @@ public: /// delete a key frame static void onDeleteKey(void* userData); - /// button to load day - static void onLoadDayCycle(void* userData); + /// when user hits the load preset button + static void onNewPreset(void* userData); - /// button to save day - static void onSaveDayCycle(void* userData); + /// when user hits the save preset button + static void onSavePreset(void* userData); + + /// prompts a user when overwriting a preset + static bool saveAlertCallback(const LLSD& notification, const LLSD& response); + + /// when user hits the save preset button + static void onDeletePreset(void* userData); + + /// prompts a user when overwriting a preset + bool deleteAlertCallback(const LLSD& notification, const LLSD& response); + + static bool newPromptCallback(const LLSD& notification, const LLSD& response); + + /// what to do when you change the preset name + static void onChangePresetName(LLUICtrl* ctrl, void* userData); /// toggle for Linden time static void onUseLindenTime(void* userData); diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index 842f10fd6..ed2349717 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -1938,7 +1938,7 @@ void LLFloaterIMPanel::onClickHistory( void* userdata ) //std::string fullname(gDirUtilp->getScrubbedFileName(self->getTitle())); std::string fullname(gDirUtilp->getScrubbedFileName(self->mSessionLabel)); // [/Ansariel: Display name support] - sprintf(command, "\"%s\\%s.txt\"", gDirUtilp->getPerAccountChatLogsDir().c_str(),fullname.c_str()); + sprintf(command, "\"%s%s%s.txt\"", gDirUtilp->getPerAccountChatLogsDir().c_str(), gDirUtilp->getDirDelimiter().c_str(), fullname.c_str()); gViewerWindow->getWindow()->ShellEx(command); llinfos << command << llendl; diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp index 74bb12058..5e855e144 100644 --- a/indra/newview/llinventorymodelbackgroundfetch.cpp +++ b/indra/newview/llinventorymodelbackgroundfetch.cpp @@ -184,10 +184,17 @@ void LLInventoryModelBackgroundFetch::backgroundFetchCB(void *) //static void LLInventoryModelBackgroundFetch::backgroundFetch() { + LLViewerRegion* region = gAgent.getRegion(); + if (!region) + { + return; + } + if (mBackgroundFetchActive && gAgent.getRegion()) { // If we'll be using the capability, we'll be sending batches and the background thing isn't as important. - if (gSavedSettings.getBOOL("UseHTTPInventory")) + std::string url = region->getCapability("FetchInventory2"); + if (gSavedSettings.getBOOL("UseHTTPInventory") && !url.empty()) { bulkFetch(); return; diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 1adccc92b..43fa98fbd 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -345,6 +345,11 @@ BOOL LLMediaCtrl::postBuild () return true; } +void LLMediaCtrl::onOpenWebInspector() +{ + if (mMediaSource && mMediaSource->hasMedia()) + mMediaSource->getMediaPlugin()->showWebInspector( true ); +} //////////////////////////////////////////////////////////////////////////////// // BOOL LLMediaCtrl::handleKeyHere( KEY key, MASK mask ) @@ -947,6 +952,12 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) }; break; + case MEDIA_EVENT_NAVIGATE_ERROR_PAGE: + { + LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_NAVIGATE_ERROR_PAGE" << LL_ENDL; + }; + break; + case MEDIA_EVENT_CLICK_LINK_HREF: { LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_CLICK_LINK_HREF, target is \"" << self->getClickTarget() << "\", uri is " << self->getClickURL() << LL_ENDL; @@ -978,31 +989,25 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_NAME_CHANGED" << LL_ENDL; }; break; - - case MEDIA_EVENT_NAVIGATE_ERROR_PAGE: - { - LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_NAVIGATE_ERROR_PAGE" << LL_ENDL; - }; - break; - + case MEDIA_EVENT_CLOSE_REQUEST: { LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_CLOSE_REQUEST" << LL_ENDL; }; break; - + case MEDIA_EVENT_PICK_FILE_REQUEST: { LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_PICK_FILE_REQUEST" << LL_ENDL; }; break; - + case MEDIA_EVENT_GEOMETRY_CHANGE: { LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_GEOMETRY_CHANGE" << LL_ENDL; }; break; - + case MEDIA_EVENT_AUTH_REQUEST: { LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_AUTH_REQUEST" << LL_ENDL; @@ -1014,6 +1019,12 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_LINK_HOVERED" << LL_ENDL; }; break; + + case MEDIA_EVENT_DEBUG_MESSAGE: + { + LL_INFOS("media") << self->getDebugMessageText() << LL_ENDL; + }; + break; default: { diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index 341ea1407..602a1f153 100644 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -144,8 +144,12 @@ class LLMediaCtrl : // handlers for individual events (could be done inside the switch in handleMediaEvent, they're just individual functions for clarity) void onClickLinkHref( LLPluginClassMedia* self ); + void onClickLinkNoFollow( LLPluginClassMedia* self ); - + + // right click debugging item + void onOpenWebInspector(); + protected: void convertInputCoords(S32& x, S32& y); diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index e949460c5..13949eee4 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -1613,12 +1613,14 @@ void LLMeshUploadThread::doWholeModelUpload() LLSD body = full_model_data["asset_resources"]; dump_llsd_to_file(body,make_dump_name("whole_model_body_",dump_num)); LLCurlRequest::headers_t headers; - //FIXME: this might throw AICurlNoEasyHandle + // This might throw AICurlNoEasyHandle. mCurlRequest->post(mWholeModelUploadURL, headers, body, new LLWholeModelUploadResponder(this, full_model_data, mUploadObserverHandle), mMeshUploadTimeOut); do { - mCurlRequest->process(); + mCurlRequest->process(); // FIXME: This function does not exist anymore. The post() gets CPU time from AICurlEasyRequestStateMachine. + // Therefore, if we do not want to continue here unless this upload is done... no wait, that would + // be blocking and we don't want blocking... //sleep for 10ms to prevent eating a whole core apr_sleep(10000); } while (mCurlRequest->getQueued() > 0); @@ -1645,7 +1647,7 @@ void LLMeshUploadThread::requestWholeModelFee() mPendingUploads++; LLCurlRequest::headers_t headers; - //FIXME: this might throw AICurlNoEasyHandle + // This might throw AICurlNoEasyHandle. mCurlRequest->post(mWholeModelFeeCapability, headers, model_data, new LLWholeModelFeeResponder(this,model_data, mFeeObserverHandle), mMeshUploadTimeOut); diff --git a/indra/newview/llmimetypes.cpp b/indra/newview/llmimetypes.cpp index c45e0abf5..3825c2bcb 100644 --- a/indra/newview/llmimetypes.cpp +++ b/indra/newview/llmimetypes.cpp @@ -34,6 +34,7 @@ #include "llviewerprecompiledheaders.h" #include "llmimetypes.h" +#include "lltrans.h" #include "lluictrlfactory.h" @@ -48,6 +49,7 @@ std::string sDefaultImpl; // Returned when we don't know what impl to use std::string sXMLFilename; // Squirrel away XML filename so we know how to reset +std::string DEFAULT_MIME_TYPE = "none/none"; ///////////////////////////////////////////////////////////////////////////// @@ -229,7 +231,7 @@ std::string LLMIMETypes::findIcon(const std::string& mime_type) // static std::string LLMIMETypes::findDefaultMimeType(const std::string& widget_type) { - std::string mime_type = "none/none"; + std::string mime_type = getDefaultMimeType(); mime_widget_set_map_t::iterator it = sWidgetMap.find(widget_type); if(it != sWidgetMap.end()) { @@ -238,6 +240,18 @@ std::string LLMIMETypes::findDefaultMimeType(const std::string& widget_type) return mime_type; } +// static +const std::string& LLMIMETypes::getDefaultMimeType() +{ + return DEFAULT_MIME_TYPE; +} + +const std::string& LLMIMETypes::getDefaultMimeTypeTranslation() +{ + static std::string mime_type = LLTrans::getString("DefaultMimeType"); + return mime_type; +} + // static std::string LLMIMETypes::findToolTip(const std::string& mime_type) { diff --git a/indra/newview/llmimetypes.h b/indra/newview/llmimetypes.h index b217ce7a8..3461769ff 100644 --- a/indra/newview/llmimetypes.h +++ b/indra/newview/llmimetypes.h @@ -66,6 +66,10 @@ public: static std::string findDefaultMimeType(const std::string& widget_type); // Canonical mime type associated with this widget set + static const std::string& getDefaultMimeType(); + + static const std::string& getDefaultMimeTypeTranslation(); + static bool findAllowResize(const std::string& mime_type); // accessor for flag to enable/disable media size edit fields diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp index 752e9be35..efeb7c557 100644 --- a/indra/newview/llmutelist.cpp +++ b/indra/newview/llmutelist.cpp @@ -688,6 +688,12 @@ BOOL LLMuteList::isMuted(const LLUUID& id, const std::string& name, U32 flags) c // don't need name or type for lookup LLMute mute(id_to_check); + // Can't mute self. + if (mute.mID == gAgent.getID() && !mute_object) + { + getInstance()->remove(mute); + return false; + } mute_set_t::const_iterator mute_it = mMutes.find(mute); if (mute_it != mMutes.end()) { diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index 4e922cc34..6d21cab60 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -85,6 +85,7 @@ #include "lluictrlfactory.h" #include "llviewermenu.h" #include "llavatarnamecache.h" +#include "lldroptarget.h" #include @@ -105,68 +106,6 @@ extern void callback_invite_to_group(LLUUID group_id, void *user_data); extern void handle_lure(const LLUUID& invitee); extern void handle_pay_by_id(const LLUUID& payee); -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// Class LLDropTarget -// -// This handy class is a simple way to drop something on another -// view. It handles drop events, always setting itself to the size of -// its parent. -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -class LLDropTarget : public LLView -{ -public: - LLDropTarget(const std::string& name, const LLRect& rect, const LLUUID& agent_id); - ~LLDropTarget(); - - void doDrop(EDragAndDropType cargo_type, void* cargo_data); - - // - // LLView functionality - virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, - EDragAndDropType cargo_type, - void* cargo_data, - EAcceptance* accept, - std::string& tooltip_msg); - void setAgentID(const LLUUID &agent_id) { mAgentID = agent_id; } -protected: - LLUUID mAgentID; -}; - - -LLDropTarget::LLDropTarget(const std::string& name, const LLRect& rect, - const LLUUID& agent_id) : - LLView(name, rect, NOT_MOUSE_OPAQUE, FOLLOWS_ALL), - mAgentID(agent_id) -{ -} - -LLDropTarget::~LLDropTarget() -{ -} - -void LLDropTarget::doDrop(EDragAndDropType cargo_type, void* cargo_data) -{ - llinfos << "LLDropTarget::doDrop()" << llendl; -} - -BOOL LLDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, - EDragAndDropType cargo_type, - void* cargo_data, - EAcceptance* accept, - std::string& tooltip_msg) -{ - if(getParent()) - { - LLToolDragAndDrop::handleGiveDragAndDrop(mAgentID, LLUUID::null, drop, - cargo_type, cargo_data, accept); - - return TRUE; - } - - return FALSE; -} - //----------------------------------------------------------------------------- // LLPanelAvatarTab() diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp index bfa43822c..2156a8120 100644 --- a/indra/newview/llpaneleditwearable.cpp +++ b/indra/newview/llpaneleditwearable.cpp @@ -737,7 +737,7 @@ BOOL LLPanelEditWearable::postBuild() { llinfos << "Finding button " << subpart_entry->mButtonName << llendl; llassert_always(getChild(subpart_entry->mButtonName,true,false)); - childSetAction(subpart_entry->mButtonName, &LLPanelEditWearable::onBtnSubpart, (void*)index); + childSetAction(subpart_entry->mButtonName, &LLPanelEditWearable::onBtnSubpart, reinterpret_cast(index)); } } // initialize texture and color picker controls diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp index bd8cf5551..35f405340 100644 --- a/indra/newview/llpanelgroupinvite.cpp +++ b/indra/newview/llpanelgroupinvite.cpp @@ -392,27 +392,9 @@ void LLPanelGroupInvite::addUsers(std::vector& agent_ids) std::vector names; for (S32 i = 0; i < (S32)agent_ids.size(); i++) { - LLUUID agent_id = agent_ids[i]; - LLVOAvatar* avatarp = gObjectList.findAvatar(agent_id); - if(avatarp) - { - std::string fullname; - LLNameValue* nvfirst = avatarp->getNVPair("FirstName"); - LLNameValue* nvlast = avatarp->getNVPair("LastName"); - if(nvfirst && nvlast) - { - fullname = std::string(nvfirst->getString()) + " " + std::string(nvlast->getString()); - } - if (!fullname.empty()) - { - names.push_back(fullname); - } - else - { - llwarns << "llPanelGroupInvite: Selected avatar has no name: " << avatarp->getID() << llendl; - names.push_back("(Unknown)"); - } - } + std::string name; + if(gCacheName->getFullName(agent_ids[i], name)) + names.push_back(name); } mImplementation->addUsers(names, agent_ids); } diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index d2cbb0ca2..097d0fda6 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -858,12 +858,15 @@ void LLInventoryView::updateItemcountText() { std::ostringstream title; title << "Inventory"; - if (LLInventoryModelBackgroundFetch::instance().folderFetchActive()) + if (LLInventoryModelBackgroundFetch::instance().folderFetchActive() || LLInventoryModelBackgroundFetch::instance().isEverythingFetched()) { LLLocale locale(LLLocale::USER_LOCALE); std::string item_count_string; LLResMgr::getInstance()->getIntegerString(item_count_string, gInventory.getItemCount()); - title << " (Fetched " << item_count_string << " items...)"; + if(LLInventoryModelBackgroundFetch::instance().folderFetchActive()) + title << " (Fetched " << item_count_string << " items...)"; + else + title << " ("<< item_count_string << " items)"; } title << mFilterText; setTitle(title.str()); diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 8cad1d048..223b6cf80 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -5651,7 +5651,7 @@ void LLSelectNode::renderOneWireframe(const LLColor4& color) if (shader) { - gHighlightProgram.bind(); + gDebugProgram.bind(); } gGL.matrixMode(LLRender::MM_MODELVIEW); diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp index d8e477fa4..39c610ce0 100644 --- a/indra/newview/lltexturecache.cpp +++ b/indra/newview/lltexturecache.cpp @@ -873,7 +873,7 @@ BOOL LLTextureCache::isInLocal(const LLUUID& id) //static const S32 MAX_REASONABLE_FILE_SIZE = 512*1024*1024; // 512 MB -F32 LLTextureCache::sHeaderCacheVersion = 1.5f; +F32 LLTextureCache::sHeaderCacheVersion = 1.6f; U32 LLTextureCache::sCacheMaxEntries = MAX_REASONABLE_FILE_SIZE / TEXTURE_CACHE_ENTRY_SIZE; S64 LLTextureCache::sCacheMaxTexturesSize = 0; // no limit const char* entries_filename = "texture.entries"; diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 4e6e42402..a9f31ca0f 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -2364,14 +2364,6 @@ void LLTextureFetch::commonUpdate() // Run a cross-thread command, if any. cmdDoWork(); #endif - - // Update Curl on same thread as mCurlGetRequest was constructed - llassert_always(mCurlGetRequest); - S32 processed = mCurlGetRequest->process(); - if (processed > 0) - { - lldebugs << "processed: " << processed << " messages." << llendl; - } } diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 3cf07d8a3..3447341f6 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -1035,7 +1035,14 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj, } } // Add the texture item to the target object's inventory. - hit_obj->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, true); + if (LLAssetType::AT_TEXTURE == new_item->getType()) + { + hit_obj->updateTextureInventory(new_item, TASK_INVENTORY_ITEM_KEY, true); + } + else + { + hit_obj->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, true); + } // TODO: Check to see if adding the item was successful; if not, then // we should return false here. } @@ -1050,7 +1057,14 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj, // *FIX: may want to make sure agent can paint hit_obj. // Add the texture item to the target object's inventory. - hit_obj->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, true); + if (LLAssetType::AT_TEXTURE == new_item->getType()) + { + hit_obj->updateTextureInventory(new_item, TASK_INVENTORY_ITEM_KEY, true); + } + else + { + hit_obj->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, true); + } // Force the object to update its refetch its inventory so it has this texture. hit_obj->fetchInventoryFromServer(); // TODO: Check to see if adding the item was successful; if not, then diff --git a/indra/newview/lltoolplacer.cpp b/indra/newview/lltoolplacer.cpp index 6980c8b3b..f9b5e4541 100644 --- a/indra/newview/lltoolplacer.cpp +++ b/indra/newview/lltoolplacer.cpp @@ -72,6 +72,7 @@ #include "llparcel.h" // always rez #include "llviewerparcelmgr.h" // always rez // +#include "importtracker.h" // [RLVa:KB] #include "rlvhandler.h" @@ -222,8 +223,19 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics ) // Set params for new object based on its PCode. LLQuaternion rotation; - LLVector3 scale = DEFAULT_OBJECT_SCALE; + LLVector3 scale = LLVector3( + gSavedSettings.getF32("BuildPrefs_Xsize"), + gSavedSettings.getF32("BuildPrefs_Ysize"), + gSavedSettings.getF32("BuildPrefs_Zsize")); + U8 material = LL_MCODE_WOOD; + if(gSavedSettings.getString("BuildPrefs_Material")== "Stone") material = LL_MCODE_STONE; + else if(gSavedSettings.getString("BuildPrefs_Material")== "Metal") material = LL_MCODE_METAL; + //if(gSavedSettings.getString("BuildPrefs_Material")== "Wood") material = LL_MCODE_WOOD; redundant + else if(gSavedSettings.getString("BuildPrefs_Material")== "Flesh") material = LL_MCODE_FLESH; + else if(gSavedSettings.getString("BuildPrefs_Material")== "Rubber") material = LL_MCODE_RUBBER; + else if(gSavedSettings.getString("BuildPrefs_Material")== "Plastic") material = LL_MCODE_PLASTIC; + BOOL create_selected = FALSE; LLVolumeParams volume_params; @@ -465,7 +477,8 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics ) // Pack in name value pairs gMessageSystem->sendReliable(regionp->getHost()); - + //Actually call expectRez so that importtracker can do its thing + gImportTracker.expectRez(); // Spawns a message, so must be after above send if (create_selected) { diff --git a/indra/newview/lluserauth.cpp b/indra/newview/lluserauth.cpp index f558a3170..f2f928850 100644 --- a/indra/newview/lluserauth.cpp +++ b/indra/newview/lluserauth.cpp @@ -270,7 +270,7 @@ LLUserAuth::UserAuthcode LLUserAuth::authResponse() return mAuthResponse; } - bool done = mTransaction->process(); + bool done = mTransaction->is_finished(); if (!done) { if (LLXMLRPCTransaction::StatusDownloading == mTransaction->status(0)) diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp index ca75c71e8..e46058591 100644 --- a/indra/newview/llvieweraudio.cpp +++ b/indra/newview/llvieweraudio.cpp @@ -271,9 +271,14 @@ void audio_update_wind(bool force_update) // which is sufficient to completely turn off or turn on wind noise volume_delta = 1.f; } - + // mute wind entirely when the user asked + if (gSavedSettings.getBOOL("MuteWind")) + { + // volume decreases by itself + gAudiop->mMaxWindGain -= gAudiop->mMaxWindGain; + } // mute wind when not /*flying*/ in air - if /*(gAgent.getFlying())*/ (gAgentAvatarp && gAgentAvatarp->mInAir) + else if /*(gAgent.getFlying())*/ (gAgentAvatarp && gAgentAvatarp->mInAir) { // volume increases by volume_delta, up to no more than max_wind_volume gAudiop->mMaxWindGain = llmin(gAudiop->mMaxWindGain + volume_delta, max_wind_volume); diff --git a/indra/newview/llviewerbuild.h b/indra/newview/llviewerbuild.h old mode 100755 new mode 100644 diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index adadcd799..6440652ef 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -377,8 +377,12 @@ static bool handleAudioStreamMusicChanged(const LLSD& newvalue) static bool handleUseOcclusionChanged(const LLSD& newvalue) { - LLPipeline::sUseOcclusion = (newvalue.asBoolean() && gGLManager.mHasOcclusionQuery - && LLFeatureManager::getInstance()->isFeatureAvailable("UseOcclusion") && !gUseWireframe) ? 2 : 0; + LLPipeline::sUseOcclusion = + (!gUseWireframe + && LLGLSLShader::sNoFixedFunction + && LLFeatureManager::getInstance()->isFeatureAvailable("UseOcclusion") + && newvalue.asBoolean() + && gGLManager.mHasOcclusionQuery) ? 2 : 0; return true; } diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 727e19578..56f0403e9 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -411,7 +411,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ media_source->setLanguageCode(LLUI::getLanguage()); // collect 'cookies enabled' setting from prefs and send to embedded browser - bool cookies_enabled = gSavedSettings.getBOOL( "BrowserCookiesEnabled" ); + bool cookies_enabled = gSavedSettings.getBOOL( "CookiesEnabled" ); media_source->enable_cookies( cookies_enabled ); // collect 'plugins enabled' setting from prefs and send to embedded browser @@ -421,8 +421,12 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ // collect 'javascript enabled' setting from prefs and send to embedded browser bool javascript_enabled = gSavedSettings.getBOOL( "BrowserJavascriptEnabled" ); media_source->setJavascriptEnabled( javascript_enabled ); + + bool media_plugin_debugging_enabled = gSavedSettings.getBOOL("MediaPluginDebugging"); + media_source->enableMediaPluginDebugging( media_plugin_debugging_enabled ); - if (media_source->init(launcher_name, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins"))) + const std::string plugin_dir = gDirUtilp->getLLPluginDir(); + if (media_source->init(launcher_name, plugin_dir, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins"))) { return media_source; } @@ -433,8 +437,8 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ } } } - - LL_WARNS("Plugin") << "plugin intialization failed for mime type: " << media_type << LL_ENDL; + + LL_WARNS_ONCE("Plugin") << "plugin initialization failed for mime type: " << media_type << LL_ENDL; LLSD args; args["MIME_TYPE"] = media_type; LLNotificationsUtil::add("NoPlugin", args); @@ -467,8 +471,21 @@ bool LLViewerMediaImpl::initializePlugin(const std::string& media_type) media_source->setLoop(mMediaLoop); media_source->setAutoScale(mMediaAutoScale); media_source->setBrowserUserAgent(LLViewerMedia::getCurrentUserAgent()); - + + if(gSavedSettings.getBOOL("BrowserIgnoreSSLCertErrors")) + { + media_source->ignore_ssl_cert_errors(true); + } + + // the correct way to deal with certs it to load ours from CA.pem and append them to the ones + // Qt/WebKit loads from your system location. + // Note: This needs the new CA.pem file with the Equifax Secure Certificate Authority + // cert at the bottom: (MIIDIDCCAomgAwIBAgIENd70zzANBg) + std::string ca_path = gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "CA.pem" ); + media_source->addCertificateFilePath( ca_path ); + mPluginBase = media_source; + return true; } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index d30b40ff8..00ec70cd1 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2261,7 +2261,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) position, false); } - LLGiveInventory::doGiveInventoryItem(from_id, item); + LLGiveInventory::doGiveInventoryItem(from_id, item, computed_session_id); } } } @@ -4754,8 +4754,6 @@ void process_kill_object(LLMessageSystem *mesgsys, void **user_data) LL_DEBUGS("Messaging") << "Kill message for local " << local_id << LL_ENDL; } - LLSelectMgr::getInstance()->removeObjectFromSelections(id); - // ...don't kill the avatar if (!(id == gAgentID)) { @@ -4785,6 +4783,12 @@ void process_kill_object(LLMessageSystem *mesgsys, void **user_data) gObjectList.mNumUnknownKills++; } } + + // We should remove the object from selection after it is marked dead by gObjectList to make LLToolGrab, + // which is using the object, release the mouse capture correctly when the object dies. + // See LLToolGrab::handleHoverActive() and LLToolGrab::handleHoverNonPhysical(). + LLSelectMgr::getInstance()->removeObjectFromSelections(id); + } } diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index ff8edd698..54ed9ac8d 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2874,6 +2874,23 @@ void LLViewerObject::processTaskInvFile(void** user_data, S32 error_code, LLExtS (object = gObjectList.findObject(ft->mTaskID))) { object->loadTaskInvFile(ft->mFilename); + + LLInventoryObject::object_list_t::iterator it = object->mInventory->begin(); + LLInventoryObject::object_list_t::iterator end = object->mInventory->end(); + std::list& pending_lst = object->mPendingInventoryItemsIDs; + + for (; it != end && pending_lst.size(); ++it) + { + LLViewerInventoryItem* item = dynamic_cast(it->get()); + if(item && item->getType() != LLAssetType::AT_CATEGORY) + { + std::list::iterator id_it = std::find(pending_lst.begin(), pending_lst.begin(), item->getAssetUUID()); + if (id_it != pending_lst.end()) + { + pending_lst.erase(id_it); + } + } + } } else { @@ -2984,6 +3001,33 @@ void LLViewerObject::removeInventory(const LLUUID& item_id) //gBuildView->refresh(); } +bool LLViewerObject::isTextureInInventory(LLViewerInventoryItem* item) +{ + bool result = false; + + if (item && LLAssetType::AT_TEXTURE == item->getType()) + { + std::list::iterator begin = mPendingInventoryItemsIDs.begin(); + std::list::iterator end = mPendingInventoryItemsIDs.end(); + + bool is_fetching = std::find(begin, end, item->getAssetUUID()) != end; + bool is_fetched = getInventoryItemByAsset(item->getAssetUUID()) != NULL; + + result = is_fetched || is_fetching; + } + + return result; +} + +void LLViewerObject::updateTextureInventory(LLViewerInventoryItem* item, U8 key, bool is_new) +{ + if (item && !isTextureInInventory(item)) + { + mPendingInventoryItemsIDs.push_back(item->getAssetUUID()); + updateInventory(item, key, is_new); + } +} + void LLViewerObject::updateInventory( LLViewerInventoryItem* item, U8 key, @@ -4867,9 +4911,11 @@ void LLViewerObject::deleteParticleSource() // virtual void LLViewerObject::updateDrawable(BOOL force_damped) { - if (mDrawable.notNull() && - !mDrawable->isState(LLDrawable::ON_MOVE_LIST) && - isChanged(MOVED)) + if (!isChanged(MOVED)) + { //most common case, having an empty if case here makes for better branch prediction + } + else if (mDrawable.notNull() && + !mDrawable->isState(LLDrawable::ON_MOVE_LIST)) { BOOL damped_motion = !isChanged(SHIFTED) && // not shifted between regions this frame and... diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index c2bfb674d..403b27490 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -444,12 +444,15 @@ public: // manager until we have better iterators. void updateInventory(LLViewerInventoryItem* item, U8 key, bool is_new); void updateInventoryLocal(LLInventoryItem* item, U8 key); // Update without messaging. + void updateTextureInventory(LLViewerInventoryItem* item, U8 key, bool is_new); LLInventoryObject* getInventoryObject(const LLUUID& item_id); void getInventoryContents(LLInventoryObject::object_list_t& objects); LLInventoryObject* getInventoryRoot(); LLViewerInventoryItem* getInventoryItemByAsset(const LLUUID& asset_id); S16 getInventorySerial() const { return mInventorySerialNum; } + bool isTextureInInventory(LLViewerInventoryItem* item); + // These functions does viewer-side only object inventory modifications void updateViewerInventoryAsset( const LLViewerInventoryItem* item, @@ -698,6 +701,10 @@ protected: F32 mAppAngle; // Apparent visual arc in degrees F32 mPixelArea; // Apparent area in pixels + // IDs of of all items in the object's content which are added to the object's content, + // but not updated on the server yet. After item was updated, its ID will be removed from this list. + std::list mPendingInventoryItemsIDs; + // This is the object's inventory from the viewer's perspective. LLInventoryObject::object_list_t* mInventory; class LLInventoryCallbackInfo diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index edbc688d9..758a8c3e9 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -87,6 +87,9 @@ extern F32 gMinObjectDistance; extern BOOL gAnimateTextures; +#include "importtracker.h" +extern ImportTracker gImportTracker; + void dialog_refresh_all(); #define CULL_VIS @@ -271,6 +274,15 @@ void LLViewerObjectList::processUpdateCore(LLViewerObject* objectp, // so that the drawable parent is set properly findOrphans(objectp, msg->getSenderIP(), msg->getSenderPort()); + if(just_created && objectp && + (gImportTracker.getState() == ImportTracker::WAND /*|| + gImportTracker.getState() == ImportTracker::BUILDING*/) && + objectp->mCreateSelected && objectp->permYouOwner() && + objectp->permModify() && objectp->permCopy() && objectp->permTransfer()) + { + gImportTracker.get_update(objectp->mLocalID, just_created, objectp->mCreateSelected); + } + // If we're just wandering around, don't create new objects selected. if (just_created && update_type != OUT_TERSE_IMPROVED diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp index 7670c84e8..28756545c 100644 --- a/indra/newview/llviewerparcelmedia.cpp +++ b/indra/newview/llviewerparcelmedia.cpp @@ -34,6 +34,8 @@ #include "llviewerparcelmedia.h" #include "llagent.h" +#include "llaudioengine.h" +#include "llmimetypes.h" #include "llviewercontrol.h" #include "llviewermedia.h" #include "llviewerregion.h" @@ -323,12 +325,14 @@ LLViewerMediaImpl::EMediaStatus LLViewerParcelMedia::getStatus() // static std::string LLViewerParcelMedia::getMimeType() { - return sMediaImpl.notNull() ? sMediaImpl->getMimeType() : "none/none"; + return sMediaImpl.notNull() ? sMediaImpl->getMimeType() : LLMIMETypes::getDefaultMimeType(); } + viewer_media_t LLViewerParcelMedia::getParcelMedia() { return sMediaImpl; } + ////////////////////////////////////////////////////////////////////////////////////////// // static void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg, void ** ) @@ -478,6 +482,12 @@ void LLViewerParcelMedia::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent { switch(event) { + case MEDIA_EVENT_DEBUG_MESSAGE: + { + // LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_DEBUG_MESSAGE " << LL_ENDL; + }; + break; + case MEDIA_EVENT_CONTENT_UPDATED: { // LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_CONTENT_UPDATED " << LL_ENDL; @@ -532,6 +542,12 @@ void LLViewerParcelMedia::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent }; break; + case MEDIA_EVENT_NAVIGATE_ERROR_PAGE: + { + LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_NAVIGATE_ERROR_PAGE" << LL_ENDL; + }; + break; + case MEDIA_EVENT_CLICK_LINK_HREF: { LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_CLICK_LINK_HREF, target is \"" << self->getClickTarget() << "\", uri is " << self->getClickURL() << LL_ENDL; @@ -562,18 +578,12 @@ void LLViewerParcelMedia::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent }; break; - case MEDIA_EVENT_NAVIGATE_ERROR_PAGE: - { - LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_NAVIGATE_ERROR_PAGE" << LL_ENDL; - }; - break; - case MEDIA_EVENT_CLOSE_REQUEST: { LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_CLOSE_REQUEST" << LL_ENDL; }; break; - + case MEDIA_EVENT_PICK_FILE_REQUEST: { LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_PICK_FILE_REQUEST" << LL_ENDL; @@ -582,10 +592,10 @@ void LLViewerParcelMedia::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent case MEDIA_EVENT_GEOMETRY_CHANGE: { - LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_GEOMETRY_CHANGE" << LL_ENDL; + LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_GEOMETRY_CHANGE" << LL_ENDL; }; break; - + case MEDIA_EVENT_AUTH_REQUEST: { LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_AUTH_REQUEST" << LL_ENDL; @@ -597,7 +607,7 @@ void LLViewerParcelMedia::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_LINK_HOVERED" << LL_ENDL; }; break; - + default: { LL_WARNS("Media") << "Media event: unknown event type" << LL_ENDL; diff --git a/indra/newview/llviewerpluginmanager.h b/indra/newview/llviewerpluginmanager.h index 6525a5403..e10a56728 100644 --- a/indra/newview/llviewerpluginmanager.h +++ b/indra/newview/llviewerpluginmanager.h @@ -77,7 +77,8 @@ LLPluginClassBasic* LLViewerPluginManager::createPlugin(T* user_data) { // Always delete the old plugin first. destroyPlugin(); - + + std::string plugin_dir = gDirUtilp->getLLPluginDir(); std::string plugin_name = gDirUtilp->getLLPluginFilename(PLUGIN_TYPE::plugin_basename()); // See if the plugin executable exists. @@ -93,7 +94,7 @@ LLPluginClassBasic* LLViewerPluginManager::createPlugin(T* user_data) else { LLPluginClassBasic* plugin = new PLUGIN_TYPE(user_data); - if (plugin->init(PLUGIN_TYPE::launcher_name(), plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins"))) + if (plugin->init(PLUGIN_TYPE::launcher_name(), plugin_dir, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins"))) { mPluginBase = plugin; } diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 273b69da1..833d6412d 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -4907,6 +4907,8 @@ void LLViewerWindow::restoreGL(const std::string& progress_message) void LLViewerWindow::initFonts(F32 zoom_factor) { + if(gGLManager.mIsDisabled) + return; LLFontGL::destroyAllGL(); // Initialize with possibly different zoom factor LLFontGL::initClass( gSavedSettings.getF32("FontScreenDPI"), diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index c639fb330..5c4d540ea 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -8504,7 +8504,7 @@ void LLVOAvatar::onBakedTextureMasksLoaded( BOOL success, LLViewerFetchedTexture { if (!aux_src->getData()) { - llerrs << "No auxiliary source data for onBakedTextureMasksLoaded" << llendl; + llwarns << "No auxiliary source data for onBakedTextureMasksLoaded" << llendl; return; } diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp index c5ceee40c..434c8ca64 100644 --- a/indra/newview/llvopartgroup.cpp +++ b/indra/newview/llvopartgroup.cpp @@ -62,28 +62,6 @@ S32* LLVOPartGroup::sVBSlotCursor = NULL; //static void LLVOPartGroup::restoreGL() { - //Just iterate over all particle faces and mark their vbo index as 'uninitialized' since sVBSlotFree & sVBSlotCursor will be clobbered. - for (int i=0; imDrawable) - { - if (obj->mDrawable->getRenderType() == LLPipeline::RENDER_TYPE_PARTICLES || - obj->mDrawable->getRenderType() == LLPipeline::RENDER_TYPE_HUD_PARTICLES -#if ENABLE_CLASSIC_CLOUDS - || obj->mDrawable->getRenderType() == LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS -#endif - ) - { - for (S32 j = 0; j < obj->mDrawable->getNumFaces(); ++j) - { - LLFace* facep = obj->mDrawable->getFace(j); - if(facep) - facep->setIndicesIndex(0xFFFFFFFF); - } - } - } - } for (S32 i = 0; i < LL_MAX_PARTICLE_COUNT; ++i) { sVBSlotFree[i] = i; @@ -142,6 +120,32 @@ void LLVOPartGroup::restoreGL() //static void LLVOPartGroup::destroyGL() { + //Just iterate over all particle faces and mark their vbo index as 'uninitialized' since sVBSlotFree & sVBSlotCursor will be clobbered. + for (int i=0; imDrawable) + { + if (obj->mDrawable->getRenderType() == LLPipeline::RENDER_TYPE_PARTICLES || + obj->mDrawable->getRenderType() == LLPipeline::RENDER_TYPE_HUD_PARTICLES +#if ENABLE_CLASSIC_CLOUDS + || obj->mDrawable->getRenderType() == LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS +#endif + ) + { + for (S32 j = 0; j < obj->mDrawable->getNumFaces(); ++j) + { + LLFace* facep = obj->mDrawable->getFace(j); + if(facep) + facep->setIndicesIndex(0xFFFFFFFF); + } + } + } + } + for (S32 i = 0; i < LL_MAX_PARTICLE_COUNT; ++i) + { + sVBSlotFree[i] = i; + } sVB = NULL; } diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 1d6167195..d8b34bd30 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1435,7 +1435,7 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable) return TRUE; // No update to complete } - if (mVolumeChanged || mFaceMappingChanged || mDrawable->isState(LLDrawable::REBUILD_MATERIAL)) + if (mVolumeChanged || mFaceMappingChanged) { dirtySpatialGroup(drawable->isState(LLDrawable::IN_REBUILD_Q1)); diff --git a/indra/newview/llvowater.cpp b/indra/newview/llvowater.cpp index 20294d0c3..05e033392 100644 --- a/indra/newview/llvowater.cpp +++ b/indra/newview/llvowater.cpp @@ -170,7 +170,8 @@ BOOL LLVOWater::updateGeometry(LLDrawable *drawable) static const unsigned int indices_per_quad = 6; static const LLCachedControl render_transparent_water("RenderTransparentWater",false); - const S32 size = (render_transparent_water && !LLGLSLShader::sNoFixedFunction) ? 16 : 1; + static const LLCachedControl water_subdiv("SianaVoidWaterSubdivision", 16); + const S32 size = (render_transparent_water && LLGLSLShader::sNoFixedFunction) ? water_subdiv : 1; const S32 num_quads = size * size; face->setSize(vertices_per_quad * num_quads, indices_per_quad * num_quads); diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp index 72ccfb936..b160e2c33 100644 --- a/indra/newview/llxmlrpctransaction.cpp +++ b/indra/newview/llxmlrpctransaction.cpp @@ -325,7 +325,16 @@ void LLXMLRPCTransaction::Impl::curlEasyRequestCallback(bool success) if (!success) { - setStatus(LLXMLRPCTransaction::StatusOtherError, "Statemachine failed"); + // AICurlEasyRequestStateMachine did abort. + // This currently only happens when libcurl didn't finish before the timer expired. + std::ostringstream msg; + F32 timeout_value = gSavedSettings.getF32("CurlRequestTimeOut"); + msg << "Connection to " << mURI << " timed out (" << timeout_value << " s)!"; + if (timeout_value < 40) + { + msg << "\nTry increasing CurlRequestTimeOut in Debug Settings."; + } + setStatus(LLXMLRPCTransaction::StatusOtherError, msg.str()); return; } @@ -470,12 +479,17 @@ void LLXMLRPCTransaction::Impl::setCurlStatus(CURLcode code) size_t LLXMLRPCTransaction::Impl::curlDownloadCallback( char* data, size_t size, size_t nmemb, void* user_data) { - DoutEntering(dc::curl, "LLXMLRPCTransaction::Impl::curlDownloadCallback(\"" << buf2str(data, size * nmemb) << "\", " << size << ", " << nmemb << ", " << user_data << ")"); - Impl& impl(*(Impl*)user_data); size_t n = size * nmemb; +#ifdef CWDEBUG + if (n < 80) + Dout(dc::curl, "Entering LLXMLRPCTransaction::Impl::curlDownloadCallback(\"" << buf2str(data, n) << "\", " << size << ", " << nmemb << ", " << user_data << ")"); + else + Dout(dc::curl, "Entering LLXMLRPCTransaction::Impl::curlDownloadCallback(\"" << buf2str(data, 40) << "\"...\"" << buf2str(data + n - 40, 40) << "\", " << size << ", " << nmemb << ", " << user_data << ")"); +#endif + impl.mResponseText.append(data, n); if (impl.mStatus == LLXMLRPCTransaction::StatusStarted) @@ -504,7 +518,7 @@ LLXMLRPCTransaction::~LLXMLRPCTransaction() delete &impl; } -bool LLXMLRPCTransaction::process() +bool LLXMLRPCTransaction::is_finished(void) const { return impl.is_finished(); } diff --git a/indra/newview/llxmlrpctransaction.h b/indra/newview/llxmlrpctransaction.h index 42c236265..6d70f8ff1 100644 --- a/indra/newview/llxmlrpctransaction.h +++ b/indra/newview/llxmlrpctransaction.h @@ -110,7 +110,7 @@ public: StatusOtherError } Status; - bool process(); + bool is_finished(void) const; // Returns true when done. Status status(int* curlCode); diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index babbedc5a..bd2424294 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -400,7 +400,7 @@ void LLPipeline::init() sDynamicLOD = gSavedSettings.getBOOL("RenderDynamicLOD"); sRenderBump = gSavedSettings.getBOOL("RenderObjectBump"); LLVertexBuffer::sUseStreamDraw = gSavedSettings.getBOOL("ShyotlRenderUseStreamVBO"); - LLVertexBuffer::sUseVAO = gSavedSettings.getBOOL("RenderUseVAO"); + LLVertexBuffer::sUseVAO = gSavedSettings.getBOOL("RenderUseVAO") && gSavedSettings.getBOOL("VertexShaderEnable"); //Temporary workaround for vaos being broken when shaders are off LLVertexBuffer::sPreferStreamDraw = gSavedSettings.getBOOL("RenderPreferStreamDraw"); sRenderAttachedLights = gSavedSettings.getBOOL("RenderAttachedLights"); sRenderAttachedParticles = gSavedSettings.getBOOL("RenderAttachedParticles"); @@ -457,9 +457,11 @@ void LLPipeline::init() { mCubeVB = ll_create_cube_vb(LLVertexBuffer::MAP_VERTEX, GL_STATIC_DRAW_ARB); } - - mDeferredVB = new LLVertexBuffer(DEFERRED_VB_MASK, 0); - mDeferredVB->allocateBuffer(8, 0, true); + if(mDeferredVB.isNull()) + { + mDeferredVB = new LLVertexBuffer(DEFERRED_VB_MASK, 0); + mDeferredVB->allocateBuffer(8, 0, true); + } setLightingDetail(-1); gSavedSettings.getControl("RenderAutoMaskAlphaDeferred")->getCommitSignal()->connect(boost::bind(&LLPipeline::refreshCachedSettings)); gSavedSettings.getControl("RenderAutoMaskAlphaNonDeferred")->getCommitSignal()->connect(boost::bind(&LLPipeline::refreshCachedSettings)); @@ -468,6 +470,7 @@ void LLPipeline::init() //gSavedSettings.getControl("RenderDelayVBUpdate")->getCommitSignal()->connect(boost::bind(&LLPipeline::refreshCachedSettings)); gSavedSettings.getControl("UseOcclusion")->getCommitSignal()->connect(boost::bind(&LLPipeline::refreshCachedSettings)); gSavedSettings.getControl("VertexShaderEnable")->getCommitSignal()->connect(boost::bind(&LLPipeline::refreshCachedSettings)); + gSavedSettings.getControl("RenderFSAASamples")->getCommitSignal()->connect(boost::bind(&LLPipeline::refreshCachedSettings)); } LLPipeline::~LLPipeline() @@ -2244,7 +2247,7 @@ void LLPipeline::markOccluder(LLSpatialGroup* group) void LLPipeline::doOcclusion(LLCamera& camera) { - if (LLPipeline::sUseOcclusion > 1 && sCull->hasOcclusionGroups()) + if (LLGLSLShader::sNoFixedFunction && LLPipeline::sUseOcclusion > 1 && sCull->hasOcclusionGroups()) { LLVertexBuffer::unbind(); @@ -2329,10 +2332,10 @@ void LLPipeline::updateGL() LLGLUpdate::sGLQ.pop_front(); } - { //seed VBO Pools + /*{ //seed VBO Pools LLFastTimer t(FTM_SEED_VBO_POOLS); LLVertexBuffer::seedPools(); - } + }*/ } void LLPipeline::rebuildPriorityGroups() @@ -6101,6 +6104,7 @@ void LLPipeline::doResetVertexBuffers() mResetVertexBuffers = false; mCubeVB = NULL; + mDeferredVB = NULL; for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); iter != LLWorld::getInstance()->getRegionList().end(); ++iter) @@ -6137,10 +6141,10 @@ void LLPipeline::doResetVertexBuffers() sRenderBump = gSavedSettings.getBOOL("RenderObjectBump"); LLVertexBuffer::sUseStreamDraw = gSavedSettings.getBOOL("ShyotlRenderUseStreamVBO"); - LLVertexBuffer::sUseVAO = gSavedSettings.getBOOL("RenderUseVAO"); + LLVertexBuffer::sUseVAO = gSavedSettings.getBOOL("RenderUseVAO") && gPipeline.canUseVertexShaders(); //Temporary workaround for vaos being broken when shaders are off LLVertexBuffer::sPreferStreamDraw = gSavedSettings.getBOOL("RenderPreferStreamDraw"); LLVertexBuffer::sEnableVBOs = gSavedSettings.getBOOL("RenderVBOEnable"); - LLVertexBuffer::sDisableVBOMapping = LLVertexBuffer::sEnableVBOs && gSavedSettings.getBOOL("RenderVBOMappingDisable") ; + LLVertexBuffer::sDisableVBOMapping = LLVertexBuffer::sEnableVBOs;// && gSavedSettings.getBOOL("RenderVBOMappingDisable") ; //Temporary workaround for vbo mapping being straight up broken sBakeSunlight = gSavedSettings.getBOOL("RenderBakeSunlight"); sNoAlpha = gSavedSettings.getBOOL("RenderNoAlpha"); LLPipeline::sTextureBindTest = gSavedSettings.getBOOL("RenderDebugTextureBind"); @@ -7240,6 +7244,11 @@ void LLPipeline::renderDeferredLighting() glh::matrix4f mat = glh_copy_matrix(gGLModelView); + if(mDeferredVB.isNull()) + { + mDeferredVB = new LLVertexBuffer(DEFERRED_VB_MASK, 0); + mDeferredVB->allocateBuffer(8, 0, true); + } LLStrider vert; mDeferredVB->getVertexStrider(vert); LLStrider tc0; diff --git a/indra/newview/rlvhandler.h b/indra/newview/rlvhandler.h index bb3edd5fd..685bf68ec 100644 --- a/indra/newview/rlvhandler.h +++ b/indra/newview/rlvhandler.h @@ -20,7 +20,7 @@ #include #include "rlvcommon.h" -#if LL_GNUC +#if LL_GNUC || LL_ICC || LL_CLANG #include "rlvhelper.h" // Needed to make GCC happy #endif // LL_GNUC diff --git a/indra/newview/skins/default/xui/en-us/floater_about.xml b/indra/newview/skins/default/xui/en-us/floater_about.xml index 0f35260c8..bd6044274 100644 --- a/indra/newview/skins/default/xui/en-us/floater_about.xml +++ b/indra/newview/skins/default/xui/en-us/floater_about.xml @@ -1,99 +1,61 @@ - - - -