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 690103bb7..330ecee48 100644 --- a/etc/message.xml +++ b/etc/message.xml @@ -378,14 +378,7 @@ true - ParcelMediaURLFilter - - flavor - llsd - trusted-sender - false - - + ParcelNavigateMedia flavor @@ -572,6 +565,14 @@ false + ObjectPhysicsProperties + + flavor + llsd + trusted-sender + true + + DisplayNameUpdate diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 8ba3b5367..e81965cc6 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -30,11 +30,11 @@ include(BuildVersion) include(UnixInstall) -set (GCC_DISABLE_FATAL_WARNINGS TRUE) +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 7ce670a36..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,38 +67,35 @@ 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- ) endif (MSVC80 OR MSVC90 OR MSVC10) # Are we using the crummy Visual Studio KDU build workaround? - if (NOT VS_DISABLE_FATAL_WARNINGS) + if (NOT DISABLE_FATAL_WARNINGS) add_definitions(/WX) - endif (NOT VS_DISABLE_FATAL_WARNINGS) + endif (NOT DISABLE_FATAL_WARNINGS) # Various libs are compiler specific, generate some variables here we can just use # when we require them instead of reimplementing the test each time. if (MSVC71) - set(MSVC_DIR 7.1) - set(MSVC_SUFFIX 71) - elseif (MSVC80) - set(MSVC_DIR 8.0) - set(MSVC_SUFFIX 80) - elseif (MSVC90) - set(MSVC_DIR 9.0) - set(MSVC_SUFFIX 90) - elseif (MSVC10) - set(MSVC_DIR 10.0) - set(MSVC_SUFFIX 100) - endif (MSVC71) + set(MSVC_DIR 7.1) + set(MSVC_SUFFIX 71) + elseif (MSVC80) + set(MSVC_DIR 8.0) + set(MSVC_SUFFIX 80) + elseif (MSVC90) + set(MSVC_DIR 9.0) + set(MSVC_SUFFIX 90) + elseif (MSVC10) + set(MSVC_DIR 10.0) + set(MSVC_SUFFIX 100) + endif (MSVC71) if (MSVC10) SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO") @@ -125,103 +111,157 @@ set (GCC_EXTRA_OPTIMIZATIONS "-ffast-math") if (LINUX) set(CMAKE_SKIP_RPATH TRUE) - # Here's a giant hack for Fedora 8, where we can't use - # _FORTIFY_SOURCE if we're using a compiler older than gcc 4.1. - - find_program(GXX g++) - mark_as_advanced(GXX) - - if (GXX) - execute_process( - COMMAND ${GXX} --version - COMMAND sed "s/^[gc+ ]*//" - COMMAND head -1 - OUTPUT_VARIABLE GXX_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - else (GXX) - set(GXX_VERSION x) - endif (GXX) - - # The quoting hack here is necessary in case we're using distcc or - # ccache as our compiler. CMake doesn't pass the command line - # through the shell by default, so we end up trying to run "distcc" - # " g++" - notice the leading space. Ugh. - - execute_process( - COMMAND sh -c "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} --version" - COMMAND sed "s/^[gc+ ]*//" - COMMAND head -1 - OUTPUT_VARIABLE CXX_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) - - if (${GXX_VERSION} STREQUAL ${CXX_VERSION}) - add_definitions(-D_FORTIFY_SOURCE=2) - else (${GXX_VERSION} STREQUAL ${CXX_VERSION}) - if (NOT ${GXX_VERSION} MATCHES " 4.1.*Red Hat") - add_definitions(-D_FORTIFY_SOURCE=2) - endif (NOT ${GXX_VERSION} MATCHES " 4.1.*Red Hat") - endif (${GXX_VERSION} STREQUAL ${CXX_VERSION}) - - #Lets actually get a numerical version of gxx's version - STRING(REGEX REPLACE ".* ([0-9])\\.([0-9])\\.([0-9]).*" "\\1\\2\\3" CXX_VERSION ${CXX_VERSION}) - - #gcc 4.3 and above don't like the LL boost - if(${CXX_VERSION} GREATER 429) - add_definitions(-Wno-parentheses) - endif (${CXX_VERSION} GREATER 429) - - #gcc 4.6 has a new spammy warning - if(NOT ${CXX_VERSION} LESS 460) - add_definitions(-Wno-unused-but-set-variable) - endif (NOT ${CXX_VERSION} LESS 460) - - # End of hacks. - add_definitions( -DLL_LINUX=1 + -DAPPID=secondlife -D_REENTRANT -fexceptions -fno-math-errno -fno-strict-aliasing -fsigned-char + -fvisibility=hidden -g -pthread ) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") + # Don't catch SIGCHLD in our base application class for the viewer + # some of our 3rd party libs may need their *own* SIGCHLD handler to work. Sigh! + # The viewer doesn't need to catch SIGCHLD anyway. + add_definitions(-DLL_IGNORE_SIGCHLD) + + if(${CMAKE_C_COMPILER} MATCHES "gcc*") + find_program(GXX g++) + mark_as_advanced(GXX) + + if (GXX) + execute_process( + COMMAND ${GXX} --version + COMMAND sed "s/^[gc+ ]*//" + COMMAND head -1 + OUTPUT_VARIABLE GXX_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + else (GXX) + set(GXX_VERSION x) + endif (GXX) + + # The quoting hack here is necessary in case we're using distcc or + # ccache as our compiler. CMake doesn't pass the command line + # through the shell by default, so we end up trying to run "distcc" + # " g++" - notice the leading space. Ugh. + + execute_process( + COMMAND sh -c "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} --version" + COMMAND sed "s/^[gc+ ]*//" + COMMAND head -1 + OUTPUT_VARIABLE CXX_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) + + # Here's a giant hack for Fedora 8, where we can't use + # _FORTIFY_SOURCE if we're using a compiler older than gcc 4.1. + if (${GXX_VERSION} STREQUAL ${CXX_VERSION}) + add_definitions(-D_FORTIFY_SOURCE=2) + else (${GXX_VERSION} STREQUAL ${CXX_VERSION}) + if (NOT ${GXX_VERSION} MATCHES " 4.1.*Red Hat") + add_definitions(-D_FORTIFY_SOURCE=2) + endif (NOT ${GXX_VERSION} MATCHES " 4.1.*Red Hat") + endif (${GXX_VERSION} STREQUAL ${CXX_VERSION}) + + #Lets actually get a numerical version of gxx's version + STRING(REGEX REPLACE ".* ([0-9])\\.([0-9])\\.([0-9]).*" "\\1\\2\\3" CXX_VERSION ${CXX_VERSION}) + + #gcc 4.3 and above doesn't like the LL boost + if(${CXX_VERSION} GREATER 429) + add_definitions(-Wno-parentheses) + endif (${CXX_VERSION} GREATER 429) + + #gcc 4.6 has a new spammy warning + if(NOT ${CXX_VERSION} LESS 460) + add_definitions(-Wno-unused-but-set-variable) + endif (NOT ${CXX_VERSION} LESS 460) + + # End of hacks. + + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") - add_definitions(-DAPPID=secondlife) - add_definitions(-fvisibility=hidden) - # don't catch SIGCHLD in our base application class for the viewer - some of our 3rd party libs may need their *own* SIGCHLD handler to work. Sigh! The viewer doesn't need to catch SIGCHLD anyway. - add_definitions(-DLL_IGNORE_SIGCHLD) - if (NOT STANDALONE) - # this stops us requiring a really recent glibc at runtime - add_definitions(-fno-stack-protector) - endif (NOT STANDALONE) - 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_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") if (NOT STANDALONE) - set(MARCH_FLAG " -march=pentium4") + # this stops us requiring a really recent glibc at runtime + add_definitions(-fno-stack-protector) endif (NOT STANDALONE) - set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2}${MARCH_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_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") + if (${ARCH} STREQUAL "x86_64") + add_definitions(-DLINUX64=1 -pipe) + 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") + if (NOT STANDALONE) + set(MARCH_FLAG " -march=pentium4") + 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_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) + mark_as_advanced(CLANG) + + find_program(CLANGXX clang++) + mark_as_advanced(CLANGXX) - set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG} -msse2") + 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 " -march=pentium4") + 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_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}") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO}") endif (LINUX) @@ -233,27 +273,32 @@ 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) if (LINUX OR DARWIN) - set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs") - - if (NOT GCC_DISABLE_FATAL_WARNINGS) - set(GCC_WARNINGS "${GCC_WARNINGS} -Werror") - endif (NOT GCC_DISABLE_FATAL_WARNINGS) - - set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor -Woverloaded-virtual") - - set(CMAKE_C_FLAGS "${GCC_WARNINGS} ${CMAKE_C_FLAGS}") - set(CMAKE_CXX_FLAGS "${GCC_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}") + if(${CMAKE_C_COMPILER} MATCHES "gcc*") + 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 ") + 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() + + if (NOT DISABLE_FATAL_WARNINGS) + set(UNIX_WARNINGS "${UNIX_WARNINGS} -Werror") + endif (NOT DISABLE_FATAL_WARNINGS) + set(CMAKE_C_FLAGS "${UNIX_WARNINGS} ${CMAKE_C_FLAGS}") + set(CMAKE_CXX_FLAGS "${UNIX_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}") if (WORD_SIZE EQUAL 32) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") @@ -279,20 +324,25 @@ else (STANDALONE) endif (STANDALONE) if(1 EQUAL 1) - add_definitions(-DOPENSIM_RULES=1) - add_definitions(-DMESH_ENABLED=1) + add_definitions(-DOPENSIM_RULES=1) + add_definitions(-DMESH_ENABLED=1) + add_definitions(-DENABLE_CLASSIC_CLOUDS=1) + if (NOT "$ENV{SHY_MOD}" STREQUAL "") + add_definitions(-DSHY_MOD=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/llcharacter/llbvhloader.cpp b/indra/llcharacter/llbvhloader.cpp index b4dedad11..9ef121624 100644 --- a/indra/llcharacter/llbvhloader.cpp +++ b/indra/llcharacter/llbvhloader.cpp @@ -44,7 +44,7 @@ #include "llapr.h" -using namespace std; +//using namespace std; #define INCHES_TO_METERS 0.02540005f diff --git a/indra/llcommon/aithreadsafe.h b/indra/llcommon/aithreadsafe.h index a8b1ac490..b7d0045cb 100644 --- a/indra/llcommon/aithreadsafe.h +++ b/indra/llcommon/aithreadsafe.h @@ -69,7 +69,7 @@ // and AIThreadSafeSingleThread doesn't do any locking but makes sure // (in Debug mode) that the wrapped object is only accessed by one thread. // -// Each wrapper class allows it's wrapped object to be constructed +// Each wrapper class allows its wrapped object to be constructed // with arbitrary parameters by using operator new with placement; // for example, to instantiate a class Foo with read/write locking: // @@ -565,7 +565,7 @@ private: * for the internally used mutexes and condition, instead of using the current threads * root pool. The advantage of this is that it can be used for objects that need to * be accessed from the destructors of global objects (after main). The disadvantage - * is that it's less efficient to use your own root pool, therefore it's use should be + * is that it's less efficient to use your own root pool, therefore its use should be * restricted to those cases where it is absolutely necessary. */ template @@ -736,7 +736,7 @@ private: * * This class is primarily intended to test if some (member) variable needs locking, * during development (in debug mode), and is therefore more flexible in that it - * automatically converts to the underlaying type, can be assigned to and can be + * automatically converts to the underlying type, can be assigned to and can be * written to an ostream, as if it wasn't wrapped at all. This is to reduce the * impact on the source code. */ diff --git a/indra/llcommon/llhash.h b/indra/llcommon/llhash.h index 0ce10883a..c0a8bff66 100644 --- a/indra/llcommon/llhash.h +++ b/indra/llcommon/llhash.h @@ -39,15 +39,15 @@ #include #include #elif LL_DARWIN || LL_LINUX -# 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 +#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 #include #else 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/llstrider.h b/indra/llcommon/llstrider.h index b7e7e1dca..7d1b80710 100644 --- a/indra/llcommon/llstrider.h +++ b/indra/llcommon/llstrider.h @@ -50,6 +50,16 @@ public: const LLStrider& operator = (Object *first) { mObjectp = first; return *this;} void setStride (S32 skipBytes) { mSkip = (skipBytes ? skipBytes : sizeof(Object));} + + LLStrider operator+(const S32& index) + { + LLStrider ret; + ret.mBytep = mBytep + mSkip*index; + ret.mSkip = mSkip; + + return ret; + } + //void setTypeSize (S32 typeBytes){ mTypeSize = (typeBytes ? typeBytes : sizeof(Object)); } //bool isStrided() const { return mTypeSize != mSkip; } diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp index e1641c8cc..7c159c830 100644 --- a/indra/llcommon/llstring.cpp +++ b/indra/llcommon/llstring.cpp @@ -737,6 +737,7 @@ std::string LLStringOps::sDayFormat; std::string LLStringOps::sAM; std::string LLStringOps::sPM; + S32 LLStringOps::collate(const llwchar* a, const llwchar* b) { #if LL_WINDOWS @@ -936,22 +937,24 @@ S32 LLStringUtil::format(std::string& s, const format_map_t& substitutions); template<> void LLStringUtil::getTokens(const std::string& instr, std::vector& tokens, const std::string& delims) { - std::string currToken; - std::string::size_type begIdx, endIdx; - - begIdx = instr.find_first_not_of (delims); - while (begIdx != std::string::npos) + // Starting at offset 0, scan forward for the next non-delimiter. We're + // done when the only characters left in 'instr' are delimiters. + for (std::string::size_type begIdx, endIdx = 0; + (begIdx = instr.find_first_not_of (delims, endIdx)) != std::string::npos; ) { + // Found a non-delimiter. After that, find the next delimiter. endIdx = instr.find_first_of (delims, begIdx); if (endIdx == std::string::npos) { + // No more delimiters: this token extends to the end of the string. endIdx = instr.length(); } - currToken = instr.substr(begIdx, endIdx - begIdx); + // extract the token between begIdx and endIdx; substr() needs length + std::string currToken(instr.substr(begIdx, endIdx - begIdx)); LLStringUtil::trim (currToken); tokens.push_back(currToken); - begIdx = instr.find_first_not_of (delims, endIdx); + // next scan past delimiters starts at endIdx } } @@ -1401,7 +1404,7 @@ void LLStringUtilBase::testHarness() s2.erase( 4, 1 ); llassert( s2 == "hell"); - s2.insert( 0, std::string('y') ); + s2.insert( 0, 1, 'y' ); llassert( s2 == "yhell"); s2.erase( 1, 3 ); llassert( s2 == "yl"); 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/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/llimagedxt.cpp b/indra/llimage/llimagedxt.cpp index c81126812..34c679352 100644 --- a/indra/llimage/llimagedxt.cpp +++ b/indra/llimage/llimagedxt.cpp @@ -1,37 +1,32 @@ /** * @file llimagedxt.cpp * - * $LicenseInfo:firstyear=2001&license=viewergpl$ - * - * Copyright (c) 2001-2009, Linden Research, Inc. - * + * $LicenseInfo:firstyear=2001&license=viewerlgpl$ * 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 + * Copyright (C) 2010, Linden Research, Inc. * - * 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 + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. * - * 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. + * 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. * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ #include "linden_common.h" #include "llimagedxt.h" +#include "llmemory.h" //static void LLImageDXT::checkMinWidthHeight(EFileFormat format, S32& width, S32& height) diff --git a/indra/llimage/llimagepng.cpp b/indra/llimage/llimagepng.cpp index 33b1ab181..34f553ffc 100644 --- a/indra/llimage/llimagepng.cpp +++ b/indra/llimage/llimagepng.cpp @@ -2,31 +2,25 @@ * @file llimagepng.cpp * @brief LLImageFormatted glue to encode / decode PNG files. * - * $LicenseInfo:firstyear=2007&license=viewergpl$ - * - * Copyright (c) 2007-2009, Linden Research, Inc. - * + * $LicenseInfo:firstyear=2007&license=viewerlgpl$ * 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 + * Copyright (C) 2010, Linden Research, Inc. * - * 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 + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. * - * 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. + * 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. * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -66,6 +60,12 @@ BOOL LLImagePNG::updateData() // Decode the PNG data and extract sizing information LLPngWrapper pngWrapper; + if (!pngWrapper.isValidPng(getData())) + { + setLastError("LLImagePNG data does not have a valid PNG header!"); + return FALSE; + } + LLPngWrapper::ImageInfo infop; if (! pngWrapper.readPng(getData(), NULL, &infop)) { @@ -96,6 +96,12 @@ BOOL LLImagePNG::decode(LLImageRaw* raw_image, F32 decode_time) // Decode the PNG data into the raw image LLPngWrapper pngWrapper; + if (!pngWrapper.isValidPng(getData())) + { + setLastError("LLImagePNG data does not have a valid PNG header!"); + return FALSE; + } + if (! pngWrapper.readPng(getData(), raw_image)) { setLastError(pngWrapper.getErrorMessage()); diff --git a/indra/llimage/llimagetga.cpp b/indra/llimage/llimagetga.cpp index a6721bfa0..58426d31f 100644 --- a/indra/llimage/llimagetga.cpp +++ b/indra/llimage/llimagetga.cpp @@ -1,40 +1,36 @@ /** * @file llimagetga.cpp * - * $LicenseInfo:firstyear=2001&license=viewergpl$ - * - * Copyright (c) 2001-2009, Linden Research, Inc. - * + * $LicenseInfo:firstyear=2001&license=viewerlgpl$ * 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 + * Copyright (C) 2010, Linden Research, Inc. * - * 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 + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. * - * 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. + * 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. * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ #include "linden_common.h" -#include "lldir.h" #include "llimagetga.h" + +#include "lldir.h" #include "llerror.h" #include "llmath.h" +#include "llpointer.h" // For expanding 5-bit pixel values to 8-bit with best rounding // static 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/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp index cde11493f..743c7a347 100644 --- a/indra/llimagej2coj/llimagej2coj.cpp +++ b/indra/llimagej2coj/llimagej2coj.cpp @@ -2,31 +2,25 @@ * @file llimagej2coj.cpp * @brief This is an implementation of JPEG2000 encode/decode using OpenJPEG. * - * $LicenseInfo:firstyear=2006&license=viewergpl$ - * - * Copyright (c) 2006-2009, Linden Research, Inc. - * + * $LicenseInfo:firstyear=2006&license=viewerlgpl$ * 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 + * Copyright (C) 2010, Linden Research, Inc. * - * 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 + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. * - * 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. + * 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. * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -37,7 +31,7 @@ #include "openjpeg.h" #include "lltimer.h" -#include "llmemory.h" +//#include "llmemory.h" const char* fallbackEngineInfoLLImageJ2CImpl() { @@ -96,8 +90,15 @@ void info_callback(const char* msg, void*) lldebugs << "LLImageJ2COJ: " << chomp(msg) << llendl; } +// Divide a by 2 to the power of b and round upwards +int ceildivpow2(int a, int b) +{ + return (a + (1 << b) - 1) >> b; +} -LLImageJ2COJ::LLImageJ2COJ() : LLImageJ2CImpl() + +LLImageJ2COJ::LLImageJ2COJ() + : LLImageJ2CImpl() { } @@ -180,7 +181,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod // dereference the array. if(!image || !image->numcomps) { - llwarns << "failed to decode image!" << llendl; + LL_WARNS("Texture") << "ERROR -> decodeImpl: failed to decode image!" << LL_ENDL; if (image) { opj_image_destroy(image); @@ -195,7 +196,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod { if (image->comps[i].factor != base.getRawDiscardLevel()) { - llwarns << "Expected discard level not reached!" << llendl; + LL_WARNS("Texture") << "Expected discard level not reached!" << llendl; // if we didn't get the discard level we're expecting, fail opj_image_destroy(image); base.decodeFailed(); @@ -256,7 +257,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod } else // Some rare OpenJPEG versions have this bug. { - llwarns << "ERROR -> decodeImpl: failed to decode image! (NULL comp data - OpenJPEG bug)" << llendl; + LL_WARNS("Texture") << "ERROR -> decodeImpl: failed to decode image! (NULL comp data - OpenJPEG bug)" << llendl; opj_image_destroy(image); base.decodeFailed(); @@ -391,7 +392,7 @@ BOOL LLImageJ2COJ::encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, con if (!bSuccess) { opj_cio_close(cio); - llinfos << "Failed to encode image." << llendl; + LL_WARNS("Texture") << "Failed to encode image." << llendl; return FALSE; } codestream_length = cio_tell(cio); diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp index 96fe5c525..c34b89e37 100644 --- a/indra/llinventory/llinventory.cpp +++ b/indra/llinventory/llinventory.cpp @@ -45,9 +45,8 @@ #include "llsdutil.h" ///---------------------------------------------------------------------------- -/// exported functions +/// Exported functions ///---------------------------------------------------------------------------- - static const std::string INV_ITEM_ID_LABEL("item_id"); static const std::string INV_FOLDER_ID_LABEL("folder_id"); static const std::string INV_PARENT_ID_LABEL("parent_id"); @@ -1199,109 +1198,8 @@ fail: } -LLXMLNode *LLInventoryItem::exportFileXML(BOOL include_asset_key) const -{ - LLMemType m1(LLMemType::MTYPE_INVENTORY); - LLXMLNode *ret = new LLXMLNode("item", FALSE); - - ret->createChild("uuid", TRUE)->setUUIDValue(1, &mUUID); - ret->createChild("parent_uuid", TRUE)->setUUIDValue(1, &mParentUUID); - - mPermissions.exportFileXML()->setParent(ret); - - // Check for permissions to see the asset id, and if so write it - // out as an asset id. Otherwise, apply our cheesy encryption. - if(include_asset_key) - { - U32 mask = mPermissions.getMaskBase(); - if(((mask & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED) - || (mAssetUUID.isNull())) - { - ret->createChild("asset_id", FALSE)->setUUIDValue(1, &mAssetUUID); - } - else - { - LLUUID shadow_id(mAssetUUID); - LLXORCipher cipher(MAGIC_ID.mData, UUID_BYTES); - cipher.encrypt(shadow_id.mData, UUID_BYTES); - - ret->createChild("shadow_id", FALSE)->setUUIDValue(1, &shadow_id); - } - } - - std::string type_str = LLAssetType::lookup(mType); - std::string inv_type_str = LLInventoryType::lookup(mInventoryType); - - ret->createChild("asset_type", FALSE)->setStringValue(type_str); - ret->createChild("inventory_type", FALSE)->setStringValue(inv_type_str); - S32 tmp_flags = (S32) mFlags; - ret->createChild("flags", FALSE)->setByteValue(4, (U8*)(&tmp_flags), LLXMLNode::ENCODING_HEX); - - mSaleInfo.exportFileXML()->setParent(ret); - - std::string temp; - temp.assign(mName); - ret->createChild("name", FALSE)->setStringValue(temp); - temp.assign(mDescription); - ret->createChild("description", FALSE)->setStringValue(temp); - S32 date = mCreationDate; - ret->createChild("creation_date", FALSE)->setIntValue(1, &date); - - return ret; -} - -BOOL LLInventoryItem::importXML(LLXMLNode* node) -{ - BOOL success = FALSE; - if (node) - { - success = TRUE; - LLXMLNodePtr sub_node; - if (node->getChild("uuid", sub_node)) - success = (1 == sub_node->getUUIDValue(1, &mUUID)); - if (node->getChild("parent_uuid", sub_node)) - success = success && (1 == sub_node->getUUIDValue(1, &mParentUUID)); - if (node->getChild("permissions", sub_node)) - success = success && mPermissions.importXML(sub_node); - if (node->getChild("asset_id", sub_node)) - success = success && (1 == sub_node->getUUIDValue(1, &mAssetUUID)); - if (node->getChild("shadow_id", sub_node)) - { - success = success && (1 == sub_node->getUUIDValue(1, &mAssetUUID)); - LLXORCipher cipher(MAGIC_ID.mData, UUID_BYTES); - cipher.decrypt(mAssetUUID.mData, UUID_BYTES); - } - if (node->getChild("asset_type", sub_node)) - mType = LLAssetType::lookup(sub_node->getValue()); - if (node->getChild("inventory_type", sub_node)) - mInventoryType = LLInventoryType::lookup(sub_node->getValue()); - if (node->getChild("flags", sub_node)) - { - S32 tmp_flags = 0; - success = success && (1 == sub_node->getIntValue(1, &tmp_flags)); - mFlags = (U32) tmp_flags; - } - if (node->getChild("sale_info", sub_node)) - success = success && mSaleInfo.importXML(sub_node); - if (node->getChild("name", sub_node)) - mName = sub_node->getValue(); - if (node->getChild("description", sub_node)) - mDescription = sub_node->getValue(); - if (node->getChild("creation_date", sub_node)) - { - S32 date = 0; - success = success && (1 == sub_node->getIntValue(1, &date)); - mCreationDate = date; - } - - if (!success) - { - lldebugs << "LLInventory::importXML() failed for node named '" - << node->getName() << "'" << llendl; - } - } - return success; -} +// Deleted LLInventoryItem::exportFileXML() and LLInventoryItem::importXML() +// because I can't find any non-test code references to it. 2009-05-04 JC S32 LLInventoryItem::packBinaryBucket(U8* bin_bucket, LLPermissions* perm_override) const { diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index 479c7d397..14c04a0d1 100644 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h @@ -214,15 +214,11 @@ public: virtual BOOL importLegacyStream(std::istream& input_stream); virtual BOOL exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key = TRUE) const; - virtual LLXMLNode *exportFileXML(BOOL include_asset_key = TRUE) const; - BOOL importXML(LLXMLNode* node); - //-------------------------------------------------------------------- // Helper Functions //-------------------------------------------------------------------- public: // Pack all information needed to reconstruct this item into the given binary bucket. - S32 packBinaryBucket(U8* bin_bucket, LLPermissions* perm_override = NULL) const; void unpackBinaryBucket(U8* bin_bucket, S32 bin_bucket_size); LLSD asLLSD() const; @@ -249,7 +245,6 @@ protected: // items. Users come with a set of default categories, and can create // new ones as needed. //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - class LLInventoryCategory : public LLInventoryObject { public: diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index e4e1d239e..e92ae5dc0 100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp @@ -200,8 +200,6 @@ void LLParcel::init(const LLUUID &owner_id, mMediaWidth = 0; mMediaHeight = 0; setMediaCurrentURL(LLStringUtil::null); - mMediaURLFilterEnable = FALSE; - mMediaURLFilterList = LLSD::emptyArray(); mMediaAllowNavigate = TRUE; mMediaURLTimeout = 0.0f; mMediaPreventCameraZoom = FALSE; @@ -343,38 +341,6 @@ void LLParcel::setMediaURLResetTimer(F32 time) mMediaResetTimer.setTimerExpirySec(time); } -void LLParcel::setMediaURLFilterList(LLSD list) -{ - // sanity check LLSD - // must be array of strings - if (!list.isArray()) - { - return; - } - - for (S32 i = 0; i < list.size(); i++) - { - if (!list[i].isString()) - return; - } - - // can't be too big - const S32 MAX_SIZE = 50; - if (list.size() > MAX_SIZE) - { - LLSD new_list = LLSD::emptyArray(); - - for (S32 i = 0; i < llmin(list.size(), MAX_SIZE); i++) - { - new_list.append(list[i]); - } - - list = new_list; - } - - mMediaURLFilterList = list; -} - // virtual void LLParcel::setLocalID(S32 local_id) { @@ -629,34 +595,6 @@ BOOL LLParcel::importAccessEntry(std::istream& input_stream, LLAccessEntry* entr return input_stream.good(); } -BOOL LLParcel::importMediaURLFilter(std::istream& input_stream, std::string& url) -{ - skip_to_end_of_next_keyword("{", input_stream); - - while(input_stream.good()) - { - skip_comments_and_emptyspace(input_stream); - std::string line, keyword, value; - get_line(line, input_stream, MAX_STRING); - get_keyword_and_value(keyword, value, line); - - if ("}" == keyword) - { - break; - } - else if ("url" == keyword) - { - url = value; - } - else - { - llwarns << "Unknown keyword in parcel media url filter section: <" - << keyword << ">" << llendl; - } - } - return input_stream.good(); -} - // Assumes we are in a block "ParcelData" void LLParcel::packMessage(LLMessageSystem* msg) { @@ -703,8 +641,6 @@ void LLParcel::packMessage(LLSD& msg) msg["media_allow_navigate"] = getMediaAllowNavigate(); msg["media_prevent_camera_zoom"] = getMediaPreventCameraZoom(); msg["media_url_timeout"] = getMediaURLTimeout(); - msg["media_url_filter_enable"] = getMediaURLFilterEnable(); - msg["media_url_filter_list"] = getMediaURLFilterList(); msg["group_id"] = getGroupID(); msg["pass_price"] = mPassPrice; msg["pass_hours"] = mPassHours; @@ -795,7 +731,6 @@ void LLParcel::unpackMessage(LLMessageSystem* msg) msg->getString("MediaLinkSharing", "MediaCurrentURL", buffer); setMediaCurrentURL(buffer); msg->getU8 ( "MediaLinkSharing", "MediaAllowNavigate", mMediaAllowNavigate ); - msg->getU8 ( "MediaLinkSharing", "MediaURLFilterEnable", mMediaURLFilterEnable ); msg->getU8 ( "MediaLinkSharing", "MediaPreventCameraZoom", mMediaPreventCameraZoom ); msg->getF32( "MediaLinkSharing", "MediaURLTimeout", mMediaURLTimeout); } @@ -1256,8 +1191,6 @@ void LLParcel::clearParcel() mMediaWidth = 0; mMediaHeight = 0; setMediaCurrentURL(LLStringUtil::null); - setMediaURLFilterList(LLSD::emptyArray()); - setMediaURLFilterEnable(FALSE); setMediaAllowNavigate(TRUE); setMediaPreventCameraZoom(FALSE); setMediaURLTimeout(0.0f); diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h index 3479e5982..492be170b 100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h @@ -253,8 +253,6 @@ public: void setMediaWidth(S32 width); void setMediaHeight(S32 height); void setMediaCurrentURL(const std::string& url); - void setMediaURLFilterEnable(U8 enable) { mMediaURLFilterEnable = enable; } - void setMediaURLFilterList(LLSD list); void setMediaAllowNavigate(U8 enable) { mMediaAllowNavigate = enable; } void setMediaURLTimeout(F32 timeout) { mMediaURLTimeout = timeout; } void setMediaPreventCameraZoom(U8 enable) { mMediaPreventCameraZoom = enable; } @@ -317,7 +315,6 @@ public: // BOOL importStream(std::istream& input_stream); BOOL importAccessEntry(std::istream& input_stream, LLAccessEntry* entry); // BOOL exportStream(std::ostream& output_stream); - BOOL importMediaURLFilter(std::istream& input_stream, std::string& url); void packMessage(LLMessageSystem* msg); void packMessage(LLSD& msg); @@ -360,8 +357,6 @@ public: U8 getMediaAutoScale() const { return mMediaAutoScale; } U8 getMediaLoop() const { return mMediaLoop; } const std::string& getMediaCurrentURL() const { return mMediaCurrentURL; } - U8 getMediaURLFilterEnable() const { return mMediaURLFilterEnable; } - LLSD getMediaURLFilterList() const { return mMediaURLFilterList; } U8 getMediaAllowNavigate() const { return mMediaAllowNavigate; } F32 getMediaURLTimeout() const { return mMediaURLTimeout; } U8 getMediaPreventCameraZoom() const { return mMediaPreventCameraZoom; } @@ -657,8 +652,6 @@ protected: U8 mMediaLoop; std::string mMediaCurrentURL; LLUUID mMediaID; - U8 mMediaURLFilterEnable; - LLSD mMediaURLFilterList; U8 mMediaAllowNavigate; U8 mMediaPreventCameraZoom; F32 mMediaURLTimeout; diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp index 718dd354a..9683252dc 100644 --- a/indra/llinventory/llpermissions.cpp +++ b/indra/llinventory/llpermissions.cpp @@ -853,67 +853,8 @@ BOOL LLPermissions::exportLegacyStream(std::ostream& output_stream) const return TRUE; } - -LLXMLNode *LLPermissions::exportFileXML() const -{ - LLXMLNode *ret = new LLXMLNode("permissions", FALSE); - - ret->createChild("group_owned", TRUE)->setBoolValue(mIsGroupOwned); - - ret->createChild("base_mask", FALSE)->setByteValue(4, (U8*)&mMaskBase, LLXMLNode::ENCODING_HEX); - ret->createChild("owner_mask", FALSE)->setByteValue(4, (U8*)&mMaskOwner, LLXMLNode::ENCODING_HEX); - ret->createChild("group_mask", FALSE)->setByteValue(4, (U8*)&mMaskGroup, LLXMLNode::ENCODING_HEX); - ret->createChild("everyone_mask", FALSE)->setByteValue(4, (U8*)&mMaskEveryone, LLXMLNode::ENCODING_HEX); - ret->createChild("next_owner_mask", FALSE)->setByteValue(4, (U8*)&mMaskNextOwner, LLXMLNode::ENCODING_HEX); - - ret->createChild("creator_id", FALSE)->setUUIDValue(1, &mCreator); - ret->createChild("owner_id", FALSE)->setUUIDValue(1, &mOwner); - ret->createChild("last_owner_id", FALSE)->setUUIDValue(1, &mLastOwner); - ret->createChild("group_id", FALSE)->setUUIDValue(1, &mGroup); - - return ret; -} - -bool LLPermissions::importXML(LLXMLNode* node) -{ - bool success = false; - if (node) - { - success = true; - LLXMLNodePtr sub_node; - if (node->getChild("base_mask", sub_node)) - success = success && (4 == sub_node->getByteValue(4, (U8*)&mMaskBase)); - if (node->getChild("owner_mask", sub_node)) - success = success && (4 == sub_node->getByteValue(4, (U8*)&mMaskOwner)); - if (node->getChild("group_mask", sub_node)) - success = success && (4 == sub_node->getByteValue(4, (U8*)&mMaskGroup)); - if (node->getChild("everyone_mask", sub_node)) - success = success && (4 == sub_node->getByteValue(4, (U8*)&mMaskEveryone)); - if (node->getChild("next_owner_mask", sub_node)) - success = success && (4 == sub_node->getByteValue(4, (U8*)&mMaskNextOwner)); - - if (node->getChild("creator_id", sub_node)) - success = success && (1 == sub_node->getUUIDValue(1, &mCreator)); - if (node->getChild("owner_id", sub_node)) - success = success && (1 == sub_node->getUUIDValue(1, &mOwner)); - if (node->getChild("last_owner_id", sub_node)) - success = success && (1 == sub_node->getUUIDValue(1, &mLastOwner)); - if (node->getChild("group_id", sub_node)) - success = success && (1 == sub_node->getUUIDValue(1, &mGroup)); - if (node->getChild("group_owned", sub_node)) - { - BOOL tmpbool = FALSE; - success = success && (1 == sub_node->getBoolValue(1, &tmpbool)); - mIsGroupOwned = (bool)tmpbool; - } - if (!success) - { - lldebugs << "LLPermissions::importXML() failed for node named '" - << node->getName() << "'" << llendl; - } - } - return success; -} +// Deleted LLPermissions::exportFileXML() and LLPermissions::importXML() +// because I can't find any non-test code references to it. 2009-05-04 JC bool LLPermissions::operator==(const LLPermissions &rhs) const { diff --git a/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h index 9143fdf30..fa20d5c21 100644 --- a/indra/llinventory/llpermissions.h +++ b/indra/llinventory/llpermissions.h @@ -149,7 +149,7 @@ public: const LLUUID& getGroup() const { return mGroup; } // return the agent_id of the last agent owner. Only returns - // LLUUID::null if there has never been a previous owner. + // LLUUID::null if there has never been a previous owner (*note: this is apparently not true, say for textures in inventory, it may return LLUUID::null even if there was a previous owner). const LLUUID& getLastOwner() const { return mLastOwner; } U32 getMaskBase() const { return mMaskBase; } @@ -235,6 +235,7 @@ public: // Last owner doesn't have much in the way of permissions so it's //not too dangerous to do this. void setLastOwner(const LLUUID& last_owner); + // saves last owner, sets owner to uuid null, sets group // owned. group_id must be the group of the object (that's who it // is being deeded to) and the object must be group @@ -324,9 +325,6 @@ public: BOOL importLegacyStream(std::istream& input_stream); BOOL exportLegacyStream(std::ostream& output_stream) const; - LLXMLNode *exportFileXML() const; - bool importXML(LLXMLNode* node); - bool operator==(const LLPermissions &rhs) const; bool operator!=(const LLPermissions &rhs) const; diff --git a/indra/llinventory/llsaleinfo.cpp b/indra/llinventory/llsaleinfo.cpp index e51e35e6e..88e7da7ac 100644 --- a/indra/llinventory/llsaleinfo.cpp +++ b/indra/llinventory/llsaleinfo.cpp @@ -135,38 +135,8 @@ bool LLSaleInfo::fromLLSD(const LLSD& sd, BOOL& has_perm_mask, U32& perm_mask) return true; } -LLXMLNode *LLSaleInfo::exportFileXML() const -{ - LLXMLNode *ret = new LLXMLNode("sale_info", FALSE); - std::string type_str = ll_safe_string( lookup(mSaleType)); - ret->createChild("type", TRUE)->setStringValue(1, &type_str); - ret->createChild("price", TRUE)->setIntValue(1, &mSalePrice); - return ret; -} - -BOOL LLSaleInfo::importXML(LLXMLNode* node) -{ - BOOL success = FALSE; - if (node) - { - success = TRUE; - LLXMLNodePtr sub_node; - if (node->getChild("type", sub_node)) - { - mSaleType = lookup(sub_node->getValue().c_str()); - } - if (node->getChild("price", sub_node)) - { - success &= (1 == sub_node->getIntValue(1, &mSalePrice)); - } - if (!success) - { - lldebugs << "LLSaleInfo::importXML() failed for node named '" - << node->getName() << "'" << llendl; - } - } - return success; -} +// Deleted LLSaleInfo::exportFileXML() and LLSaleInfo::importXML() +// because I can't find any non-test code references to it. 2009-05-04 JC BOOL LLSaleInfo::importFile(LLFILE* fp, BOOL& has_perm_mask, U32& perm_mask) { diff --git a/indra/llinventory/llsaleinfo.h b/indra/llinventory/llsaleinfo.h index d546c49fd..3461a128b 100644 --- a/indra/llinventory/llsaleinfo.h +++ b/indra/llinventory/llsaleinfo.h @@ -101,9 +101,6 @@ public: bool fromLLSD(const LLSD& sd, BOOL& has_perm_mask, U32& perm_mask); BOOL importLegacyStream(std::istream& input_stream, BOOL& has_perm_mask, U32& perm_mask); - LLXMLNode *exportFileXML() const; - BOOL importXML(LLXMLNode* node); - LLSD packMessage() const; void unpackMessage(LLSD sales); diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h index b13eddc4e..c8a0875f5 100644 --- a/indra/llmath/lloctree.h +++ b/indra/llmath/lloctree.h @@ -309,7 +309,7 @@ public: //is it here? if (isInside(data->getPositionGroup())) { - if ((getElementCount() < gOctreeMaxCapacity && contains(data->getBinRadius()) || + if (((getElementCount() < gOctreeMaxCapacity && contains(data->getBinRadius())) || (data->getBinRadius() > getSize()[0] && parent && parent->getElementCount() >= gOctreeMaxCapacity))) { //it belongs here #if LL_OCTREE_PARANOIA_CHECK diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index fc1da1b56..8b47a92ea 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -2097,7 +2097,7 @@ LLVolume::LLVolume(const LLVolumeParams ¶ms, const F32 detail, const BOOL ge generate(); - if (mParams.getSculptID().isNull() && mParams.getSculptType() == LL_SCULPT_TYPE_NONE || mParams.getSculptType() == LL_SCULPT_TYPE_MESH) + if ((mParams.getSculptID().isNull() && mParams.getSculptType() == LL_SCULPT_TYPE_NONE) || mParams.getSculptType() == LL_SCULPT_TYPE_MESH) { createVolumeFaces(); } diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index 1bcef4401..9999c236d 100644 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -60,6 +60,7 @@ class LLVolumeTriangle; #include "llstrider.h" #include "v4coloru.h" #include "llrefcount.h" +#include "llpointer.h" #include "llfile.h" //============================================================================ @@ -926,6 +927,10 @@ public: LLVector2* mTexCoords; U16* mIndices; + //vertex buffer filled in by LLFace to cache this volume face geometry in vram + // (declared as a LLPointer to LLRefCount to avoid dependency on LLVertexBuffer) + mutable LLPointer mVertexBuffer; + std::vector mEdge; //list of skin weights for rigged volumes diff --git a/indra/llmessage/llcircuit.cpp b/indra/llmessage/llcircuit.cpp index e0410906f..4b41abd45 100644 --- a/indra/llmessage/llcircuit.cpp +++ b/indra/llmessage/llcircuit.cpp @@ -688,7 +688,7 @@ void LLCircuitData::checkPacketInID(TPACKETID id, BOOL receive_resent) // now, check to see if we've got a gap U32 gap = 0; - if ((mPacketsInID == id)) + if (mPacketsInID == id) { // nope! bump and wrap the counter, then return mPacketsInID++; diff --git a/indra/llmessage/llxfermanager.cpp b/indra/llmessage/llxfermanager.cpp index b9cddc8e4..090ab2a00 100644 --- a/indra/llmessage/llxfermanager.cpp +++ b/indra/llmessage/llxfermanager.cpp @@ -261,7 +261,7 @@ U32 LLXferManager::numActiveListEntries(LLXfer *list_head) while (list_head) { - if ((list_head->mStatus == e_LL_XFER_IN_PROGRESS)) + if (list_head->mStatus == e_LL_XFER_IN_PROGRESS) { num_entries++; } 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/llcubemap.cpp b/indra/llrender/llcubemap.cpp index 45a3b1817..362452d83 100644 --- a/indra/llrender/llcubemap.cpp +++ b/indra/llrender/llcubemap.cpp @@ -81,7 +81,7 @@ void LLCubeMap::initGL() { U32 texname = 0; - LLImageGL::generateTextures(1, &texname); + LLImageGL::generateTextures(LLTexUnit::TT_CUBE_MAP, GL_RGB8, 1, &texname); for (int i = 0; i < 6; i++) { diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 3937184d2..92d095b80 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -2,31 +2,25 @@ * @file llgl.cpp * @brief LLGL implementation * - * $LicenseInfo:firstyear=2001&license=viewergpl$ - * - * Copyright (c) 2001-2009, Linden Research, Inc. - * + * $LicenseInfo:firstyear=2001&license=viewerlgpl$ * 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 + * Copyright (C) 2010, Linden Research, Inc. * - * 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 + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. * - * 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. + * 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. * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -263,6 +257,12 @@ PFNGLTEXIMAGE3DMULTISAMPLEPROC glTexImage3DMultisample = NULL; PFNGLGETMULTISAMPLEFVPROC glGetMultisamplefv = NULL; PFNGLSAMPLEMASKIPROC glSampleMaski = NULL; +//transform feedback (4.0 core) +PFNGLBEGINTRANSFORMFEEDBACKPROC glBeginTransformFeedback = NULL; +PFNGLENDTRANSFORMFEEDBACKPROC glEndTransformFeedback = NULL; +PFNGLTRANSFORMFEEDBACKVARYINGSPROC glTransformFeedbackVaryings = NULL; +PFNGLBINDBUFFERRANGEPROC glBindBufferRange = NULL; + //GL_ARB_debug_output PFNGLDEBUGMESSAGECONTROLARBPROC glDebugMessageControlARB = NULL; PFNGLDEBUGMESSAGEINSERTARBPROC glDebugMessageInsertARB = NULL; @@ -436,6 +436,7 @@ LLGLManager::LLGLManager() : mHasDrawBuffers(FALSE), mHasTextureRectangle(FALSE), mHasTextureMultisample(FALSE), + mHasTransformFeedback(FALSE), mMaxSampleMaskWords(0), mMaxColorTextureSamples(0), mMaxDepthTextureSamples(0), @@ -573,7 +574,8 @@ bool LLGLManager::initGL() parse_gl_version( &mDriverVersionMajor, &mDriverVersionMinor, &mDriverVersionRelease, - &mDriverVersionVendorString ); + &mDriverVersionVendorString, + &mGLVersionString); mGLVersion = mDriverVersionMajor + mDriverVersionMinor * .1f; @@ -591,7 +593,7 @@ bool LLGLManager::initGL() #endif } - if (mGLVersion >= 3.f && LLImageGL::sCompressTextures) + if (mGLVersion >= 2.1f && LLImageGL::sCompressTextures) { //use texture compression glHint(GL_TEXTURE_COMPRESSION_HINT, GL_NICEST); } @@ -620,11 +622,8 @@ bool LLGLManager::initGL() #endif // LL_WINDOWS #if (LL_WINDOWS || LL_LINUX) && !LL_MESA_HEADLESS - // release 7277 is a point at which we verify that ATI OpenGL - // drivers get pretty stable with SL, ~Catalyst 8.2, - // for both Win32 and Linux. - if (mDriverVersionRelease < 7277 && - mDriverVersionRelease != 0) // 0 == Undetectable driver version - these get to pretend to be new ATI drivers, though that decision may be revisited. + // count any pre OpenGL 3.0 implementation as an old driver + if (mGLVersion < 3.f) { mATIOldDriver = TRUE; } @@ -931,7 +930,6 @@ void LLGLManager::initExtensions() mHasMultitexture = glh_init_extensions("GL_ARB_multitexture"); mHasATIMemInfo = ExtensionExists("GL_ATI_meminfo", gGLHExts.mSysExts); mHasNVXMemInfo = ExtensionExists("GL_NVX_gpu_memory_info", gGLHExts.mSysExts); - mHasMipMapGeneration = glh_init_extensions("GL_SGIS_generate_mipmap"); mHasSeparateSpecularColor = glh_init_extensions("GL_EXT_separate_specular_color"); mHasAnisotropic = glh_init_extensions("GL_EXT_texture_filter_anisotropic"); glh_init_extensions("GL_ARB_texture_cube_map"); @@ -956,11 +954,15 @@ void LLGLManager::initExtensions() ExtensionExists("GL_EXT_packed_depth_stencil", gGLHExts.mSysExts); #endif mHasFramebufferMultisample = mHasFramebufferObject && ExtensionExists("GL_EXT_framebuffer_multisample", gGLHExts.mSysExts); + + mHasMipMapGeneration = mHasFramebufferObject || mGLVersion >= 1.4f; + mHasDrawBuffers = ExtensionExists("GL_ARB_draw_buffers", gGLHExts.mSysExts); mHasBlendFuncSeparate = ExtensionExists("GL_EXT_blend_func_separate", gGLHExts.mSysExts); mHasTextureRectangle = ExtensionExists("GL_ARB_texture_rectangle", gGLHExts.mSysExts); mHasTextureMultisample = ExtensionExists("GL_ARB_texture_multisample", gGLHExts.mSysExts); mHasDebugOutput = ExtensionExists("GL_ARB_debug_output", gGLHExts.mSysExts); + mHasTransformFeedback = mGLVersion >= 4.f ? TRUE : FALSE; #if !LL_DARWIN mHasPointParameters = !mIsATI && ExtensionExists("GL_ARB_point_parameters", gGLHExts.mSysExts); #endif @@ -1202,7 +1204,14 @@ void LLGLManager::initExtensions() glTexImage3DMultisample = (PFNGLTEXIMAGE3DMULTISAMPLEPROC) GLH_EXT_GET_PROC_ADDRESS("glTexImage3DMultisample"); glGetMultisamplefv = (PFNGLGETMULTISAMPLEFVPROC) GLH_EXT_GET_PROC_ADDRESS("glGetMultisamplefv"); glSampleMaski = (PFNGLSAMPLEMASKIPROC) GLH_EXT_GET_PROC_ADDRESS("glSampleMaski"); - } + } + if (mHasTransformFeedback) + { + glBeginTransformFeedback = (PFNGLBEGINTRANSFORMFEEDBACKPROC) GLH_EXT_GET_PROC_ADDRESS("glBeginTransformFeedback"); + glEndTransformFeedback = (PFNGLENDTRANSFORMFEEDBACKPROC) GLH_EXT_GET_PROC_ADDRESS("glEndTransformFeedback"); + glTransformFeedbackVaryings = (PFNGLTRANSFORMFEEDBACKVARYINGSPROC) GLH_EXT_GET_PROC_ADDRESS("glTransformFeedbackVaryings"); + glBindBufferRange = (PFNGLBINDBUFFERRANGEPROC) GLH_EXT_GET_PROC_ADDRESS("glBindBufferRange"); + } if (mHasDebugOutput) { glDebugMessageControlARB = (PFNGLDEBUGMESSAGECONTROLARBPROC) GLH_EXT_GET_PROC_ADDRESS("glDebugMessageControlARB"); @@ -2040,7 +2049,7 @@ void LLGLManager::initGLStates() //////////////////////////////////////////////////////////////////////////////// -void parse_gl_version( S32* major, S32* minor, S32* release, std::string* vendor_specific ) +void parse_gl_version( S32* major, S32* minor, S32* release, std::string* vendor_specific, std::string* version_string ) { // GL_VERSION returns a null-terminated string with the format: // .[.] [] @@ -2056,6 +2065,8 @@ void parse_gl_version( S32* major, S32* minor, S32* release, std::string* vendor return; } + version_string->assign(version); + std::string ver_copy( version ); S32 len = (S32)strlen( version ); /* Flawfinder: ignore */ S32 i = 0; @@ -2417,3 +2428,63 @@ LLGLSquashToFarClip::~LLGLSquashToFarClip() gGL.matrixMode(LLRender::MM_MODELVIEW); } + + +LLGLSyncFence::LLGLSyncFence() +{ +#ifdef GL_ARB_sync + mSync = 0; +#endif +} + +LLGLSyncFence::~LLGLSyncFence() +{ +#ifdef GL_ARB_sync + if (mSync) + { + glDeleteSync(mSync); + } +#endif +} + +void LLGLSyncFence::placeFence() +{ +#ifdef GL_ARB_sync + if (mSync) + { + glDeleteSync(mSync); + } + mSync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0); +#endif +} + +bool LLGLSyncFence::isCompleted() +{ + bool ret = true; +#ifdef GL_ARB_sync + if (mSync) + { + GLenum status = glClientWaitSync(mSync, 0, 1); + if (status == GL_TIMEOUT_EXPIRED) + { + ret = false; + } + } +#endif + return ret; +} + +void LLGLSyncFence::wait() +{ +#ifdef GL_ARB_sync + if (mSync) + { + while (glClientWaitSync(mSync, 0, FENCE_WAIT_TIME_NANOSECONDS) == GL_TIMEOUT_EXPIRED) + { //track the number of times we've waited here + static S32 waits = 0; + waits++; + } + } +#endif +} + diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h index 6817ec0f0..06f6155c9 100644 --- a/indra/llrender/llgl.h +++ b/indra/llrender/llgl.h @@ -2,31 +2,25 @@ * @file llgl.h * @brief LLGL definition * - * $LicenseInfo:firstyear=2001&license=viewergpl$ - * - * Copyright (c) 2001-2009, Linden Research, Inc. - * + * $LicenseInfo:firstyear=2001&license=viewerlgpl$ * 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 + * Copyright (C) 2010, Linden Research, Inc. * - * 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 + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. * - * 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. + * 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. * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -111,6 +105,7 @@ public: BOOL mHasDepthClamp; BOOL mHasTextureRectangle; BOOL mHasTextureMultisample; + BOOL mHasTransformFeedback; S32 mMaxSampleMaskWords; S32 mMaxColorTextureSamples; S32 mMaxDepthTextureSamples; @@ -148,6 +143,7 @@ public: S32 mGLSLVersionMajor; S32 mGLSLVersionMinor; std::string mDriverVersionVendorString; + std::string mGLVersionString; S32 mVRAM; // VRAM in MB S32 mGLMaxVertexRange; @@ -425,13 +421,39 @@ public: virtual void updateGL() = 0; }; +const U32 FENCE_WAIT_TIME_NANOSECONDS = 1000; //1 ms + +class LLGLFence +{ +public: + virtual void placeFence() = 0; + virtual bool isCompleted() = 0; + virtual void wait() = 0; + virtual ~LLGLFence() {} +}; + +class LLGLSyncFence : public LLGLFence +{ +public: +#ifdef GL_ARB_sync + GLsync mSync; +#endif + + LLGLSyncFence(); + virtual ~LLGLSyncFence(); + + void placeFence(); + bool isCompleted(); + void wait(); +}; + extern LLMatrix4 gGLObliqueProjectionInverse; #include "llglstates.h" void init_glstates(); -void parse_gl_version( S32* major, S32* minor, S32* release, std::string* vendor_specific ); +void parse_gl_version( S32* major, S32* minor, S32* release, std::string* vendor_specific, std::string* version_string ); extern BOOL gClothRipple; extern BOOL gNoRender; diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h index 7ccc0d819..9e3d9b96f 100644 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -534,6 +534,13 @@ extern PFNGLTEXIMAGE3DMULTISAMPLEPROC glTexImage3DMultisample; extern PFNGLGETMULTISAMPLEFVPROC glGetMultisamplefv; extern PFNGLSAMPLEMASKIPROC glSampleMaski; +//transform feedback (4.0 core) +extern PFNGLBEGINTRANSFORMFEEDBACKPROC glBeginTransformFeedback; +extern PFNGLENDTRANSFORMFEEDBACKPROC glEndTransformFeedback; +extern PFNGLTRANSFORMFEEDBACKVARYINGSPROC glTransformFeedbackVaryings; +extern PFNGLBINDBUFFERRANGEPROC glBindBufferRange; + + #elif LL_WINDOWS //---------------------------------------------------------------------------- // LL_WINDOWS @@ -765,6 +772,12 @@ extern PFNGLTEXIMAGE3DMULTISAMPLEPROC glTexImage3DMultisample; extern PFNGLGETMULTISAMPLEFVPROC glGetMultisamplefv; extern PFNGLSAMPLEMASKIPROC glSampleMaski; +//transform feedback (4.0 core) +extern PFNGLBEGINTRANSFORMFEEDBACKPROC glBeginTransformFeedback; +extern PFNGLENDTRANSFORMFEEDBACKPROC glEndTransformFeedback; +extern PFNGLTRANSFORMFEEDBACKVARYINGSPROC glTransformFeedbackVaryings; +extern PFNGLBINDBUFFERRANGEPROC glBindBufferRange; + //GL_ARB_debug_output extern PFNGLDEBUGMESSAGECONTROLARBPROC glDebugMessageControlARB; extern PFNGLDEBUGMESSAGEINSERTARBPROC glDebugMessageInsertARB; diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 6da17d2fd..1c90d7658 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -134,7 +134,9 @@ void LLGLSLShader::unload() } BOOL LLGLSLShader::createShader(vector * attributes, - vector * uniforms) + vector * uniforms, + U32 varying_count, + const char** varyings) { //reloading, reset matrix hash values for (U32 i = 0; i < LLRender::NUM_MATRIX_MODES; ++i) @@ -142,6 +144,7 @@ BOOL LLGLSLShader::createShader(vector * attributes, mMatHash[i] = 0xFFFFFFFF; } mLightHash = 0xFFFFFFFF; + llassert_always(!mShaderFiles.empty()); BOOL success = TRUE; @@ -181,6 +184,13 @@ BOOL LLGLSLShader::createShader(vector * attributes, mFeatures.mIndexedTextureChannels = llmin(mFeatures.mIndexedTextureChannels, 1); } +#ifdef GL_INTERLEAVED_ATTRIBS + if (varying_count > 0 && varyings) + { + glTransformFeedbackVaryings(mProgramObject, varying_count, varyings, GL_INTERLEAVED_ATTRIBS); + } +#endif + // Map attributes and uniforms if (success) { @@ -228,13 +238,13 @@ BOOL LLGLSLShader::createShader(vector * attributes, } unbind(); } + return success; } BOOL LLGLSLShader::attachObject(std::string object) { - std::map &ShaderObjects = LLShaderMgr::instance()->mShaderObjects; - if (ShaderObjects.find(object) != ShaderObjects.end()) + if (LLShaderMgr::instance()->mShaderObjects.count(object) > 0) { stop_glerror(); glAttachObjectARB(mProgramObject, LLShaderMgr::instance()->mShaderObjects[object]); diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h index 6311d8410..2f64b0c9f 100644 --- a/indra/llrender/llglslshader.h +++ b/indra/llrender/llglslshader.h @@ -82,7 +82,9 @@ public: void unload(); BOOL createShader(std::vector * attributes, - std::vector * uniforms); + std::vector * uniforms, + U32 varying_count = 0, + const char** varyings = NULL); BOOL attachObject(std::string object); void attachObject(GLhandleARB object); void attachObjects(GLhandleARB* objects = NULL, S32 count = 0); diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 7064a2c85..1e698adfc 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -42,13 +42,17 @@ #include "llmath.h" #include "llgl.h" +#include "llglslshader.h" #include "llrender.h" -//---------------------------------------------------------------------------- +//---------------------------------------------------------------------------- const F32 MIN_TEXTURE_LIFETIME = 10.f; +//which power of 2 is i? +//assumes i is a power of 2 > 0 +U32 wpo2(U32 i); + //statics -LLGLuint LLImageGL::sCurrentBoundTextures[MAX_GL_TEXTURE_UNITS] = { 0 }; U32 LLImageGL::sUniqueCount = 0; U32 LLImageGL::sBindCount = 0; @@ -56,7 +60,8 @@ S32 LLImageGL::sGlobalTextureMemoryInBytes = 0; S32 LLImageGL::sBoundTextureMemoryInBytes = 0; S32 LLImageGL::sCurBoundTextureMemory = 0; S32 LLImageGL::sCount = 0; -std::list LLImageGL::sDeadTextureList; +LLImageGL::dead_texturelist_t LLImageGL::sDeadTextureList[LLTexUnit::TT_NONE]; +U32 LLImageGL::sCurTexName = 1; BOOL LLImageGL::sGlobalUseAnisotropic = FALSE; F32 LLImageGL::sLastFrameTime = 0.f; @@ -79,7 +84,7 @@ std::vector LLImageGL::sTextureCurBoundCounter(MAX_TEXTURE_LOG_SIZE + 1) ; S32 LLImageGL::sCurTexSizeBar = -1 ; S32 LLImageGL::sCurTexPickSize = -1 ; LLPointer LLImageGL::sHighlightTexturep = NULL; -S32 LLImageGL::sMaxCatagories = 1 ; +S32 LLImageGL::sMaxCategories = 1 ; std::vector LLImageGL::sTextureMemByCategory; std::vector LLImageGL::sTextureMemByCategoryBound ; @@ -181,11 +186,11 @@ BOOL is_little_endian() //static void LLImageGL::initClass(S32 num_catagories) { - sMaxCatagories = num_catagories ; + sMaxCategories = num_catagories ; - sTextureMemByCategory.resize(sMaxCatagories); - sTextureMemByCategoryBound.resize(sMaxCatagories) ; - sTextureCurMemByCategoryBound.resize(sMaxCatagories) ; + sTextureMemByCategory.resize(sMaxCategories); + sTextureMemByCategoryBound.resize(sMaxCategories) ; + sTextureCurMemByCategoryBound.resize(sMaxCategories) ; } //static @@ -347,7 +352,10 @@ void LLImageGL::destroyGL(BOOL save_state) glimage->mSaveData = NULL ; } else + { + glimage->mSaveDiscardLevel = glimage->mCurrentDiscardLevel; stored_count++; + } } glimage->destroyGLTexture(); @@ -374,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; @@ -425,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); @@ -434,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); @@ -444,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); @@ -493,8 +502,9 @@ void LLImageGL::init(BOOL usemipmaps) mAllowCompression = true; mTarget = GL_TEXTURE_2D; - mBindTarget = LLTexUnit::TT_TEXTURE; - mHasMipMaps = false; + mBindTarget = LLTexUnit::TT_TEXTURE; + mHasMipMaps = false; + mMipLevels = -1; mIsResident = 0; @@ -679,19 +689,32 @@ void LLImageGL::setImage(const LLImageRaw* imageraw) void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips) { -// LLFastTimer t1(FTM_TEMP1); bool is_compressed = false; if (mFormatPrimary >= GL_COMPRESSED_RGBA_S3TC_DXT1_EXT && mFormatPrimary <= GL_COMPRESSED_RGBA_S3TC_DXT5_EXT) { is_compressed = true; } -// LLFastTimer t2(FTM_TEMP2); - llverify(gGL.getTexUnit(0)->bind(this)); + + + if (mUseMipMaps) + { + //set has mip maps to true before binding image so tex parameters get set properly + gGL.getTexUnit(0)->unbind(mBindTarget); + mHasMipMaps = true; + mTexOptionsDirty = true; + setFilteringOption(LLTexUnit::TFO_ANISOTROPIC); + } + else + { + mHasMipMaps = false; + } + + llverify(gGL.getTexUnit(0)->bind(this)); + if (mUseMipMaps) { -// LLFastTimer t2(FTM_TEMP3); if (data_hasmips) { // NOTE: data_in points to largest image; smaller images @@ -702,6 +725,9 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips) S32 w = getWidth(d); S32 h = getHeight(d); S32 gl_level = d-mCurrentDiscardLevel; + + mMipLevels = llmax(mMipLevels, gl_level); + if (d > mCurrentDiscardLevel) { data_in -= dataFormatBytes(mFormatPrimary, w, h); // see above comment @@ -745,10 +771,6 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips) { if (mAutoGenMips) { - if (!gGLManager.mHasFramebufferObject) - { - glTexParameteri(LLTexUnit::getInternalType(mBindTarget), GL_GENERATE_MIPMAP_SGIS, TRUE); - } stop_glerror(); { // LLFastTimer t2(FTM_TEMP4); @@ -762,6 +784,11 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips) S32 w = getWidth(mCurrentDiscardLevel); S32 h = getHeight(mCurrentDiscardLevel); + mMipLevels = wpo2(llmax(w, h)); + + //use legacy mipmap generation mode + glTexParameteri(mTarget, GL_GENERATE_MIPMAP, GL_TRUE); + LLImageGL::setManualImage(mTarget, 0, mFormatInternal, w, h, mFormatPrimary, mFormatType, @@ -777,17 +804,10 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips) stop_glerror(); } } - - if (gGLManager.mHasFramebufferObject) - { - //GL_EXT_framebuffer_object implies glGenerateMipmap - glGenerateMipmap(LLTexUnit::getInternalType(mBindTarget)); - } } else { // Create mips by hand - // about 30% faster than autogen on ATI 9800, 50% slower on nVidia 4800 // ~4x faster than gluBuild2DMipmaps S32 width = getWidth(mCurrentDiscardLevel); S32 height = getHeight(mCurrentDiscardLevel); @@ -797,6 +817,9 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips) const U8* cur_mip_data = 0; S32 prev_mip_size = 0; S32 cur_mip_size = 0; + + mMipLevels = nummips; + for (int m=0; msecond.empty(); + } + + for (S32 i = 0; i < numTextures; ++i) + { + if (!empty) + { + textures[i] = iter->second.front(); + iter->second.pop_front(); + empty = iter->second.empty(); + } + else + { + textures[i] = sCurTexName++; + } + } } // static -void LLImageGL::deleteTextures(S32 numTextures, U32 *textures, bool immediate) +void LLImageGL::deleteTextures(LLTexUnit::eTextureType type, U32 format, S32 mip_levels, S32 numTextures, U32 *textures, bool immediate) { - for (S32 i = 0; i < numTextures; i++) + if (gGLManager.mInited) { - sDeadTextureList.push_back(textures[i]); - } + if (format == 0 || type == LLTexUnit::TT_CUBE_MAP || mip_levels == -1) + { //unknown internal format or unknown number of mip levels, not safe to reuse + glDeleteTextures(numTextures, textures); + } + else + { + for (S32 i = 0; i < numTextures; ++i) + { //remove texture from VRAM by setting its size to zero + for (S32 j = 0; j <= mip_levels; j++) + { + gGL.getTexUnit(0)->bindManual(type, textures[i]); - if (immediate) + glTexImage2D(LLTexUnit::getInternalType(type), j, format, 0, 0, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); + } + + llassert(std::find(sDeadTextureList[type][format].begin(), + sDeadTextureList[type][format].end(), textures[i]) == + sDeadTextureList[type][format].end()); + + sDeadTextureList[type][format].push_back(textures[i]); + } + } + } + + /*if (immediate) { LLImageGL::deleteDeadTextures(); - } + }*/ } // static @@ -1162,10 +1225,11 @@ BOOL LLImageGL::createGLTexture() if(mTexName) { - glDeleteTextures(1, (reinterpret_cast(&mTexName))) ; + LLImageGL::deleteTextures(mBindTarget, mFormatInternal, mMipLevels, 1, (reinterpret_cast(&mTexName))) ; } - glGenTextures(1, (GLuint*)&mTexName); + + LLImageGL::generateTextures(mBindTarget, mFormatInternal, 1, &mTexName); stop_glerror(); if (!mTexName) { @@ -1279,7 +1343,7 @@ BOOL LLImageGL::createGLTexture(S32 discard_level, const U8* data_in, BOOL data_ } else { - LLImageGL::generateTextures(1, &mTexName); + LLImageGL::generateTextures(mBindTarget, mFormatInternal, 1, &mTexName); stop_glerror(); { llverify(gGL.getTexUnit(0)->bind(this)); @@ -1329,7 +1393,7 @@ BOOL LLImageGL::createGLTexture(S32 discard_level, const U8* data_in, BOOL data_ decTextureCounter(mTextureMemory, mComponents, mCategory) ; } - LLImageGL::deleteTextures(1, &old_name); + LLImageGL::deleteTextures(mBindTarget, mFormatInternal, mMipLevels, 1, &old_name); stop_glerror(); } @@ -1345,59 +1409,6 @@ BOOL LLImageGL::createGLTexture(S32 discard_level, const U8* data_in, BOOL data_ mLastBindTime = sLastFrameTime; return TRUE; } -#if 0 -BOOL LLImageGL::setDiscardLevel(S32 discard_level) -{ - llassert(discard_level >= 0); - llassert(mCurrentDiscardLevel >= 0); - - discard_level = llclamp(discard_level, 0, (S32)mMaxDiscardLevel); - - if (mDontDiscard) - { - // don't discard! - return FALSE; - } - else if (discard_level == mCurrentDiscardLevel) - { - // nothing to do - return FALSE; - } - else if (discard_level < mCurrentDiscardLevel) - { - // larger image - dump(); - llerrs << "LLImageGL::setDiscardLevel() called with larger discard level; use createGLTexture()" << llendl; - return FALSE; - } - else if (mUseMipMaps) - { - LLPointer imageraw = new LLImageRaw; - while(discard_level > mCurrentDiscardLevel) - { - if (readBackRaw(discard_level, imageraw, false)) - { - break; - } - discard_level--; - } - if (discard_level == mCurrentDiscardLevel) - { - // unable to increase the discard level - return FALSE; - } - return createGLTexture(discard_level, imageraw); - } - else - { -#if !LL_LINUX && !LL_SOLARIS - // *FIX: This should not be skipped for the linux client. - llerrs << "LLImageGL::setDiscardLevel() called on image without mipmaps" << llendl; -#endif - return FALSE; - } -} -#endif BOOL LLImageGL::readBackRaw(S32 discard_level, LLImageRaw* imageraw, bool compressed_ok) { @@ -1408,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 ) @@ -1515,28 +1528,32 @@ void LLImageGL::deleteDeadTextures() { bool reset = false; - while (!sDeadTextureList.empty()) + for(U32 i=0;igetCurrTexture() == tex) + while(!it->second.empty()) { - tex_unit->unbind(tex_unit->getCurrType()); - stop_glerror(); - - if (i > 0) + GLuint tex = it->second.front(); + it->second.pop_front(); + for (int j = 0; j < gGLManager.mNumTextureImageUnits; j++) { - reset = true; + LLTexUnit* tex_unit = gGL.getTexUnit(j); + if (tex_unit && tex_unit->getCurrTexture() == tex) + { + tex_unit->unbind(tex_unit->getCurrType()); + stop_glerror(); + + if (i > 0) + { + reset = true; + } + } } + glDeleteTextures(1, &tex); + stop_glerror(); } } - - glDeleteTextures(1, &tex); - stop_glerror(); } if (reset) @@ -1559,9 +1576,9 @@ void LLImageGL::destroyGLTexture() mTextureMemory = 0; } - LLImageGL::deleteTextures(1, &mTexName); - mTexName = 0; + LLImageGL::deleteTextures(mBindTarget, mFormatInternal, mMipLevels, 1, &mTexName); mCurrentDiscardLevel = -1 ; //invalidate mCurrentDiscardLevel. + mTexName = 0; mGLTextureCreated = FALSE ; } } @@ -1997,7 +2014,7 @@ void LLImageGL::setCategory(S32 category) { sTextureMemByCategory[mCategory] -= mTextureMemory ; } - if(category > -1 && category < sMaxCatagories) + if(category > -1 && category < sMaxCategories) { sTextureMemByCategory[category] += mTextureMemory ; mCategory = category; diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h index 37b997199..a80dd0998 100644 --- a/indra/llrender/llimagegl.h +++ b/indra/llrender/llimagegl.h @@ -2,31 +2,25 @@ * @file llimagegl.h * @brief Object for managing images and their textures * - * $LicenseInfo:firstyear=2001&license=viewergpl$ - * - * Copyright (c) 2001-2009, Linden Research, Inc. - * + * $LicenseInfo:firstyear=2001&license=viewerlgpl$ * 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 + * Copyright (C) 2010, Linden Research, Inc. * - * 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 + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. * - * 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. + * 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. * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -51,8 +45,16 @@ class LLImageGL : public LLRefCount { friend class LLTexUnit; public: - static std::list sDeadTextureList; + static U32 sCurTexName; + //previously used but now available texture names + // sDeadTextureList[][] + typedef std::map > dead_texturelist_t; + static dead_texturelist_t sDeadTextureList[LLTexUnit::TT_NONE]; + + // These 2 functions replace glGenTextures() and glDeleteTextures() + static void generateTextures(LLTexUnit::eTextureType type, U32 format, S32 numTextures, U32 *textures); + static void deleteTextures(LLTexUnit::eTextureType type, U32 format, S32 mip_levels, S32 numTextures, U32 *textures, bool immediate = false); static void deleteDeadTextures(); // Size calculation @@ -102,15 +104,11 @@ public: void setComponents(S32 ncomponents) { mComponents = (S8)ncomponents ;} void setAllowCompression(bool allow) { mAllowCompression = allow; } - // These 3 functions currently wrap glGenTextures(), glDeleteTextures(), and glTexImage2D() - // for tracking purposes and will be deprecated in the future - static void generateTextures(S32 numTextures, U32 *textures); - static void deleteTextures(S32 numTextures, U32 *textures, bool immediate = false); static void setManualImage(U32 target, S32 miplevel, S32 intformat, S32 width, S32 height, U32 pixformat, U32 pixtype, const void *pixels, bool allow_compression = true); BOOL createGLTexture() ; - BOOL createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S32 usename = 0, BOOL to_create = TRUE, - S32 category = sMaxCatagories - 1); + BOOL createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S32 usename = 0, BOOL to_create = TRUE, + S32 category = sMaxCategories-1); BOOL createGLTexture(S32 discard_level, const U8* data, BOOL data_hasmips = FALSE, S32 usename = 0); void setImage(const LLImageRaw* imageraw); void setImage(const U8* data_in, BOOL data_hasmips = FALSE); @@ -185,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; @@ -209,7 +208,8 @@ protected: LLGLenum mTarget; // Normally GL_TEXTURE2D, sometimes something else (ex. cube maps) LLTexUnit::eTextureType mBindTarget; // Normally TT_TEXTURE, sometimes something else (ex. cube maps) bool mHasMipMaps; - + S32 mMipLevels; + LLGLboolean mIsResident; S8 mComponents; @@ -232,8 +232,6 @@ public: static F32 sLastFrameTime; - static LLGLuint sCurrentBoundTextures[MAX_GL_TEXTURE_UNITS]; // Currently bound texture ID - // Global memory statistics static S32 sGlobalTextureMemoryInBytes; // Tracks main memory texmem static S32 sBoundTextureMemoryInBytes; // Tracks bound texmem for last completed frame @@ -255,7 +253,7 @@ public: static void initClass(S32 num_catagories) ; static void cleanupClass() ; private: - static S32 sMaxCatagories ; + static S32 sMaxCategories ; //the flag to allow to call readBackRaw(...). //can be removed if we do not use that function at all. diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index f8a8db2b4..d73b17a51 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -422,12 +422,14 @@ void LLTexUnit::unbind(eTextureType type) if (mIndex < 0) return; + //always flush and activate for consistency + // some code paths assume unbind always flushes and sets the active texture + gGL.flush(); + activate(); + // Disabled caching of binding state. if (mCurrTexType == type) { - gGL.flush(); - - activate(); mCurrTexture = 0; if (LLGLSLShader::sNoFixedFunction && type == LLTexUnit::TT_TEXTURE) { @@ -478,11 +480,25 @@ void LLTexUnit::setTextureFilteringOption(LLTexUnit::eTextureFilterOptions optio } else if (option >= TFO_BILINEAR) { - glTexParameteri(sGLTextureType[mCurrTexType], GL_TEXTURE_MIN_FILTER, GL_LINEAR); + if (mHasMipMaps) + { + glTexParameteri(sGLTextureType[mCurrTexType], GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST); + } + else + { + glTexParameteri(sGLTextureType[mCurrTexType], GL_TEXTURE_MIN_FILTER, GL_LINEAR); + } } else { - glTexParameteri(sGLTextureType[mCurrTexType], GL_TEXTURE_MIN_FILTER, GL_NEAREST); + if (mHasMipMaps) + { + glTexParameteri(sGLTextureType[mCurrTexType], GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST); + } + else + { + glTexParameteri(sGLTextureType[mCurrTexType], GL_TEXTURE_MIN_FILTER, GL_NEAREST); + } } if (gGLManager.mHasAnisotropic) diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp index ff7689058..6ea20e977 100644 --- a/indra/llrender/llrendertarget.cpp +++ b/indra/llrender/llrendertarget.cpp @@ -61,7 +61,6 @@ bool LLRenderTarget::sUseFBO = false; LLRenderTarget::LLRenderTarget() : mResX(0), mResY(0), - mTex(0), mFBO(0), mDepth(0), mStencil(0), @@ -149,7 +148,7 @@ bool LLRenderTarget::addColorAttachment(U32 color_fmt) } U32 tex; - LLImageGL::generateTextures(1, &tex); + LLImageGL::generateTextures(mUsage, color_fmt, 1, &tex); gGL.getTexUnit(0)->bindManual(mUsage, tex); stop_glerror(); @@ -207,6 +206,7 @@ bool LLRenderTarget::addColorAttachment(U32 color_fmt) } mTex.push_back(tex); + mInternalFormat.push_back(color_fmt); if (gDebugGL) { //bind and unbind to validate target @@ -231,7 +231,7 @@ bool LLRenderTarget::allocateDepth() } else { - LLImageGL::generateTextures(1, &mDepth); + LLImageGL::generateTextures(mUsage, GL_DEPTH_COMPONENT24, 1, &mDepth); gGL.getTexUnit(0)->bindManual(mUsage, mDepth); U32 internal_type = LLTexUnit::getInternalType(mUsage); @@ -308,7 +308,7 @@ void LLRenderTarget::release() } else { - LLImageGL::deleteTextures(1, &mDepth, true); + LLImageGL::deleteTextures(mUsage, 0, 0, 1, &mDepth, true); stop_glerror(); } mDepth = 0; @@ -340,8 +340,9 @@ void LLRenderTarget::release() if (mTex.size() > 0) { sBytesAllocated -= mResX*mResY*4*mTex.size(); - LLImageGL::deleteTextures(mTex.size(), &mTex[0], true); + LLImageGL::deleteTextures(mUsage, mInternalFormat[0], 0, mTex.size(), &mTex[0], true); mTex.clear(); + mInternalFormat.clear(); } mResX = mResY = 0; diff --git a/indra/llrender/llrendertarget.h b/indra/llrender/llrendertarget.h index 4051b3e9b..9ed95770e 100644 --- a/indra/llrender/llrendertarget.h +++ b/indra/llrender/llrendertarget.h @@ -152,6 +152,7 @@ protected: U32 mResX; U32 mResY; std::vector mTex; + std::vector mInternalFormat; U32 mFBO; U32 mDepth; bool mStencil; diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index a9265e5ff..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 @@ -1069,6 +1082,9 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("size"); mReservedUniforms.push_back("falloff"); + mReservedUniforms.push_back("box_center"); + mReservedUniforms.push_back("box_size"); + mReservedUniforms.push_back("minLuminance"); mReservedUniforms.push_back("maxExtractAlpha"); diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index f56b1db7b..b06d61b3e 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -97,6 +97,8 @@ public: LIGHT_CENTER, LIGHT_SIZE, LIGHT_FALLOFF, + BOX_CENTER, + BOX_SIZE, GLOW_MIN_LUMINANCE, GLOW_MAX_EXTRACT_ALPHA, diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index e339c9cd4..bc4c201d9 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -101,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; @@ -116,60 +116,6 @@ bool LLVertexBuffer::sUseStreamDraw = true; bool LLVertexBuffer::sUseVAO = false; bool LLVertexBuffer::sPreferStreamDraw = false; -const U32 FENCE_WAIT_TIME_NANOSECONDS = 10000; //1 ms - -class LLGLSyncFence : public LLGLFence -{ -public: -#ifdef GL_ARB_sync - GLsync mSync; -#endif - - LLGLSyncFence() - { -#ifdef GL_ARB_sync - mSync = 0; -#endif - } - - virtual ~LLGLSyncFence() - { -#ifdef GL_ARB_sync - if (mSync) - { - glDeleteSync(mSync); - } -#endif - } - - void placeFence() - { -#ifdef GL_ARB_sync - if (mSync) - { - glDeleteSync(mSync); - } - mSync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0); -#endif - } - - void wait() - { -#ifdef GL_ARB_sync - if (mSync) - { - while (glClientWaitSync(mSync, 0, FENCE_WAIT_TIME_NANOSECONDS) == GL_TIMEOUT_EXPIRED) - { //track the number of times we've waited here - static S32 waits = 0; - waits++; - } - } -#endif - } - - -}; - volatile U8* LLVBOPool::allocate(U32& name, U32 size) { @@ -792,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) { diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h index 0ab73af1d..469acfcef 100644 --- a/indra/llrender/llvertexbuffer.h +++ b/indra/llrender/llvertexbuffer.h @@ -85,13 +85,6 @@ public: std::vector mFreeList; }; -class LLGLFence -{ -public: - virtual void placeFence() = 0; - virtual void wait() = 0; - virtual ~LLGLFence() {} -}; //============================================================================ // base class 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/llvfs/lldiriterator.cpp b/indra/llvfs/lldiriterator.cpp index a0f319a90..0d1c4b37f 100644 --- a/indra/llvfs/lldiriterator.cpp +++ b/indra/llvfs/lldiriterator.cpp @@ -133,7 +133,7 @@ bool LLDirIterator::Impl::next(std::string &fname) #else std::string name = mIter->path().filename(); #endif - if (found = boost::regex_match(name, match, mFilterExp)) + if ((found = boost::regex_match(name, match, mFilterExp))) { fname = name; } 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/CA.pem b/indra/newview/app_settings/CA.pem index 63bb036c9..8c1b9a1f3 100644 --- a/indra/newview/app_settings/CA.pem +++ b/indra/newview/app_settings/CA.pem @@ -1,362 +1,322 @@ -----BEGIN CERTIFICATE----- -MIIEuDCCA6CgAwIBAgIBBDANBgkqhkiG9w0BAQUFADCBtDELMAkGA1UEBhMCQlIx -EzARBgNVBAoTCklDUC1CcmFzaWwxPTA7BgNVBAsTNEluc3RpdHV0byBOYWNpb25h -bCBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWFjYW8gLSBJVEkxETAPBgNVBAcTCEJy -YXNpbGlhMQswCQYDVQQIEwJERjExMC8GA1UEAxMoQXV0b3JpZGFkZSBDZXJ0aWZp -Y2Fkb3JhIFJhaXogQnJhc2lsZWlyYTAeFw0wMTExMzAxMjU4MDBaFw0xMTExMzAy -MzU5MDBaMIG0MQswCQYDVQQGEwJCUjETMBEGA1UEChMKSUNQLUJyYXNpbDE9MDsG -A1UECxM0SW5zdGl0dXRvIE5hY2lvbmFsIGRlIFRlY25vbG9naWEgZGEgSW5mb3Jt -YWNhbyAtIElUSTERMA8GA1UEBxMIQnJhc2lsaWExCzAJBgNVBAgTAkRGMTEwLwYD -VQQDEyhBdXRvcmlkYWRlIENlcnRpZmljYWRvcmEgUmFpeiBCcmFzaWxlaXJhMIIB -IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPMudwX/hvm+Uh2b/lQAcHVA -isamaLkWdkwP9/S/tOKIgRrL6Oy+ZIGlOUdd6uYtk9Ma/3pUpgcfNAj0vYm5gsyj -Qo9emsc+x6m4VWwk9iqMZSCK5EQkAq/Ut4n7KuLE1+gdftwdIgxfUsPt4CyNrY50 -QV57KM2UT8x5rrmzEjr7TICGpSUAl2gVqe6xaii+bmYR1QrmWaBSAG59LrkrjrYt -bRhFboUDe1DK+6T8s5L6k8c8okpbHpa9veMztDVC9sPJ60MWXh6anVKo1UcLcbUR -yEeNvZneVRKAAU6ouwdjDvwlsaKydFKwed0ToQ47bmUKgcm+wV3eTRk36UOnTwID -AQABo4HSMIHPME4GA1UdIARHMEUwQwYFYEwBAQAwOjA4BggrBgEFBQcCARYsaHR0 -cDovL2FjcmFpei5pY3BicmFzaWwuZ292LmJyL0RQQ2FjcmFpei5wZGYwPQYDVR0f -BDYwNDAyoDCgLoYsaHR0cDovL2FjcmFpei5pY3BicmFzaWwuZ292LmJyL0xDUmFj -cmFpei5jcmwwHQYDVR0OBBYEFIr68VeEERM1kEL6V0lUaQ2kxPA3MA8GA1UdEwEB -/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAZA5c1 -U/hgIh6OcgLAfiJgFWpvmDZWqlV30/bHFpj8iBobJSm5uDpt7TirYh1Uxe3fQaGl -YjJe+9zd+izPRbBqXPVQA34EXcwk4qpWuf1hHriWfdrx8AcqSqr6CuQFwSr75Fos -SzlwDADa70mT7wZjAmQhnZx2xJ6wfWlT9VQfS//JYeIc7Fue2JNLd00UOSMMaiK/ -t79enKNHEA2fupH3vEigf5Eh4bVAN5VohrTm6MY53x7XQZZr1ME7a55lFEnSeT0u -mlOAjR2mAbvSM5X5oSZNrmetdzyTj2flCM8CC7MLab0kkdngRIlUBGHF1/S5nmPb -K+9A46sd33oqK8n8 +MIIDfTCCAuagAwIBAgIDErvmMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT +MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0 +aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDIwNTIxMDQwMDAwWhcNMTgwODIxMDQwMDAw +WjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UE +AxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB +CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9m +OSm9BXiLnTjoBbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIu +T8rxh0PBFpVXLVDviS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6c +JmTM386DGXHKTubU1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmR +Cw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5asz +PeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo4HwMIHtMB8GA1UdIwQYMBaAFEjm +aPkr0rKV10fYIyAQTzOYkJ/UMB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrM +TjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjA6BgNVHR8EMzAxMC+g +LaArhilodHRwOi8vY3JsLmdlb3RydXN0LmNvbS9jcmxzL3NlY3VyZWNhLmNybDBO +BgNVHSAERzBFMEMGBFUdIAAwOzA5BggrBgEFBQcCARYtaHR0cHM6Ly93d3cuZ2Vv +dHJ1c3QuY29tL3Jlc291cmNlcy9yZXBvc2l0b3J5MA0GCSqGSIb3DQEBBQUAA4GB +AHbhEm5OSxYShjAGsoEIz/AIx8dxfmbuwu3UOx//8PDITtZDOLC5MH0Y0FWDomrL +NhGc6Ehmo21/uBPUR/6LWlxz/K7ZGzIZOKuXNBSqltLroxwUCEm2u+WR74M26x1W +b8ravHNjkOR/ez4iyz0H7V84dJzjA1BOoa+Y7mHyhD8S -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIGCDCCA/CgAwIBAgIBATANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290 -IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB -IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA -Y2FjZXJ0Lm9yZzAeFw0wNTEwMTQwNzM2NTVaFw0zMzAzMjgwNzM2NTVaMFQxFDAS -BgNVBAoTC0NBY2VydCBJbmMuMR4wHAYDVQQLExVodHRwOi8vd3d3LkNBY2VydC5v -cmcxHDAaBgNVBAMTE0NBY2VydCBDbGFzcyAzIFJvb3QwggIiMA0GCSqGSIb3DQEB -AQUAA4ICDwAwggIKAoICAQCrSTURSHzSJn5TlM9Dqd0o10Iqi/OHeBlYfA+e2ol9 -4fvrcpANdKGWZKufoCSZc9riVXbHF3v1BKxGuMO+f2SNEGwk82GcwPKQ+lHm9WkB -Y8MPVuJKQs/iRIwlKKjFeQl9RrmK8+nzNCkIReQcn8uUBByBqBSzmGXEQ+xOgo0J -0b2qW42S0OzekMV/CsLj6+YxWl50PpczWejDAz1gM7/30W9HxM3uYoNSbi4ImqTZ -FRiRpoWSR7CuSOtttyHshRpocjWr//AQXcD0lKdq1TuSfkyQBX6TwSyLpI5idBVx -bgtxA+qvFTia1NIFcm+M+SvrWnIl+TlG43IbPgTDZCciECqKT1inA62+tC4T7V2q -SNfVfdQqe1z6RgRQ5MwOQluM7dvyz/yWk+DbETZUYjQ4jwxgmzuXVjit89Jbi6Bb -6k6WuHzX1aCGcEDTkSm3ojyt9Yy7zxqSiuQ0e8DYbF/pCsLDpyCaWt8sXVJcukfV -m+8kKHA4IC/VfynAskEDaJLM4JzMl0tF7zoQCqtwOpiVcK01seqFK6QcgCExqa5g -eoAmSAC4AcCTY1UikTxW56/bOiXzjzFU6iaLgVn5odFTEcV7nQP2dBHgbbEsPyyG -kZlxmqZ3izRg0RS0LKydr4wQ05/EavhvE/xzWfdmQnQeiuP43NJvmJzLR5iVQAX7 -6QIDAQABo4G/MIG8MA8GA1UdEwEB/wQFMAMBAf8wXQYIKwYBBQUHAQEEUTBPMCMG -CCsGAQUFBzABhhdodHRwOi8vb2NzcC5DQWNlcnQub3JnLzAoBggrBgEFBQcwAoYc -aHR0cDovL3d3dy5DQWNlcnQub3JnL2NhLmNydDBKBgNVHSAEQzBBMD8GCCsGAQQB -gZBKMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9yZy9pbmRleC5w -aHA/aWQ9MTAwDQYJKoZIhvcNAQEEBQADggIBAH8IiKHaGlBJ2on7oQhy84r3HsQ6 -tHlbIDCxRd7CXdNlafHCXVRUPIVfuXtCkcKZ/RtRm6tGpaEQU55tiKxzbiwzpvD0 -nuB1wT6IRanhZkP+VlrRekF490DaSjrxC1uluxYG5sLnk7mFTZdPsR44Q4Dvmw2M -77inYACHV30eRBzLI++bPJmdr7UpHEV5FpZNJ23xHGzDwlVks7wU4vOkHx4y/CcV -Bc/dLq4+gmF78CEQGPZE6lM5+dzQmiDgxrvgu1pPxJnIB721vaLbLmINQjRBvP+L -ivVRIqqIMADisNS8vmW61QNXeZvo3MhN+FDtkaVSKKKs+zZYPumUK5FQhxvWXtaM -zPcPEAxSTtAWYeXlCmy/F8dyRlecmPVsYGN6b165Ti/Iubm7aoW8mA3t+T6XhDSU -rgCvoeXnkm5OvfPi2RSLXNLrAWygF6UtEOucekq9ve7O/e0iQKtwOIj1CodqwqsF -YMlIBdpTwd5Ed2qz8zw87YC8pjhKKSRf/lk7myV6VmMAZLldpGJ9VzZPrYPvH5JT -oI53V93lYRE9IwCQTDz6o2CTBKOvNfYOao9PSmCnhQVsRqGP9Md246FZV/dxssRu -FFxtbUFm3xuTsdQAw+7Lzzw9IYCpX2Nl/N3gX6T0K/CFcUHUZyX7GrGXrtaZghNB -0m6lG5kngOcLqagA +MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEW +MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg +Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM3WhcNMzYwOTE3MTk0NjM2WjB9 +MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi +U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh +cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA +A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk +pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf +OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C +Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT +Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi +HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM +Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w ++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+ +Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3 +Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B +26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID +AQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD +VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFul +F2mHMMo0aEPQQa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCC +ATgwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5w +ZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVk +aWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENvbW1lcmNpYWwgKFN0 +YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0aGUg +c2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0 +aWZpY2F0aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93 +d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgG +CWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1 +dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5fPGFf59Jb2vKXfuM/gTF +wWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWmN3PH/UvS +Ta0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst +0OcNOrg+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNc +pRJvkrKTlMeIFw6Ttn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKl +CcWw0bdT82AUuoVpaiF8H3VhFyAXe2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVF +P0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA2MFrLH9ZXF2RsXAiV+uKa0hK +1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBsHvUwyKMQ5bLm +KhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE +JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ +8dCAWZvLMdibD4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnm +fyWl8kgAwKQB2j8= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290 -IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB -IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA -Y2FjZXJ0Lm9yZzAeFw0wMzAzMzAxMjI5NDlaFw0zMzAzMjkxMjI5NDlaMHkxEDAO -BgNVBAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEi -MCAGA1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJ -ARYSc3VwcG9ydEBjYWNlcnQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC -CgKCAgEAziLA4kZ97DYoB1CW8qAzQIxL8TtmPzHlawI229Z89vGIj053NgVBlfkJ -8BLPRoZzYLdufujAWGSuzbCtRRcMY/pnCujW0r8+55jE8Ez64AO7NV1sId6eINm6 -zWYyN3L69wj1x81YyY7nDl7qPv4coRQKFWyGhFtkZip6qUtTefWIonvuLwphK42y -fk1WpRPs6tqSnqxEQR5YYGUFZvjARL3LlPdCfgv3ZWiYUQXw8wWRBB0bF4LsyFe7 -w2t6iPGwcswlWyCR7BYCEo8y6RcYSNDHBS4CMEK4JZwFaz+qOqfrU0j36NK2B5jc -G8Y0f3/JHIJ6BVgrCFvzOKKrF11myZjXnhCLotLddJr3cQxyYN/Nb5gznZY0dj4k -epKwDpUeb+agRThHqtdB7Uq3EvbXG4OKDy7YCbZZ16oE/9KTfWgu3YtLq1i6L43q -laegw1SJpfvbi1EinbLDvhG+LJGGi5Z4rSDTii8aP8bQUWWHIbEZAWV/RRyH9XzQ -QUxPKZgh/TMfdQwEUfoZd9vUFBzugcMd9Zi3aQaRIt0AUMyBMawSB3s42mhb5ivU -fslfrejrckzzAeVLIL+aplfKkQABi6F1ITe1Yw1nPkZPcCBnzsXWWdsC4PDSy826 -YreQQejdIOQpvGQpQsgi3Hia/0PsmBsJUUtaWsJx8cTLc6nloQsCAwEAAaOCAc4w -ggHKMB0GA1UdDgQWBBQWtTIb1Mfz4OaO873SsDrusjkY0TCBowYDVR0jBIGbMIGY -gBQWtTIb1Mfz4OaO873SsDrusjkY0aF9pHsweTEQMA4GA1UEChMHUm9vdCBDQTEe -MBwGA1UECxMVaHR0cDovL3d3dy5jYWNlcnQub3JnMSIwIAYDVQQDExlDQSBDZXJ0 -IFNpZ25pbmcgQXV0aG9yaXR5MSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGNhY2Vy -dC5vcmeCAQAwDwYDVR0TAQH/BAUwAwEB/zAyBgNVHR8EKzApMCegJaAjhiFodHRw -czovL3d3dy5jYWNlcnQub3JnL3Jldm9rZS5jcmwwMAYJYIZIAYb4QgEEBCMWIWh0 -dHBzOi8vd3d3LmNhY2VydC5vcmcvcmV2b2tlLmNybDA0BglghkgBhvhCAQgEJxYl -aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMDBWBglghkgBhvhC -AQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNlcnRpZmljYXRlIGZvciBGUkVFIGhlYWQg -b3ZlciB0byBodHRwOi8vd3d3LmNhY2VydC5vcmcwDQYJKoZIhvcNAQEEBQADggIB -ACjH7pyCArpcgBLKNQodgW+JapnM8mgPf6fhjViVPr3yBsOQWqy1YPaZQwGjiHCc -nWKdpIevZ1gNMDY75q1I08t0AoZxPuIrA2jxNGJARjtT6ij0rPtmlVOKTV39O9lg -18p5aTuxZZKmxoGCXJzN600BiqXfEVWqFcofN8CCmHBh22p8lqOOLlQ+TyGpkO/c -gr/c6EWtTZBzCDyUZbAEmXZ/4rzCahWqlwQ3JNgelE5tDlG+1sSPypZt90Pf6DBl -Jzt7u0NDY8RD97LsaMzhGY4i+5jhe1o+ATc7iwiwovOVThrLm82asduycPAtStvY -sONvRUgzEv/+PDIqVPfE94rwiCPCR/5kenHA0R6mY7AHfqQv0wGP3J8rtsYIqQ+T -SCX8Ev2fQtzzxD72V7DX3WnRBnc0CkvSyqD/HMaMyRa+xMwyN2hzXwj7UfdJUzYF -CpUCTPJ5GhD22Dp1nPMd8aINcGeGG7MW9S/lpOt5hvk9C8JzC6WZrG/8Z7jlLwum -GCSNe9FINSkYQKyTYOGWhlC0elnYjyELn8+CkcY7v2vcB5G5l1YjqrZslMZIBjzk -zk6q5PYvCdxTby78dOs6Y5nCpqyJvKeyRKANihDjbPIky/qbn3BHLt4Ui9SyIAmW -omTxJBzcoTWcFbLUvFUufQb1nA5V9FrWk9p2rSVzTMVD +MIIEXDCCA0SgAwIBAgIEOGO5ZjANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML +RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp +bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5 +IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp +ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0xOTEy +MjQxODIwNTFaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3 +LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp +YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG +A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq +K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe +sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX +MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT +XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/ +HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH +4QIDAQABo3QwcjARBglghkgBhvhCAQEEBAMCAAcwHwYDVR0jBBgwFoAUVeSB0RGA +vtiJuQijMfmhJAkWuXAwHQYDVR0OBBYEFFXkgdERgL7YibkIozH5oSQJFrlwMB0G +CSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEA +WUesIYSKF8mciVMeuoCFGsY8Tj6xnLZ8xpJdGGQC49MGCBFhfGPjK50xA3B20qMo +oPS7mmNz7W3lKtvtFKkrxjYR0CvrB4ul2p5cGZ1WEvVUKcgF7bISKo30Axv/55IQ +h7A6tcOdBTcSo8f0FbnVpDkWm1M6I5HxqIKiaohowXkCIryqptau37AUX7iH0N18 +f3v/rxzP5tsHrV7bhZ3QKw0z2wTR5klAEyt2+z7pnIkPFc4YsIV4IU9rTw76NmfN +B/L/CNDi3tm/Kq+4h4YhPATKt5Rof8886ZjXOP/swNlQ8C5LWK5Gb9Auw2DaclVy +vUxFnmG6v4SBkgPR0ml8xQ== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIESzCCAzOgAwIBAgIJAJigUTEEXRQpMA0GCSqGSIb3DQEBBQUAMHYxCzAJBgNV -BAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xDjAMBgNVBAcTBUZ1bGRhMRAwDgYDVQQK -EwdEZWJjb25mMRMwEQYDVQQDEwpEZWJjb25mIENBMR8wHQYJKoZIhvcNAQkBFhBq -b2VyZ0BkZWJpYW4ub3JnMB4XDTA1MTEwNTE3NTUxNFoXDTE1MTEwMzE3NTUxNFow -djELMAkGA1UEBhMCREUxDzANBgNVBAgTBkhlc3NlbjEOMAwGA1UEBxMFRnVsZGEx -EDAOBgNVBAoTB0RlYmNvbmYxEzARBgNVBAMTCkRlYmNvbmYgQ0ExHzAdBgkqhkiG -9w0BCQEWEGpvZXJnQGRlYmlhbi5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -ggEKAoIBAQCvbOo0SrIwI5IMlsshH8WF3dHB9r9JlSKhMPaybawa1EyvZspMQ3wa -F5qxNf3Sj+NElEmjseEqvCZiIIzqwerHu0Qw62cDYCdCd2+Wb5m0bPYB5CGHiyU1 -eNP0je42O0YeXG2BvUujN8AviocVo39X2YwNQ0ryy4OaqYgm2pRlbtT2ESbF+SfV -Y2iqQj/f8ymF+lHo/pz8tbAqxWcqaSiHFAVQJrdqtFhtoodoNiE3q76zJoUkZTXB -k60Yc3MJSnatZCpnsSBr/D7zpntl0THrUjjtdRWCjQVhqfhM1yZJV+ApbLdheFh0 -ZWlSxdnp25p0q0XYw/7G92ELyFDfBUUNAgMBAAGjgdswgdgwHQYDVR0OBBYEFMuV -dFNb4mCWUFbcP5LOtxFLrEVTMIGoBgNVHSMEgaAwgZ2AFMuVdFNb4mCWUFbcP5LO -txFLrEVToXqkeDB2MQswCQYDVQQGEwJERTEPMA0GA1UECBMGSGVzc2VuMQ4wDAYD -VQQHEwVGdWxkYTEQMA4GA1UEChMHRGViY29uZjETMBEGA1UEAxMKRGViY29uZiBD -QTEfMB0GCSqGSIb3DQEJARYQam9lcmdAZGViaWFuLm9yZ4IJAJigUTEEXRQpMAwG -A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGZXxHg4mnkvilRIM1EQfGdY -S5b/WcyF2MYSTeTvK4aIB6VHwpZoZCnDGj2m2D3CkHT0upAD9o0zM1tdsfncLzV+ -mDT/jNmBtYo4QXx5vEPwvEIcgrWjwk7SyaEUhZjtolTkHB7ACl0oD0r71St4iEPR -qTUCEXk2E47bg1Fz58wNt/yo2+4iqiRjg1XCH4evkQuhpW+dTZnDyFNqwSYZapOE -TBA+9zBb6xD1KM2DdY7r4GiyYItN0BKLfuWbh9LXGbl1C+f4P11g+m2MPiavIeCe -1iazG5pcS3KoTLACsYlEX24TINtg4kcuS81XdllcnsV3Kdts0nIqPj6uhTTZD0k= +MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW +MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy +c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE +BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0 +IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV +VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8 +cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT +QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh +F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v +c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w +mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd +VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX +teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ +f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe +Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+ +nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB +/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY +MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG +9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc +aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX +IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn +ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z +uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN +Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja +QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW +koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9 +ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt +DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm +bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU -MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs -IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290 -MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux -FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h -bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v -dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt -H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9 -uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX -mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX -a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN -E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0 -WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD -VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0 -Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU -cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx -IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN -AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH -YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5 -6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC -Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX -c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a -mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ= +MIIDLTCCApagAwIBAgIBADANBgkqhkiG9w0BAQQFADCB0TELMAkGA1UEBhMCWkEx +FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYD +VQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBT +ZXJ2aWNlcyBEaXZpc2lvbjEkMCIGA1UEAxMbVGhhd3RlIFBlcnNvbmFsIEZyZWVt +YWlsIENBMSswKQYJKoZIhvcNAQkBFhxwZXJzb25hbC1mcmVlbWFpbEB0aGF3dGUu +Y29tMB4XDTk2MDEwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgdExCzAJBgNVBAYT +AlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEa +MBgGA1UEChMRVGhhd3RlIENvbnN1bHRpbmcxKDAmBgNVBAsTH0NlcnRpZmljYXRp +b24gU2VydmljZXMgRGl2aXNpb24xJDAiBgNVBAMTG1RoYXd0ZSBQZXJzb25hbCBG +cmVlbWFpbCBDQTErMCkGCSqGSIb3DQEJARYccGVyc29uYWwtZnJlZW1haWxAdGhh +d3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1GnX1LCUZFtx6UfY +DFG26nKRsIRefS0Nj3sS34UldSh0OkIsYyeflXtL734Zhx2G6qPduc6WZBrCFG5E +rHzmj+hND3EfQDimAKOHePb5lIZererAXnbr2RSjXW56fAylS1V/Bhkpf56aJtVq +uzgkCGqYx7Hao5iR/Xnb5VrEHLkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zAN +BgkqhkiG9w0BAQQFAAOBgQDH7JJ+Tvj1lqVnYiqk8E0RYNBvjWBYYawmu1I1XAjP +MPuoSpaKH2JCI4wXD/S6ZJwXrEcp352YXtJsYHFcoqzceePnbgBHH7UNKOgCneSa +/RP0ptl8sfjcXyMmCZGAc9AUG95DqYMl8uacLxXK/qarigd1iwzdUYRr5PjRznei +gQ== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU -MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3 -b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw -MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML -QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD -VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA -A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul -CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n -tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl -dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch -PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC -+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O -BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E -BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl -MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk -ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB -IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X -7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz -43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY -eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl -pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA -WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk= +MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn +MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL +ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMg +b2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAxNjEzNDNaFw0zNzA5MzAxNjEzNDRa +MH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZpcm1hIFNBIENJRiBB +ODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3JnMSIw +IAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0B +AQEFAAOCAQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtb +unXF/KGIJPov7coISjlUxFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0d +BmpAPrMMhe5cG3nCYsS4No41XQEMIwRHNaqbYE6gZj3LJgqcQKH0XZi/caulAGgq +7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jWDA+wWFjbw2Y3npuRVDM3 +0pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFVd9oKDMyX +roDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIG +A1UdEwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5j +aGFtYmVyc2lnbi5vcmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p +26EpW1eLTXYGduHRooowDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIA +BzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hhbWJlcnNpZ24ub3JnMCcGA1Ud +EgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYDVR0gBFEwTzBN +BgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz +aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEB +AAxBl8IahsAifJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZd +p0AJPaxJRUXcLo0waLIJuvvDL8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi +1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wNUPf6s+xCX6ndbcj0dc97wXImsQEc +XCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/nADydb47kMgkdTXg0 +eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1erfu +tGWaIZDgqtCYvDi1czyL+Nw= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEU -MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3 -b3JrMSAwHgYDVQQDExdBZGRUcnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAx -MDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtB -ZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIDAeBgNV -BAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV -6tsfSlbunyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nX -GCwwfQ56HmIexkvA/X1id9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnP -dzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSGAa2Il+tmzV7R/9x98oTaunet3IAIx6eH -1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAwHM+A+WD+eeSI8t0A65RF -62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0GA1UdDgQW -BBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUw -AwEB/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDEL -MAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRU -cnVzdCBUVFAgTmV0d29yazEgMB4GA1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJv -b3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4JNojVhaTdt02KLmuG7jD8WS6 -IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL+YPoRNWyQSW/ -iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao -GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh -4SINhwBk/ox9Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQm -XiLsks3/QppEIW1cxeMiHV9HEufOX1362KqxMy3ZdvJOOjMMK7MtkAY= +MIID/TCCA2agAwIBAgIEP4/gkTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJQ +TDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2Vu +dHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MR8wHQYDVQQDExZDQyBTaWduZXQgLSBD +QSBLbGFzYSAxMB4XDTAzMTAxNzEyMjkwMloXDTExMDkyMzExMTgxN1owdjELMAkG +A1UEBhMCUEwxHzAdBgNVBAoTFlRQIEludGVybmV0IFNwLiB6IG8uby4xJDAiBgNV +BAsTG0NlbnRydW0gQ2VydHlmaWthY2ppIFNpZ25ldDEgMB4GA1UEAxMXQ0MgU2ln +bmV0IC0gVFNBIEtsYXNhIDEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOJY +rISEtSsduHajROh5/n7NGrkpYTT9NEaPe9+ucuQ37KxIbfJwXJjgUc1dw4wCkcQ1 +2FJarD1X6mSQ4cfN/60vLfKI5ZD4nhJTMKlAj1pX9ScQ/MuyvKStCbn5WTkjPhjR +AM0tdwXSnzuTEunfw0Oup559y3Iqxg1cExflB6cfAgMBAAGjggGXMIIBkzBBBgNV +HR8EOjA4MDagNKAyhjBodHRwOi8vd3d3LnNpZ25ldC5wbC9yZXBvenl0b3JpdW0v +Y3JsL2tsYXNhMS5jcmwwDgYDVR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQMMAoGCCsG +AQUFBwMIMIHaBgNVHSAEgdIwgc8wgcwGDSsGAQQBvj8CZAoRAgEwgbowbwYIKwYB +BQUHAgIwYxphQ2VydHlmaWthdCB3eXN0YXdpb255IHpnb2RuaWUgeiBkb2t1bWVu +dGVtICJQb2xpdHlrYSBDZXJ0eWZpa2FjamkgQ0MgU2lnbmV0IC0gWm5ha293YW5p +ZSBjemFzZW0iLjBHBggrBgEFBQcCARY7aHR0cDovL3d3dy5zaWduZXQucGwvcmVw +b3p5dG9yaXVtL2Rva3VtZW50eS9wY190c2ExXzJfMS5wZGYwHwYDVR0jBBgwFoAU +w4Me1Vl3VPtN+1dH+cQjXNHnieMwHQYDVR0OBBYEFJdDwEqtcavOYd9u9tej53vW +XwNBMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEFBQADgYEAnpiQkqLCJQYXUrqMHUEz ++z3rOqS0XzSFnVVLhkVssvXc8S3FkJIiQTUrkScjI4CToCzujj3EyfNxH6yiLlMb +skF8I31JxIeBvueqV+s+o76CZm3ycu9hb0I4lswuxoT+q5ZzPR8Irrb51rZXlolR ++7KtwMg4sFDJZ8RNgOf7tbA= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEU -MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3 -b3JrMSMwIQYDVQQDExpBZGRUcnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1 -MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcxCzAJBgNVBAYTAlNFMRQwEgYDVQQK -EwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIzAh -BgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG9w0B -AQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwq -xBb/4Oxx64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G -87B4pfYOQnrjfxvM0PC3KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i -2O+tCBGaKZnhqkRFmhJePp1tUvznoD1oL/BLcHwTOK28FSXx1s6rosAx1i+f4P8U -WfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GRwVY18BTcZTYJbqukB8c1 -0cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HUMIHRMB0G -A1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0T -AQH/BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6Fr -pGkwZzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQL -ExRBZGRUcnVzdCBUVFAgTmV0d29yazEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlm -aWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBABmrder4i2VhlRO6aQTv -hsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxGGuoYQ992zPlm -hpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X -dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3 -P6CxB9bpT9zeRXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9Y -iQBCYz95OdBEsIJuQRno3eDBiFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5no -xqE= +MIIDlDCCAnygAwIBAgIQWAsFbFMk27JQVxhf+eWmUDANBgkqhkiG9w0BAQUFADAn +MQswCQYDVQQGEwJCRTEYMBYGA1UEAxMPQmVsZ2l1bSBSb290IENBMB4XDTAzMDEy +NjIzMDAwMFoXDTE0MDEyNjIzMDAwMFowJzELMAkGA1UEBhMCQkUxGDAWBgNVBAMT +D0JlbGdpdW0gUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMihcekcRkJ5eHFvna6pqKsot03HIOswkVp19eLSz8hMFJhCWK3HEcVAQGpa+XQS +J4fpnOVxTiIs0RIYqjBeoiG52bv/9nTrMQHnO35YD5EWTXaJqAFPrSJmcPpLHZXB +MFjqvNll2Jq0iOtJRlLf0lMVdssUXRlJsW9q09P9vMIt7EU/CT9YvvzU7wCMgTVy +v/cY6pZifSsofxVsY9LKyn0FrMhtB20yvmi4BUCuVJhWPmbxMOjvxKuTXgfeMo8S +dKpbNCNUwOpszv42kqgJF+qhLc9s44Qd3ocuMws8dOIhUDiVLlzg5cYx+dtA+mqh +pIqTm6chBocdJ9PEoclMsG8CAwEAAaOBuzCBuDAOBgNVHQ8BAf8EBAMCAQYwDwYD +VR0TAQH/BAUwAwEB/zBCBgNVHSAEOzA5MDcGBWA4AQEBMC4wLAYIKwYBBQUHAgEW +IGh0dHA6Ly9yZXBvc2l0b3J5LmVpZC5iZWxnaXVtLmJlMB0GA1UdDgQWBBQQ8AxW +m2HqVzq2NZdtn925FI7b5jARBglghkgBhvhCAQEEBAMCAAcwHwYDVR0jBBgwFoAU +EPAMVpth6lc6tjWXbZ/duRSO2+YwDQYJKoZIhvcNAQEFBQADggEBAMhtIlGKYfgP +lm7VILKB+MbcoxYA2s1q52sq+llIp0xJN9dzoWoBZV4yveeX09AuPHPTjHuD79ZC +wT+oqV0PN7p20kC9zC0/00RBSZz9Wyn0AiMiW3Ebv1jZKE4tRfTa57VjRUQRDSp/ +M382SbTObqkCMa5c/ciJv0J71/Fg8teH9lcuen5qE4Ad3OPQYx49cTGxYNSeCMqr +8JTHSHVUgfMbrXec6LKP24OsjzRr6L/D2fVDw2RV6xq9NoY2uiGMlxoh1OotO6y6 +7Kcdq765Sps1LxxcHVGnH1TtEpf/8m6HfUbJdNbv6z195lluBpQE5KJVhzgoaiJe +4r50ErAEQyo= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc -MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP -bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2 -MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft -ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg -Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP -ADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lk -hsmj76CGv2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym -1BW32J/X3HGrfpq/m44zDyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsW -OqMFf6Dch9Wc/HKpoH145LcxVR5lu9RhsCFg7RAycsWSJR74kEoYeEfffjA3PlAb -2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP8c9GsEsPPt2IYriMqQko -O3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0TAQH/BAUw -AwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAU -AK3Zo/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB -BQUAA4IBAQB8itEfGDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkF -Zu90821fnZmv9ov761KyBZiibyrFVL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAb -LjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft3OJvx8Fi8eNy1gTIdGcL+oir -oQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43gKd8hdIaC2y+C -MMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds -sPmuujz9dLQR6FgNgLzTqIA6me11zEZ7 +MIIH8jCCB1ugAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARIxCzAJBgNVBAYTAkVT +MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE +ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE +ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEuMCwGA1UECxMl +SVBTIENBIENMQVNFMSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMl +SVBTIENBIENMQVNFMSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEeMBwGCSqGSIb3 +DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTAxMTIzMTExMTEwM1oXDTI1MTIyOTEx +MTEwM1owggESMQswCQYDVQQGEwJFUzESMBAGA1UECBMJQmFyY2Vsb25hMRIwEAYD +VQQHEwlCYXJjZWxvbmExLjAsBgNVBAoTJUlQUyBJbnRlcm5ldCBwdWJsaXNoaW5n +IFNlcnZpY2VzIHMubC4xKzApBgNVBAoUImlwc0BtYWlsLmlwcy5lcyBDLkkuRi4g +IEItNjA5Mjk0NTIxLjAsBgNVBAsTJUlQUyBDQSBDTEFTRTEgQ2VydGlmaWNhdGlv +biBBdXRob3JpdHkxLjAsBgNVBAMTJUlQUyBDQSBDTEFTRTEgQ2VydGlmaWNhdGlv +biBBdXRob3JpdHkxHjAcBgkqhkiG9w0BCQEWD2lwc0BtYWlsLmlwcy5lczCBnzAN +BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA55+R7+voFuF0vIkTodduR8ZfPxKU5u/h +M+GrgqufAwHmdG+KF5fPVy8Mdi7mbqfK2veLFBVADbNq2e2+s2q8Ai0chS3vl//P +l9rrR10eU79dVN4ndGMZfpXUMZblz0/Kq3Uvk5AsWUwfv1YokIhi4RMeBtOCVv3j +LSV1rDsiap8CAwEAAaOCBFIwggROMB0GA1UdDgQWBBRtW6MBjmE3nQR4tq+blh0C +QeXbeTCCAUQGA1UdIwSCATswggE3gBRtW6MBjmE3nQR4tq+blh0CQeXbeaGCARqk +ggEWMIIBEjELMAkGA1UEBhMCRVMxEjAQBgNVBAgTCUJhcmNlbG9uYTESMBAGA1UE +BxMJQmFyY2Vsb25hMS4wLAYDVQQKEyVJUFMgSW50ZXJuZXQgcHVibGlzaGluZyBT +ZXJ2aWNlcyBzLmwuMSswKQYDVQQKFCJpcHNAbWFpbC5pcHMuZXMgQy5JLkYuICBC +LTYwOTI5NDUyMS4wLAYDVQQLEyVJUFMgQ0EgQ0xBU0UxIENlcnRpZmljYXRpb24g +QXV0aG9yaXR5MS4wLAYDVQQDEyVJUFMgQ0EgQ0xBU0UxIENlcnRpZmljYXRpb24g +QXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOCAQAwDAYD +VR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMBBggr +BgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIB +FQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhC +AQEEBAMCAAcwGgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGB +D2lwc0BtYWlsLmlwcy5lczBCBglghkgBhvhCAQ0ENRYzQ0xBU0UxIENBIENlcnRp +ZmljYXRlIGlzc3VlZCBieSBodHRwczovL3d3dy5pcHMuZXMvMCoGCWCGSAGG+EIB +AgQdFhtodHRwczovL3d3dy5pcHMuZXMvaXBzMjAwMi8wOwYJYIZIAYb4QgEEBC4W +LGh0dHBzOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRTEuY3JsMEAG +CWCGSAGG+EIBAwQzFjFodHRwczovL3d3dy5pcHMuZXMvaXBzMjAwMi9yZXZvY2F0 +aW9uQ0xBU0UxLmh0bWw/MD0GCWCGSAGG+EIBBwQwFi5odHRwczovL3d3dy5pcHMu +ZXMvaXBzMjAwMi9yZW5ld2FsQ0xBU0UxLmh0bWw/MDsGCWCGSAGG+EIBCAQuFixo +dHRwczovL3d3dy5pcHMuZXMvaXBzMjAwMi9wb2xpY3lDTEFTRTEuaHRtbDB1BgNV +HR8EbjBsMDKgMKAuhixodHRwczovL3d3dy5pcHMuZXMvaXBzMjAwMi9pcHMyMDAy +Q0xBU0UxLmNybDA2oDSgMoYwaHR0cHM6Ly93d3diYWNrLmlwcy5lcy9pcHMyMDAy +L2lwczIwMDJDTEFTRTEuY3JsMC8GCCsGAQUFBwEBBCMwITAfBggrBgEFBQcwAYYT +aHR0cDovL29jc3AuaXBzLmVzLzANBgkqhkiG9w0BAQUFAAOBgQBacEdMbCU0z2bO +X+iyJafrUbjPE+5KzJz2jB1YXC2d7kMy2Hhbp8gVyfUFQpd+F2IgBBj9z3IRNkDN +foHhdse5j2cUUH+fno9jj8EPE2GPhXVmCjIP6KuPp8yzz89gC+ry+bkfSFzjHUQt +K15I/jRAHfyJywwUrwtmklZIX0E5Og== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc -MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP -bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2 -MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft -ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg -Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIP -ADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC -206B89enfHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFci -KtZHgVdEglZTvYYUAQv8f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2 -JxhP7JsowtS013wMPgwr38oE18aO6lhOqKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9 -BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JNRvCAOVIyD+OEsnpD8l7e -Xz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0gBe4lL8B -PeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67 -Xnfn6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEq -Z8A9W6Wa6897GqidFEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZ -o2C7HK2JNDJiuEMhBnIMoVxtRsX6Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3 -+L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnjB453cMor9H124HhnAgMBAAGj -YzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3OpaaEg5+31IqEj -FNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE -AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmn -xPBUlgtk87FYT15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2 -LHo1YGwRgJfMqZJS5ivmae2p+DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzccc -obGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXgJXUjhx5c3LqdsKyzadsXg8n33gy8 -CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//ZoyzH1kUQ7rVyZ2OuMe -IjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgOZtMA -DjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2F -AjgQ5ANh1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUX -Om/9riW99XJZZLF0KjhfGEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPb -AZO1XB4Y3WRayhgoPmMEEf0cjQAPuDffZ4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQl -Zvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuPcX/9XhmgD0uRuMRUvAaw -RY8mkaKO/qk= +MIIDWjCCAkKgAwIBAgIEO8rJUjANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJE +SzEMMAoGA1UEChMDS01EMQ8wDQYDVQQLEwZLTUQtQ0ExFjAUBgNVBAMTDUtNRC1D +QSBTZXJ2ZXIxIDAeBgoJkiaJk/IsZAEDFBBpbmZvY2FAa21kLWNhLmRrMB4XDTk4 +MTAxNjE5MTkyMVoXDTE4MTAxMjE5MTkyMVowZjELMAkGA1UEBhMCREsxDDAKBgNV +BAoTA0tNRDEPMA0GA1UECxMGS01ELUNBMRYwFAYDVQQDEw1LTUQtQ0EgU2VydmVy +MSAwHgYKCZImiZPyLGQBAxQQaW5mb2NhQGttZC1jYS5kazCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAJsLpbSgFxQ7IhFgf5f+RfBxnbCkx5C7yTjfCZvp +/BP2LBD3OKjgLRwvASoCU3I5NMhccho6uhZVf1HC+Ac5HmXUUd+v92a7gDnohPPy +Rgv8c6f/+R2fFen37SBemYFDtZveamVXZ2To7xAxNiMKgPTPs/Rl7F6LDsYgv1bD +36FrjahNoSTmTbYRoK21eIOVwrZeNSzo9w3W8fj0n+V2IB1jsOh+AvjXkjbvAVky +0/57GMlyBNKP7JIGP7LXqwWfrBXuAph1DUMz467KlHZOMkPwCjTZOab7CcLQXCCY +12s5c5QAkwpf35hQRuOaNo6d/XFM6J9mofiWlGTT3Px1EX0CAwEAAaMQMA4wDAYD +VR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAPlA6VZ2C2cJbsI0SBIe9v+M9 +GxI45QI7P0D7QGyrqM7oNqGq7hJdN6NFb0LyPcF3/pVzmtYVJzaGKF6spaxOEveB +9ki1xRoXUKpaCxSweBpTzEktWa43OytRy0sbryEmHJCQkz8MPufWssf2yXHzgFFo +XMQpcMyT7JwxPlfYVvab9Kp+nW7fIyDOG0wdmBerZ+GEQJxJEkri1HskjigxhGze +ziocJatBuOWgqw5KRylgGIQjUGRTCbODVta+Kmqb9d+cB7FStbYtt2HebOXzBIY3 +XUM5KtGC++We7DqgU5Firek7brw8i2XsHPLKJTceb6Xo6DsSxLfBAWV6+8DCkQ== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIID5jCCAs6gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMCVVMx -HTAbBgNVBAoTFEFPTCBUaW1lIFdhcm5lciBJbmMuMRwwGgYDVQQLExNBbWVyaWNh -IE9ubGluZSBJbmMuMTcwNQYDVQQDEy5BT0wgVGltZSBXYXJuZXIgUm9vdCBDZXJ0 -aWZpY2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyOTA2MDAwMFoXDTM3MTEyMDE1 -MDMwMFowgYMxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRBT0wgVGltZSBXYXJuZXIg -SW5jLjEcMBoGA1UECxMTQW1lcmljYSBPbmxpbmUgSW5jLjE3MDUGA1UEAxMuQU9M -IFRpbWUgV2FybmVyIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIw -DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnej8Mlo2k06AX3dLm/WpcZuS+U -0pPlLYnKhHw/EEMbjIt8hFj4JHxIzyr9wBXZGH6EGhfT257XyuTZ16pYUYfw8ItI -TuLCxFlpMGK2MKKMCxGZYTVtfu/FsRkGIBKOQuHfD5YQUqjPnF+VFNivO3ULMSAf -RC+iYkGzuxgh28pxPIzstrkNn+9R7017EvILDOGsQI93f7DKeHEMXRZxcKLXwjqF -zQ6axOAAsNUl6twr5JQtOJyJQVdkKGUZHLZEtMgxa44Be3ZZJX8VHIQIfHNlIAqh -BC4aMqiaILGcLCFZ5/vP7nAtCMpjPiybkxlqpMKX/7eGV4iFbJ4VFitNLLMCAwEA -AaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUoTYwFsuGkABFgFOxj8jY -PXy+XxIwHwYDVR0jBBgwFoAUoTYwFsuGkABFgFOxj8jYPXy+XxIwDgYDVR0PAQH/ -BAQDAgGGMA0GCSqGSIb3DQEBBQUAA4IBAQCKIBilvrMvtKaEAEAwKfq0FHNMeUWn -9nDg6H5kHgqVfGphwu9OH77/yZkfB2FK4V1Mza3u0FIy2VkyvNp5ctZ7CegCgTXT -Ct8RHcl5oIBN/lrXVtbtDyqvpxh1MwzqwWEFT2qaifKNuZ8u77BfWgDrvq2g+EQF -Z7zLBO+eZMXpyD8Fv8YvBxzDNnGGyjhmSs3WuEvGbKeXO/oTLW4jYYehY0KswsuX -n2Fozy1MBJ3XJU8KDk2QixhWqJNIV9xvrr2eZ1d3iVCzvhGbRWeDhhmH05i9CBoW -H1iCC+GWaQVLjuyDUTEH1dSf/1l7qG6Fz9NLqUmwX7A5KGgOc90lmt4S +MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOc +UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx +c8SxMQswCQYDVQQGDAJUUjEPMA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykg +MjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8 +dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMxMDI3MTdaFw0xNTAz +MjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2Vy +dGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYD +VQQHDAZBTktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kg +xLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEu +xZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7 +XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GXyGl8hMW0kWxsE2qkVa2k +heiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8iSi9BB35J +YbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5C +urKZ8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1 +JuTm5Rh8i27fbMx4W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51 +b0dewQIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV +9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46sWrv7/hg0Uw2ZkUd82YCdAR7 +kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxEq8Sn5RTOPEFh +fEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy +B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdA +aLX/7KfS0zgYnNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKS +RGQDJereW26fyfJOrN3H -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIF5jCCA86gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMCVVMx -HTAbBgNVBAoTFEFPTCBUaW1lIFdhcm5lciBJbmMuMRwwGgYDVQQLExNBbWVyaWNh -IE9ubGluZSBJbmMuMTcwNQYDVQQDEy5BT0wgVGltZSBXYXJuZXIgUm9vdCBDZXJ0 -aWZpY2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyOTA2MDAwMFoXDTM3MDkyODIz -NDMwMFowgYMxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRBT0wgVGltZSBXYXJuZXIg -SW5jLjEcMBoGA1UECxMTQW1lcmljYSBPbmxpbmUgSW5jLjE3MDUGA1UEAxMuQU9M -IFRpbWUgV2FybmVyIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIw -DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALQ3WggWmRToVbEbJGv8x4vmh6mJ -7ouZzU9AhqS2TcnZsdw8TQ2FTBVsRotSeJ/4I/1n9SQ6aF3Q92RhQVSji6UI0ilb -m2BPJoPRYxJWSXakFsKlnUWsi4SVqBax7J/qJBrvuVdcmiQhLE0OcR+mrF1FdAOY -xFSMFkpBd4aVdQxHAWZg/BXxD+r1FHjHDtdugRxev17nOirYlxcwfACtCJ0zr7iZ -YYCLqJV+FNwSbKTQ2O9ASQI2+W6p1h2WVgSysy0WVoaP2SBXgM1nEG2wTPDaRrbq -JS5Gr42whTg0ixQmgiusrpkLjhTXUr2eacOGAgvqdnUxCc4zGSGFQ+aJLZ8lN2fx -I2rSAG2X+Z/nKcrdH9cG6rjJuQkhn8g/BsXS6RJGAE57COtCPStIbp1n3UsC5ETz -kxmlJ85per5n0/xQpCyrw2u544BMzwVhSyvcG7mm0tCq9Stz+86QNZ8MUhy/XCFh -EVsVS6kkUfykXPcXnbDS+gfpj1bkGoxoigTTfFrjnqKhynFbotSg5ymFXQNoKk/S -Btc9+cMDLz9l+WceR0DTYw/j1Y75hauXTLPXJuuWCpTehTacyH+BCQJJKg71ZDIM -gtG6aoIbs0t0EfOMd9afv9w3pKdVBC/UMejTRrkDfNoSTllkt1ExMVCgyhwn2RAu -rda9EGYrw7AiShJbAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE -FE9pbQN+nZ8HGEO8txBO1b+pxCAoMB8GA1UdIwQYMBaAFE9pbQN+nZ8HGEO8txBO -1b+pxCAoMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAO/Ouyugu -h4X7ZVnnrREUpVe8WJ8kEle7+z802u6teio0cnAxa8cZmIDJgt43d15Ui47y6mdP -yXSEkVYJ1eV6moG2gcKtNuTxVBFT8zRFASbI5Rq8NEQh3q0l/HYWdyGQgJhXnU7q -7C+qPBR7V8F+GBRn7iTGvboVsNIYvbdVgaxTwOjdaRITQrcCtQVBynlQboIOcXKT -RuidDV29rs4prWPVVRaAMCf/drr3uNZK49m1+VLQTkCpx+XCMseqdiThawVQ68W/ -ClTluUI8JPu3B5wwn3la5uBAUhX0/Kr0VvlEl4ftDmVyXr4m+02kLQgH3thcoNyB -M5kYJRF3p+v9WAksmWsbivNSPxpNSGDxoPYzAlOL7SUJuA0t7Zdz7NeWH45gDtoQ -my8YJPamTQr5O8t1wswvziRpyQoijlmn94IM19drNZxDAGrElWe6nEXLuA4399xO -AU++CrYD062KRffaJ00psUjf5BHklka9bAI+1lHIlRcBFanyqqryvy9lG2/QuRqT -9Y41xICHPpQvZuTpqP9BnHAqTyo5GJUefvthATxRCC4oGKQWDzH9OmwjkyB24f0H -hdFbP9IcczLd+rn4jM8Ch3qaluTtT4mNU0OrDhPAARW0eTjb/G49nlG2uBOLZ8/5 -fNkiHfZdxRwBL5joeiQYvITX+txyW/fBOmg= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ -RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD -VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX -DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y -ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy -VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr -mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr -IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK -mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu -XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy -dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye -jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1 -BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3 -DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92 -9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx -jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0 -Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz -ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS -R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp +MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEc +MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBT +ZWN1cmUgZUJ1c2luZXNzIENBLTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQw +MDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5j +LjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENBLTEwgZ8wDQYJ +KoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ1MRo +RvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBu +WqDZQu4aIZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKw +Env+j6YDAgMBAAGjZjBkMBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTAD +AQH/MB8GA1UdIwQYMBaAFEp4MlIR21kWNl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRK +eDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQFAAOBgQB1W6ibAxHm6VZM +zfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5lSE/9dR+ +WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN +/Bf+KpYrtWKmpj29f5JZzVoqgrI3eQ== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIFajCCBFKgAwIBAgIEPLU9RjANBgkqhkiG9w0BAQUFADBmMRIwEAYDVQQKEwli @@ -390,184 +350,85 @@ gkHNZTfqjjJ+vWuZXTARyNtIVBw74acT02pIk/c9jH8F6M7ziCpjBLjqflh8AXtb CReJf8Py05yc493EG931t3GzUwWJBtDLSoDByFOQtTwxiBdQn8nEDovYqAJjDQ== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIGUTCCBTmgAwIBAgIEPLVPQDANBgkqhkiG9w0BAQUFADBmMRIwEAYDVQQKEwli -ZVRSVVNUZWQxGzAZBgNVBAsTEmJlVFJVU1RlZCBSb290IENBczEzMDEGA1UEAxMq -YmVUUlVTVGVkIFJvb3QgQ0EgLSBFbnRydXN0IEltcGxlbWVudGF0aW9uMB4XDTAy -MDQxMTA4MjQyN1oXDTIyMDQxMTA4NTQyN1owZjESMBAGA1UEChMJYmVUUlVTVGVk -MRswGQYDVQQLExJiZVRSVVNUZWQgUm9vdCBDQXMxMzAxBgNVBAMTKmJlVFJVU1Rl -ZCBSb290IENBIC0gRW50cnVzdCBJbXBsZW1lbnRhdGlvbjCCASIwDQYJKoZIhvcN -AQEBBQADggEPADCCAQoCggEBALr0RAOqEmq1Q+xVkrYwfTVXDNvzDSduTPdQqJtO -K2/b9a0cS12zqcH+e0TrW6MFDR/FNCswACnxeECypP869AGIF37m1CbTukzqMvtD -d5eHI8XbQ6P1KqNRXuE70mVpflUVm3rnafdE4Fe1FehmYA8NA/uCjqPoEXtsvsdj -DheT389Lrm5zdeDzqrmkwAkbhepxKYhBMvnwKg5sCfJ0a2ZsUhMfGLzUPvfYbiCe -yv78IZTuEyhL11xeDGbu6bsPwTSxfwh28z0mcMmLJR1iJAzqHHVOwBLkuhMdMCkt -VjMFu5dZfsZJT4nXLySotohAtWSSU1Yk5KKghbNekLQSM80CAwEAAaOCAwUwggMB -MIIBtwYDVR0gBIIBrjCCAaowggGmBg8rBgEEAbE+AAACCSiDkTEwggGRMIIBSQYI -KwYBBQUHAgIwggE7GoIBN1JlbGlhbmNlIG9uIG9yIHVzZSBvZiB0aGlzIENlcnRp -ZmljYXRlIGNyZWF0ZXMgYW4gYWNrbm93bGVkZ21lbnQgYW5kIGFjY2VwdGFuY2Ug -b2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0 -aW9ucyBvZiB1c2UsIHRoZSBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu -dCBhbmQgdGhlIFJlbHlpbmcgUGFydHkgQWdyZWVtZW50LCB3aGljaCBjYW4gYmUg -Zm91bmQgYXQgdGhlIGJlVFJVU1RlZCB3ZWIgc2l0ZSwgaHR0cHM6Ly93d3cuYmV0 -cnVzdGVkLmNvbS9wcm9kdWN0c19zZXJ2aWNlcy9pbmRleC5odG1sMEIGCCsGAQUF -BwIBFjZodHRwczovL3d3dy5iZXRydXN0ZWQuY29tL3Byb2R1Y3RzX3NlcnZpY2Vz -L2luZGV4Lmh0bWwwEQYJYIZIAYb4QgEBBAQDAgAHMIGJBgNVHR8EgYEwfzB9oHug -eaR3MHUxEjAQBgNVBAoTCWJlVFJVU1RlZDEbMBkGA1UECxMSYmVUUlVTVGVkIFJv -b3QgQ0FzMTMwMQYDVQQDEypiZVRSVVNUZWQgUm9vdCBDQSAtIEVudHJ1c3QgSW1w -bGVtZW50YXRpb24xDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMjAwMjA0MTEw -ODI0MjdagQ8yMDIyMDQxMTA4NTQyN1owCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaA -FH1w5a44iwY/qhwaj/nPJDCqhIQWMB0GA1UdDgQWBBR9cOWuOIsGP6ocGo/5zyQw -qoSEFjAMBgNVHRMEBTADAQH/MB0GCSqGSIb2fQdBAAQQMA4bCFY2LjA6NC4wAwIE -kDANBgkqhkiG9w0BAQUFAAOCAQEAKrgXzh8QlOu4mre5X+za95IkrNySO8cgjfKZ -5V04ocI07cUTWVwFtStPYZuR+0H8/NU8TZh2BvWBfevdkObRVlTa4y0MnxEylCIB -evZsLHRnBMylj44ss0O1lKLQfelifwa+JwGDnjr9iu6YQ0pr17WXOzq/T220Y/oz -ADQuLW2WyXvKmWO6vvT2MKAtmJbpVkQFqUSjYRDrgqFnXbxdJ3Wqiig2KjiS2d2k -XgClzMx8KSreKJCrt+G2/30lC0DYqjSjLd4H61/OCt3Kfjp9JsFiaDrmLzfzgYYh -xKlkqu9FNtEaZnz46TfW1mG+oq1I59/mdP7TbX3SJdysYlep9w== +MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG +A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz +cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2 +MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV +BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt +YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN +ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE +BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is +I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G +CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do +lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc +AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIFaDCCBFCgAwIBAgIQO1nHe81bV569N1KsdrSqGjANBgkqhkiG9w0BAQUFADBi -MRIwEAYDVQQKEwliZVRSVVNUZWQxGzAZBgNVBAsTEmJlVFJVU1RlZCBSb290IENB -czEvMC0GA1UEAxMmYmVUUlVTVGVkIFJvb3QgQ0EgLSBSU0EgSW1wbGVtZW50YXRp -b24wHhcNMDIwNDExMTExODEzWhcNMjIwNDEyMTEwNzI1WjBiMRIwEAYDVQQKEwli -ZVRSVVNUZWQxGzAZBgNVBAsTEmJlVFJVU1RlZCBSb290IENBczEvMC0GA1UEAxMm -YmVUUlVTVGVkIFJvb3QgQ0EgLSBSU0EgSW1wbGVtZW50YXRpb24wggEiMA0GCSqG -SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkujQwCY5X0LkGLG9uJIAiv11DpvpPrILn -HGhwhRujbrWqeNluB0s/6d/16uhUoWGKDi9pdRi3DOUUjXFumLhV/AyV0Jtu4S2I -1DpAa5LxmZZk3tv/ePTulh1HiXzUvrmIdyM6CeYEnm2qXtLIvZpOGd+J6lsOfsPk -tPDgaTuID0GQ+NRxQyTBjyZLO1bp/4xsN+lFrYWMU8NghpBKlsmzVLC7F/AcRdnU -GxlkVgoZ98zh/4avflherHqQH8koOUV7orbHnB/ahdQhhlkwk75TMzf270HPM8er -cmsl9fNTGwxMLvF1S++gh/f+ihXQbNXL+WhTuXAVE8L1LvtDNXUtAgMBAAGjggIY -MIICFDAMBgNVHRMEBTADAQH/MIIBtQYDVR0gBIIBrDCCAagwggGkBg8rBgEEAbE+ -AAADCSiDkTEwggGPMEEGCCsGAQUFBwIBFjVodHRwOi8vd3d3LmJldHJ1c3RlZC5j -b20vcHJvZHVjdHNfc2VydmljZXMvaW5kZXguaHRtbDCCAUgGCCsGAQUFBwICMIIB -OhqCATZSZWxpYW5jZSBvbiBvciB1c2Ugb2YgdGhpcyBDZXJ0aWZpY2F0ZSBjcmVh -dGVzIGFuIGFja25vd2xlZGdtZW50IGFuZCBhY2NlcHRhbmNlIG9mIHRoZSB0aGVu -IGFwcGxpY2FibGUgc3RhbmRhcmQgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdXNl -LCB0aGUgQ2VydGlmaWNhdGlvbiBQcmFjdGljZSBTdGF0ZW1lbnQgYW5kIHRoZSBS -ZWx5aW5nIFBhcnR5IEFncmVlbWVudCwgd2hpY2ggY2FuIGJlIGZvdW5kIGF0IHRo -ZSBiZVRSVVNUZWQgd2ViIHNpdGUsIGh0dHA6Ly93d3cuYmV0cnVzdGVkLmNvbS9w -cm9kdWN0c19zZXJ2aWNlcy9pbmRleC5odG1sMAsGA1UdDwQEAwIBBjAfBgNVHSME -GDAWgBSp7BR++dlDzFMrFK3P9/BZiUHNGTAdBgNVHQ4EFgQUqewUfvnZQ8xTKxSt -z/fwWYlBzRkwDQYJKoZIhvcNAQEFBQADggEBANuXsHXqDMTBmMpWBcCorSZIry0g -6IHHtt9DwSwddUvUQo3neqh03GZCWYez9Wlt2ames30cMcH1VOJZJEnl7r05pmuK -mET7m9cqg5c0Lcd9NUwtNLg+DcTsiCevnpL9UGGCqGAHFFPMZRPB9kdEadIxyKbd -LrML3kqNWz2rDcI1UqJWN8wyiyiFQpyRQHpwKzg21eFzGh/l+n5f3NacOzDq28Bb -J1zTcwfBwvNMm2+fG8oeqqg4MwlYsq78B+g23FW6L09A/nq9BqaBwZMifIYRCgZ3 -SK41ty8ymmFei74pnykkiFY5LKjSq5YDWtRIn7lAhAuYaPsBQ9Yb4gmxlxw= +MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/ +MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT +DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow +PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD +Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O +rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq +OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b +xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw +7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD +aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV +HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG +SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69 +ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr +AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz +R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5 +JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo +Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM -MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD -QTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBM -MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD -QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/E -jG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWo -ePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GI -ULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapu -Ob7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUg -AKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7 -HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA -uI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQa -TOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTg -xSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1q -CjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5x -O/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs -6GAqm4VKQPNriiTsBhYscw== +MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd +MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg +Q2xhc3MgMiBDQSAxMB4XDTA2MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzEL +MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD +VQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7McXA0 +ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLX +l18xoS830r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVB +HfCuuCkslFJgNJQ72uA40Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B +5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/RuFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3 +WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNCMEAwDwYDVR0TAQH/BAUw +AwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0PAQH/BAQD +AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLP +gcIV1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+ +DKhQ7SLHrQVMdvvt7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKu +BctN518fV4bVIJwo+28TOPX2EZL2fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHs +h7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5wwDX3OaJdZtB7WZ+oRxKaJyOk +LY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb -MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow -GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj -YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL -MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE -BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM -GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP -ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua -BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe -3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4 -YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR -rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm -ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU -oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF -MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v -QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t -b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF -AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q -GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz -Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2 -G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi -l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3 -smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEb -MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow -GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRp -ZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVow -fjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G -A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAiBgNV -BAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEB -BQADggEPADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPM -cm3ye5drswfxdySRXyWP9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3S -HpR7LZQdqnXXs5jLrLxkU0C8j6ysNstcrbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996 -CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rCoznl2yY4rYsK7hljxxwk -3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3Vp6ea5EQz -6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNV -HQ4EFgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud -EwEB/wQFMAMBAf8wgYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2Rv -Y2EuY29tL1NlY3VyZUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRw -Oi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmww -DQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm4J4oqF7Tt/Q0 -5qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj -Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtI -gKvcnDe4IRRLDXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJ -aD61JlfutuC23bkpgHl9j6PwpCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDl -izeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1HRR3B7Hzs/Sk= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEb -MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow -GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0 -aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEwMDAwMDBaFw0yODEyMzEyMzU5NTla -MH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO -BgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUwIwYD -VQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0B -AQEFAAOCAQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWW -fnJSoBVC21ndZHoa0Lh73TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMt -TGo87IvDktJTdyR0nAducPy9C1t2ul/y/9c3S0pgePfw+spwtOpZqqPOSC+pw7IL -fhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6juljatEPmsbS9Is6FARW -1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsSivnkBbA7 -kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0G -A1UdDgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYD -VR0TAQH/BAUwAwEB/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21v -ZG9jYS5jb20vVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRo -dHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMu -Y3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8NtwuleGFTQQuS9/ -HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32 -pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxIS -jBc/lDb+XbDABHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+ -xqFx7D+gIIxmOom0jtTYsU0lR+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/Atyjcn -dBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O9y5Xt5hwXsjEeLBi ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDKTCCApKgAwIBAgIENnAVljANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJV -UzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQL -EwhEU1RDQSBFMTAeFw05ODEyMTAxODEwMjNaFw0xODEyMTAxODQwMjNaMEYxCzAJ -BgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4x -ETAPBgNVBAsTCERTVENBIEUxMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQCg -bIGpzzQeJN3+hijM3oMv+V7UQtLodGBmE5gGHKlREmlvMVW5SXIACH7TpWJENySZ -j9mDSI+ZbZUTu0M7LklOiDfBu1h//uG9+LthzfNHwJmm8fOR6Hh8AMthyUQncWlV -Sn5JTe2io74CTADKAqjuAQIxZA9SLRN0dja1erQtcQIBA6OCASQwggEgMBEGCWCG -SAGG+EIBAQQEAwIABzBoBgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMx -JDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UECxMI -RFNUQ0EgRTExDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMTk5ODEyMTAxODEw -MjNagQ8yMDE4MTIxMDE4MTAyM1owCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaAFGp5 -fpFpRhgTCgJ3pVlbYJglDqL4MB0GA1UdDgQWBBRqeX6RaUYYEwoCd6VZW2CYJQ6i -+DAMBgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqG -SIb3DQEBBQUAA4GBACIS2Hod3IEGtgllsofIH160L+nEHvI8wbsEkBFKg05+k7lN -QseSJqBcNJo4cvj9axY+IO6CizEqkzaFI4iKPANo08kJD038bKTaKHKTDomAsH3+ -gG9lbRgzl4vCa4nuYD3Im+9/KzJic5PLPON74nZ4RbyhkwS7hp86W0N6w4pl +MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjEL +MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV +BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0 +Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYwMTEyMTQ0MTU3WhcNMjUxMjMxMjI1 +OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i +SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UEAxMc +VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJW +Ht4bNwcwIi9v8Qbxq63WyKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+Q +Vl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo6SI7dYnWRBpl8huXJh0obazovVkdKyT2 +1oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZuV3bOx4a+9P/FRQI2Alq +ukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk2ZyqBwi1 +Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1Ud +EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NX +XAek0CSnwPIA1DCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy +dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6 +Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz +JTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290 +Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u +TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlN +irTzwppVMXzEO2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8 +TtXqluJucsG7Kv5sbviRmEb8yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6 +g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9IJqDnxrcOfHFcqMRA/07QlIp2+gB +95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal092Y+tTmBvTwtiBj +S+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc5A== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIDKTCCApKgAwIBAgIENm7TzjANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJV @@ -589,141 +450,75 @@ xdf0CiUPPXiBng+xZ8SQTGPdXqfiup/1902lMXucKS1M/mQ+7LZT/uqb7YLbdHVL B3luHtgZg3Pe9T7Qtd7nS2h9Qy4qIOF+oHhEngj1mPnHfxsb1gYgAlihw6ID -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEgzCCA+ygAwIBAgIEOJ725DANBgkqhkiG9w0BAQQFADCBtDEUMBIGA1UEChML -RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9HQ0NBX0NQUyBp -bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAyMDAw -IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENsaWVu -dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMDAyMDcxNjE2NDBaFw0yMDAy -MDcxNjQ2NDBaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3 -LmVudHJ1c3QubmV0L0dDQ0FfQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp -YWIuKTElMCMGA1UECxMcKGMpIDIwMDAgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG -A1UEAxMqRW50cnVzdC5uZXQgQ2xpZW50IENlcnRpZmljYXRpb24gQXV0aG9yaXR5 -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCTdLS25MVL1qFof2LV7PdRV7Ny -Spj10InJrWPNTTVRaoTUrcloeW+46xHbh65cJFET8VQlhK8pK5/jgOLZy93GRUk0 -iJBeAZfv6lOm3fzB3ksqJeTpNfpVBQbliXrqpBFXO/x8PTbNZzVtpKklWb1m9fkn -5JVn1j+SgF7yNH0rhQIDAQABo4IBnjCCAZowEQYJYIZIAYb4QgEBBAQDAgAHMIHd -BgNVHR8EgdUwgdIwgc+ggcyggcmkgcYwgcMxFDASBgNVBAoTC0VudHJ1c3QubmV0 -MUAwPgYDVQQLFDd3d3cuZW50cnVzdC5uZXQvR0NDQV9DUFMgaW5jb3JwLiBieSBy -ZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMjAwMCBFbnRydXN0Lm5l -dCBMaW1pdGVkMTMwMQYDVQQDEypFbnRydXN0Lm5ldCBDbGllbnQgQ2VydGlmaWNh -dGlvbiBBdXRob3JpdHkxDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMjAwMDAy -MDcxNjE2NDBagQ8yMDIwMDIwNzE2NDY0MFowCwYDVR0PBAQDAgEGMB8GA1UdIwQY -MBaAFISLdP3FjcD/J20gN0V8/i3OutN9MB0GA1UdDgQWBBSEi3T9xY3A/ydtIDdF -fP4tzrrTfTAMBgNVHRMEBTADAQH/MB0GCSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4w -AwIEkDANBgkqhkiG9w0BAQQFAAOBgQBObzWAO9GK9Q6nIMstZVXQkvTnhLUGJoMS -hAusO7JE7r3PQNsgDrpuFOow4DtifH+La3xKp9U1PL6oXOpLu5OOgGarDyn9TS2/ -GpsKkMWr2tGzhtQvJFJcem3G8v7lTRowjJDyutdKPkN+1MhQGof4T4HHdguEOnKd -zmVml64mXg== +MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE +BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz +dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG +A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U +cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf +qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ +JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ ++jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS +s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5 +HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7 +70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG +V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S +qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S +5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia +C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX +OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE +FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/ +BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2 +KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg +Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B +8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ +MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc +0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ +u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF +u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH +YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8 +GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO +RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e +KeC2uAloGRwYQw== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIElTCCA/6gAwIBAgIEOJsRPDANBgkqhkiG9w0BAQQFADCBujEUMBIGA1UEChML -RW50cnVzdC5uZXQxPzA9BgNVBAsUNnd3dy5lbnRydXN0Lm5ldC9TU0xfQ1BTIGlu -Y29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMcKGMpIDIwMDAg -RW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5uZXQgU2VjdXJl -IFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMDAyMDQxNzIwMDBa -Fw0yMDAyMDQxNzUwMDBaMIG6MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDE/MD0GA1UE -CxQ2d3d3LmVudHJ1c3QubmV0L1NTTF9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p -dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMjAwMCBFbnRydXN0Lm5ldCBMaW1pdGVk -MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp -b24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHwV9OcfHO -8GCGD9JYf9Mzly0XonUwtZZkJi9ow0SrqHXmAGc0V55lxyKbc+bT3QgON1WqJUaB -bL3+qPZ1V1eMkGxKwz6LS0MKyRFWmponIpnPVZ5h2QLifLZ8OAfc439PmrkDQYC2 -dWcTC5/oVzbIXQA23mYU2m52H083jIITiQIDAQABo4IBpDCCAaAwEQYJYIZIAYb4 -QgEBBAQDAgAHMIHjBgNVHR8EgdswgdgwgdWggdKggc+kgcwwgckxFDASBgNVBAoT -C0VudHJ1c3QubmV0MT8wPQYDVQQLFDZ3d3cuZW50cnVzdC5uZXQvU1NMX0NQUyBp -bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAyMDAw -IEVudHJ1c3QubmV0IExpbWl0ZWQxOjA4BgNVBAMTMUVudHJ1c3QubmV0IFNlY3Vy -ZSBTZXJ2ZXIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxDTALBgNVBAMTBENSTDEw -KwYDVR0QBCQwIoAPMjAwMDAyMDQxNzIwMDBagQ8yMDIwMDIwNDE3NTAwMFowCwYD -VR0PBAQDAgEGMB8GA1UdIwQYMBaAFMtswGvjuz7L/CKc/vuLkpyw8m4iMB0GA1Ud -DgQWBBTLbMBr47s+y/winP77i5KcsPJuIjAMBgNVHRMEBTADAQH/MB0GCSqGSIb2 -fQdBAAQQMA4bCFY1LjA6NC4wAwIEkDANBgkqhkiG9w0BAQQFAAOBgQBi24GRzsia -d0Iv7L0no1MPUBvqTpLwqa+poLpIYcvvyQbvH9X07t9WLebKahlzqlO+krNQAraF -JnJj2HVQYnUUt7NQGj/KEQALhUVpbbalrlHhStyCP2yMNLJ3a9kC9n8O6mUE8c1U -yrrJzOCE98g+EZfTYAkYvAX/bIkz8OwVDw== +MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6 +MRkwFwYDVQQKExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJp +dHkgMjA0OCBWMzAeFw0wMTAyMjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAX +BgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAbBgNVBAsTFFJTQSBTZWN1cml0eSAy +MDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt49VcdKA3Xtp +eafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7Jylg +/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGl +wSMiuLgbWhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnh +AMFRD0xS+ARaqn1y07iHKrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2 +PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP+Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpu +AWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB +BjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4EFgQUB8NR +MKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYc +HnmYv/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/ +Zb5gEydxiKRz44Rj0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+ +f00/FGj1EVDVwfSQpQgdMWD/YIwjVAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVO +rSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395nzIlQnQFgCi/vcEkllgVsRch +6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kApKnXwiJPZ9d3 +7CAFYd4= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEXDCCA0SgAwIBAgIEOGO5ZjANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML -RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp -bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5 -IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp -ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0xOTEy -MjQxODIwNTFaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3 -LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp -YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG -A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq -K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe -sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX -MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT -XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/ -HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH -4QIDAQABo3QwcjARBglghkgBhvhCAQEEBAMCAAcwHwYDVR0jBBgwFoAUVeSB0RGA -vtiJuQijMfmhJAkWuXAwHQYDVR0OBBYEFFXkgdERgL7YibkIozH5oSQJFrlwMB0G -CSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEA -WUesIYSKF8mciVMeuoCFGsY8Tj6xnLZ8xpJdGGQC49MGCBFhfGPjK50xA3B20qMo -oPS7mmNz7W3lKtvtFKkrxjYR0CvrB4ul2p5cGZ1WEvVUKcgF7bISKo30Axv/55IQ -h7A6tcOdBTcSo8f0FbnVpDkWm1M6I5HxqIKiaohowXkCIryqptau37AUX7iH0N18 -f3v/rxzP5tsHrV7bhZ3QKw0z2wTR5klAEyt2+z7pnIkPFc4YsIV4IU9rTw76NmfN -B/L/CNDi3tm/Kq+4h4YhPATKt5Rof8886ZjXOP/swNlQ8C5LWK5Gb9Auw2DaclVy -vUxFnmG6v4SBkgPR0ml8xQ== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIE7TCCBFagAwIBAgIEOAOR7jANBgkqhkiG9w0BAQQFADCByTELMAkGA1UEBhMC -VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MUgwRgYDVQQLFD93d3cuZW50cnVzdC5u -ZXQvQ2xpZW50X0NBX0luZm8vQ1BTIGluY29ycC4gYnkgcmVmLiBsaW1pdHMgbGlh -Yi4xJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV -BAMTKkVudHJ1c3QubmV0IENsaWVudCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe -Fw05OTEwMTIxOTI0MzBaFw0xOTEwMTIxOTU0MzBaMIHJMQswCQYDVQQGEwJVUzEU -MBIGA1UEChMLRW50cnVzdC5uZXQxSDBGBgNVBAsUP3d3dy5lbnRydXN0Lm5ldC9D -bGllbnRfQ0FfSW5mby9DUFMgaW5jb3JwLiBieSByZWYuIGxpbWl0cyBsaWFiLjEl -MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMq -RW50cnVzdC5uZXQgQ2xpZW50IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0G -CSqGSIb3DQEBAQUAA4GLADCBhwKBgQDIOpleMRffrCdvkHvkGf9FozTC28GoT/Bo -6oT9n3V5z8GKUZSvx1cDR2SerYIbWtp/N3hHuzeYEpbOxhN979IMMFGpOZ5V+Pux -5zDeg7K6PvHViTs7hbqqdCz+PzFur5GVbgbUB01LLFZHGARS2g4Qk79jkJvh34zm -AqTmT173iwIBA6OCAeAwggHcMBEGCWCGSAGG+EIBAQQEAwIABzCCASIGA1UdHwSC -ARkwggEVMIHkoIHhoIHepIHbMIHYMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50 -cnVzdC5uZXQxSDBGBgNVBAsUP3d3dy5lbnRydXN0Lm5ldC9DbGllbnRfQ0FfSW5m -by9DUFMgaW5jb3JwLiBieSByZWYuIGxpbWl0cyBsaWFiLjElMCMGA1UECxMcKGMp -IDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5uZXQg -Q2xpZW50IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCyg -KqAohiZodHRwOi8vd3d3LmVudHJ1c3QubmV0L0NSTC9DbGllbnQxLmNybDArBgNV -HRAEJDAigA8xOTk5MTAxMjE5MjQzMFqBDzIwMTkxMDEyMTkyNDMwWjALBgNVHQ8E -BAMCAQYwHwYDVR0jBBgwFoAUxPucKXuXzUyW/O5bs8qZdIuV6kwwHQYDVR0OBBYE -FMT7nCl7l81MlvzuW7PKmXSLlepMMAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EA -BAwwChsEVjQuMAMCBJAwDQYJKoZIhvcNAQEEBQADgYEAP66K8ddmAwWePvrqHEa7 -pFuPeJoSSJn59DXeDDYHAmsQOokUgZwxpnyyQbJq5wcBoUv5nyU7lsqZwz6hURzz -wy5E97BnRqqS5TvaHBkUODDV4qIxJS7x7EU47fgGWANzYrAQMY9Av2TgXD7FTx/a -EkP/TOYGJqibGapEPHayXOw= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC -VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u -ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc -KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u -ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05OTA1 -MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIGA1UE -ChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5j -b3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF -bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUg -U2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUA -A4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQaO2f55M28Qpku0f1BBc/ -I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5gXpa0zf3 -wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OC -AdcwggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHb -oIHYpIHVMIHSMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5 -BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p -dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1pdGVk -MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp -b24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu -dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0 -MFqBDzIwMTkwNTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8Bdi -E1U9s/8KAGv7UISX8+1i0BowHQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAa -MAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI -hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyNEwr75Ji174z4xRAN -95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd -2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI= +MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx +FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD +VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv +biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy +dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t +MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB +MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG +A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp +b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl +cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv +bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE +VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ +ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR +uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG +9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI +hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM +pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV @@ -745,75 +540,268 @@ A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y 1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4 -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEc -MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBT -ZWN1cmUgZUJ1c2luZXNzIENBLTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQw -MDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5j -LjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENBLTEwgZ8wDQYJ -KoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ1MRo -RvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBu -WqDZQu4aIZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKw -Env+j6YDAgMBAAGjZjBkMBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTAD -AQH/MB8GA1UdIwQYMBaAFEp4MlIR21kWNl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRK -eDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQFAAOBgQB1W6ibAxHm6VZM -zfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5lSE/9dR+ -WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN -/Bf+KpYrtWKmpj29f5JZzVoqgrI3eQ== +MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDEl +MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMh +U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIz +MloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09N +IFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNlY3VyaXR5IENvbW11 +bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSE +RMqm4miO/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gO +zXppFodEtZDkBp2uoQSXWHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5 +bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4zZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDF +MxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4bepJz11sS6/vmsJWXMY1 +VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK9U2vP9eC +OKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G +CSqGSIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HW +tWS3irO4G8za+6xmiEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZ +q51ihPZRwSzJIxXYKLerJRO1RuGGAv8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDb +EJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnWmHyojf6GPgcWkuF75x3sM3Z+ +Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEWT1MKZPlO9L9O +VL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490 -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIDIDCCAomgAwIBAgIEN3DPtTANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV -UzEXMBUGA1UEChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2Vj -dXJlIGVCdXNpbmVzcyBDQS0yMB4XDTk5MDYyMzEyMTQ0NVoXDTE5MDYyMzEyMTQ0 -NVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDkVxdWlmYXggU2VjdXJlMSYwJAYD -VQQLEx1FcXVpZmF4IFNlY3VyZSBlQnVzaW5lc3MgQ0EtMjCBnzANBgkqhkiG9w0B -AQEFAAOBjQAwgYkCgYEA5Dk5kx5SBhsoNviyoynF7Y6yEb3+6+e0dMKP/wXn2Z0G -vxLIPw7y1tEkshHe0XMJitSxLJgJDR5QRrKDpkWNYmi7hRsgcDKqQM2mll/EcTc/ -BPO3QSQ5BxoeLmFYoBIL5aXfxavqN3HMHMg3OrmXUqesxWoklE6ce8/AatbfIb0C -AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEX -MBUGA1UEChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2VjdXJl -IGVCdXNpbmVzcyBDQS0yMQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTkw -NjIzMTIxNDQ1WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUUJ4L6q9euSBIplBq -y/3YIHqngnYwHQYDVR0OBBYEFFCeC+qvXrkgSKZQasv92CB6p4J2MAwGA1UdEwQF -MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA -A4GBAAyGgq3oThr1jokn4jVYPSm0B482UJW/bsGe68SQsoWou7dC4A8HOd/7npCy -0cE+U58DRLB+S/Rv5Hwf5+Kx5Lia78O9zt4LMjTZ3ijtM2vE1Nc9ElirfQkty3D1 -E4qUoSek1nDFbZS1yX2doNLGCEnZZpum0/QL3MUmV+GRMOrN +MIICPDCCAaUCEAq6HgBiMui0NiZdH3zNiWYwDQYJKoZIhvcNAQEFBQAwXzELMAkG +A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz +cyAyIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2 +MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV +BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAyIFB1YmxpYyBQcmlt +YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN +ADCBiQKBgQC2WoujDWojg4BrzzmH9CETMwZMJaLtVRKXxaeAufqDwSCg+i8VDXyh +YGt+eSz6Bg86rvYbb7HS/y8oUl+DfUvEerf4Zh+AVPy3wo5ZShRXRtGak75BkQO7 +FYCTXOvnzAhsPz6zSvz/S2wj1VCCJkQZjiPDceoZJEcEnnW/yKYAHwIDAQABMA0G +CSqGSIb3DQEBBQUAA4GBAIDToA+IyeVoW4R7gB+nt+MjWBEc9RTwWBKMi99x2ZAk +EXyge8N6GRm9cr0gvwA63/rVeszC42JFi8tJg5jBcGnQnl6CjDVHjk8btB9jAa3k +ltax7nosZm4XNq8afjgGhixrTcsnkm54vwDVAcCxB8MJqmSFKPKdc57PYDoKHUpI -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEc -MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBT -ZWN1cmUgR2xvYmFsIGVCdXNpbmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIw -MDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0VxdWlmYXggU2Vj -dXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEdsb2JhbCBlQnVzaW5l -c3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRVPEnC -UdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc -58O/gGzNqfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/ -o5brhTMhHD4ePmBudpxnhcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAH -MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUvqigdHJQa0S3ySPY+6j/s1dr -aGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hsMA0GCSqGSIb3DQEBBAUA -A4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okENI7SS+RkA -Z70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv -8qIYNMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV +MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUx +ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0 +b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQD +EytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBDKSBUYW51c2l0dmFueWtpYWRvMB4X +DTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJBgNVBAYTAkhVMREw +DwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9u +c2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMr +TmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzAN +BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNA +OoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3ZW3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC +2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63euyucYT2BDMIJTLrdKwW +RMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQwDgYDVR0P +AQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEW +ggJNRklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0 +YWxhbm9zIFN6b2xnYWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFz +b2sgYWxhcGphbiBrZXN6dWx0LiBBIGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBO +ZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1iaXp0b3NpdGFzYSB2ZWRpLiBB +IGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0ZWxlIGF6IGVs +b2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs +ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25s +YXBqYW4gYSBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kg +a2VyaGV0byBheiBlbGxlbm9yemVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4g +SU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5kIHRoZSB1c2Ugb2YgdGhpcyBjZXJ0 +aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQUyBhdmFpbGFibGUg +YXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwgYXQg +Y3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmY +ta3UzbM2xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2g +pO0u9f38vf5NNwgMvOOWgyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4 +Fp1hBWeAyNDYpQcCNJgEjTME1A== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT -MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i -YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG -EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg -R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9 -9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq -fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv -iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU -1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+ -bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW -MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA -ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l -uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn -Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS -tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF -PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un -hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV -5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw== +MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAw +PTELMAkGA1UEBhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFz +cyAyIFByaW1hcnkgQ0EwHhcNOTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9 +MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2VydHBsdXMxGzAZBgNVBAMTEkNsYXNz +IDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxQ +ltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR5aiR +VhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyL +kcAbmXuZVg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCd +EgETjdyAYveVqUSISnFOYFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yas +H7WLO7dDWWuwJKZtkIvEcupdM5i3y95ee++U8Rs+yskhwcWYAqqi9lt3m/V+llU0 +HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRMECDAGAQH/AgEKMAsGA1Ud +DwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJYIZIAYb4 +QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMu +Y29tL0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/ +AN9WM2K191EBkOvDP9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8 +yfFC82x/xXp8HVGIutIKPidd3i1RTtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMR +FcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+7UCmnYR0ObncHoUW2ikbhiMA +ybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW//1IMwrh3KWB +kJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7 +l7+ijrRU +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICoTCCAgqgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBizELMAkGA1UEBhMCWkEx +FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTEUMBIGA1UEBxMLRHVyYmFudmlsbGUxDzAN +BgNVBAoTBlRoYXd0ZTEdMBsGA1UECxMUVGhhd3RlIENlcnRpZmljYXRpb24xHzAd +BgNVBAMTFlRoYXd0ZSBUaW1lc3RhbXBpbmcgQ0EwHhcNOTcwMTAxMDAwMDAwWhcN +MjAxMjMxMjM1OTU5WjCBizELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4g +Q2FwZTEUMBIGA1UEBxMLRHVyYmFudmlsbGUxDzANBgNVBAoTBlRoYXd0ZTEdMBsG +A1UECxMUVGhhd3RlIENlcnRpZmljYXRpb24xHzAdBgNVBAMTFlRoYXd0ZSBUaW1l +c3RhbXBpbmcgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANYrWHhhRYZT +6jR7UZztsOYuGA7+4F+oJ9O0yeB8WU4WDnNUYMF/9p8u6TqFJBU820cEY8OexJQa +Wt9MevPZQx08EHp5JduQ/vBR5zDWQQD9nyjfeb6Uu522FOMjhdepQeBMpHmwKxqL +8vg7ij5FrHGSALSQQZj7X+36ty6K+Ig3AgMBAAGjEzARMA8GA1UdEwEB/wQFMAMB +Af8wDQYJKoZIhvcNAQEEBQADgYEAZ9viwuaHPUCDhjc1fR/OmsMMZiCouqoEiYbC +9RAIDb/LogWK0E02PvTX72nGXuSwlG9KuefeW4i2e9vjJ+V2w/A1wcu1J5szedyQ +pgCed/r8zSeUQhac0xxo7L9c3eWpexAKMnRUEzGLhQOEkbdYATAUOK8oyvyxUBkZ +CayJSdM= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBi +MQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu +MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3Jp +dHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJV +UzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydO +ZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwz +c7MEL7xxjOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPP +OCwGJgl6cvf6UDL4wpPTaaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rl +mGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXTcrA/vGp97Eh/jcOrqnErU2lBUzS1sLnF +BgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc/Qzpf14Dl847ABSHJ3A4 +qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMBAAGjgZcw +gZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIB +BjAPBgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwu +bmV0c29sc3NsLmNvbS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3Jp +dHkuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc8 +6fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q4LqILPxFzBiwmZVRDuwduIj/ +h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/GGUsyfJj4akH +/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv +wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHN +pGxlaKFJdlxDydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDgDCCAmigAwIBAgICAx4wDQYJKoZIhvcNAQEFBQAwYTELMAkGA1UEBhMCVVMx +DTALBgNVBAoTBFZJU0ExLzAtBgNVBAsTJlZpc2EgSW50ZXJuYXRpb25hbCBTZXJ2 +aWNlIEFzc29jaWF0aW9uMRIwEAYDVQQDEwlHUCBSb290IDIwHhcNMDAwODE2MjI1 +MTAwWhcNMjAwODE1MjM1OTAwWjBhMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklT +QTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRp +b24xEjAQBgNVBAMTCUdQIFJvb3QgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBAKkBcLWqxEDwq2omYXkZAPy/mzdZDK9vZBv42pWUJGkzEXDK41Z0ohdX +ZFwgBuHW73G3O/erwWnQSaSxBNf0V2KJXLB1LRckaeNCYOTudNargFbYiCjh+20i +/SN8RnNPflRzHqgsVVh1t0zzWkWlAhr62p3DRcMiXvOL8WAp0sdftAw6UYPvMPjU +58fy+pmjIlC++QU3o63tmsPm7IgbthknGziLgE3sucfFicv8GjLtI/C1AVj59o/g +halMCXI5Etuz9c9OYmTaxhkVOmMd6RdVoUwiPDQyRvhlV7or7zaMavrZ2UT0qt2E +1w0cslSsMoW0ZA3eQbuxNMYBhjJk1Z8CAwEAAaNCMEAwHQYDVR0OBBYEFJ59SzS/ +ca3CBfYDdYDOqU8axCRMMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEG +MA0GCSqGSIb3DQEBBQUAA4IBAQAhpXYUVfmtJ3CPPPTVbMjMCqujmAuKBiPFyWHb +mQdpNSYx/scuhMKZYdQN6X0uEyt8joW2hcdLzzW2LEc9zikv2G+fiRxkk78IvXbQ +kIqUs38oW26sTTMs7WXcFsziza6kPWKSBpUmv9+55CCmc2rBvveURNZNbyoLaxhN +dBA2aGpawWqn3TYpjLgwi08hPwAuVDAHOrqK5MOeyti12HvOdUVmB/RtLdh6yumJ +ivIj2C/LbgA2T/vwLwHMD8AiZfSr4k5hLQOCfZEWtTDVFN5ex5D8ofyrEK9ca3Cn +B+8phuiyJccg/ybdd+95RBTEvd07xQObdyPsoOy7Wjm1zK0G +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEajCCA1KgAwIBAgIBATANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJKUDEN +MAsGA1UECgwESlBLSTEpMCcGA1UECwwgUHJlZmVjdHVyYWwgQXNzb2NpYXRpb24g +Rm9yIEpQS0kxETAPBgNVBAsMCEJyaWRnZUNBMB4XDTAzMTIyNzA1MDgxNVoXDTEz +MTIyNjE0NTk1OVowWjELMAkGA1UEBhMCSlAxDTALBgNVBAoMBEpQS0kxKTAnBgNV +BAsMIFByZWZlY3R1cmFsIEFzc29jaWF0aW9uIEZvciBKUEtJMREwDwYDVQQLDAhC +cmlkZ2VDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANTnUmg7K3m8 +52vd77kwkq156euwoWm5no8E8kmaTSc7x2RABPpqNTlMKdZ6ttsyYrqREeDkcvPL +yF7yf/I8+innasNtsytcTAy8xY8Avsbd4JkCGW9dyPjk9pzzc3yLQ64Rx2fujRn2 +agcEVdPCr/XpJygX8FD5bbhkZ0CVoiASBmlHOcC3YpFlfbT1QcpOSOb7o+VdKVEi +MMfbBuU2IlYIaSr/R1nO7RPNtkqkFWJ1/nKjKHyzZje7j70qSxb+BTGcNgTHa1YA +UrogKB+UpBftmb4ds+XlkEJ1dvwokiSbCDaWFKD+YD4B2s0bvjCbw8xuZFYGhNyR +/2D5XfN1s2MCAwEAAaOCATkwggE1MA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E +BTADAQH/MG0GA1UdHwRmMGQwYqBgoF6kXDBaMQswCQYDVQQGEwJKUDENMAsGA1UE +CgwESlBLSTEpMCcGA1UECwwgUHJlZmVjdHVyYWwgQXNzb2NpYXRpb24gRm9yIEpQ +S0kxETAPBgNVBAsMCEJyaWRnZUNBMIGDBgNVHREEfDB6pHgwdjELMAkGA1UEBhMC +SlAxJzAlBgNVBAoMHuWFrOeahOWAi+S6uuiqjeiovOOCteODvOODk+OCuTEeMBwG +A1UECwwV6YO96YGT5bqc55yM5Y2U6K2w5LyaMR4wHAYDVQQLDBXjg5bjg6rjg4Pj +grjoqo3oqLzlsYAwHQYDVR0OBBYEFNQXMiCqQNkR2OaZmQgLtf8mR8p8MA0GCSqG +SIb3DQEBBQUAA4IBAQATjJo4reTNPC5CsvAKu1RYT8PyXFVYHbKsEpGt4GR8pDCg +HEGAiAhHSNrGh9CagZMXADvlG0gmMOnXowriQQixrtpkmx0TB8tNAlZptZWkZC+R +8TnjOkHrk2nFAEC3ezbdK0R7MR4tJLDQCnhEWbg50rf0wZ/aF8uAaVeEtHXa6W0M +Xq3dSe0XAcrLbX4zZHQTaWvdpLAIjl6DZ3SCieRMyoWUL+LXaLFdTP5WBCd+No58 +IounD9X4xxze2aeRVaiV/WnQ0OSPNS7n7YXy6xQdnaOU4KRW/Lne1EDf5IfWC/ih +bVAmhZMbcrkWWcsR6aCPG+2mV3zTD6AUzuKPal8Y +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJB +VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp +bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5R +dWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5RdWFsLTAzMB4XDTA1MDgxNzIyMDAw +MFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgwRgYDVQQKDD9BLVRy +dXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0ZW52 +ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMM +EEEtVHJ1c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQCtPWFuA/OQO8BBC4SAzewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUj +lUC5B3ilJfYKvUWG6Nm9wASOhURh73+nyfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZ +znF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPESU7l0+m0iKsMrmKS1GWH +2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4iHQF63n1 +k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs +2e3Vcuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYD +VR0OBAoECERqlWdVeRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC +AQEAVdRU0VlIXLOThaq/Yy/kgM40ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fG +KOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmrsQd7TZjTXLDR8KdCoLXEjq/+ +8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZdJXDRZslo+S4R +FGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS +mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmE +DNuxUCAKGkq6ahq97BvIxYSazQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx +EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoT +EUdvRGFkZHkuY29tLCBJbmMuMTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRp +ZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIz +NTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQH +EwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8GA1UE +AxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIw +DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKD +E6bFIEMBO4Tx5oVJnyfq9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH +/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD+qK+ihVqf94Lw7YZFAXK6sOoBJQ7Rnwy +DfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutdfMh8+7ArU6SSYmlRJQVh +GkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMlNAJWJwGR +tDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEA +AaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE +FDqahQcQZyi27/a9BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmX +WWcDYfF+OwYxdS2hII5PZYe096acvNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu +9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r5N9ss4UXnT3ZJE95kTXWXwTr +gIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYVN8Gb5DKj7Tjo +2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO +LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI +4uJEvlz36hz1 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G +A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp +Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1 +MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG +A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL +v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8 +eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq +tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd +C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa +zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB +mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH +V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n +bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG +3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs +J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO +291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS +ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd +AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7 +TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G +A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp +Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4 +MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG +A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8 +RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT +gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm +KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd +QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ +XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw +DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o +LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU +RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp +jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK +6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX +mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs +Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH +WD9f -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIDdTCCAl2gAwIBAgILAgAAAAAA1ni3lAUwDQYJKoZIhvcNAQEEBQAwVzELMAkG @@ -837,19 +825,305 @@ ncJWWJh3w/cbrPad+D6qp1RF8PX51TFl/mtYnHGzHtdS6jIX/EBgHcl5JLL2bP2o Zg6C3ZjL2sJETy6ge/L3ayx2EYRGinij4w== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYD -VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv -bHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJv -b3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEzMjM1OTAwWjB1MQswCQYDVQQGEwJV -UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU -cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds -b2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrH -iM3dFw4usJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTS -r41tiGeA5u2ylc9yMcqlHHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X4 -04Wqk2kmhXBIgD8SFcd5tB8FLztimQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAG3r -GwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMWM4ETCJ57NE7fQMh017l9 -3PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OFNMQkpw0P -lZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/ +MIIETTCCAzWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJDSDEO +MAwGA1UEChMFYWRtaW4xETAPBgNVBAsTCFNlcnZpY2VzMSIwIAYDVQQLExlDZXJ0 +aWZpY2F0aW9uIEF1dGhvcml0aWVzMRcwFQYDVQQDEw5BZG1pbkNBLUNELVQwMTAe +Fw0wNjAxMjUxMzM2MTlaFw0xNjAxMjUxMjM2MTlaMG0xCzAJBgNVBAYTAkNIMQ4w +DAYDVQQKEwVhZG1pbjERMA8GA1UECxMIU2VydmljZXMxIjAgBgNVBAsTGUNlcnRp +ZmljYXRpb24gQXV0aG9yaXRpZXMxFzAVBgNVBAMTDkFkbWluQ0EtQ0QtVDAxMIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0jQlMZmpLDhV+GNR9TAoSNle +JgQB4xAXJELQf5/ySMfoFA4MmjKqYXQkB6MGPuQKwR9XRRSPf61vqb8YPsdjRmgp +byHBcUd5t0N8RX6wRZUnPMW+bCCo2VqAU4XFbnlc2gHKaam0wdTtbBTXEkv0ieIH +fxCfFxXqSsSr60IkF/2/xbrAgV/QD5yHk6Ie8feAVWwi5UtaFqtu4LiFEh2QMyxs +Oyz1OcvKzkM2g873tyiE7jzMgZP+Ww3tibk2F9+e6ZeiB37TLOmVtvgpmrws4fiI +rFNXEYSWBVrUTbn81U47yWzOgf5fEHP07bRV5QOCzCm99qNimsbL6CG7nT78CQID +AQABo4H3MIH0MBIGA1UdEwEB/wQIMAYBAf8CAQAwga4GA1UdIASBpjCBozCBoAYI +YIV0AREDFQEwgZMwSAYIKwYBBQUHAgIwPBo6VGhpcyBpcyB0aGUgQWRtaW5DQS1D +RC1UMDEgQ2VydGlmaWNhdGUgUHJhY3RpY2UgU3RhdGVtZW50LjBHBggrBgEFBQcC +ARY7aHR0cDovL3d3dy5wa2kuYWRtaW4uY2gvcG9saWN5L0NQU18yXzE2Xzc1Nl8x +XzE3XzNfMjFfMS5wZGYwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQqxGkKocZV +xgNucM6GgbOkD6oZ2zANBgkqhkiG9w0BAQUFAAOCAQEAn356bbusjI5glGXRQ1DR +v21qQf0S4s3GHyZm7cqdOkFleM70ArBT+kOP5Nm7rlSAFyVgEkmBdOg7s9tlXClU +yeZFnp6UEYRUcijPN8D1VaNRK6PIUObpDBQT0C+kAfxG9z4v29T0SxT4sgAdC/xQ +Fyv58Fp9bPn7owuKwKcyCH1XSyi/Bp4XFELlLOaigBZO/w+dPBz4FcJSdZjU+BaJ +0E3nKAjHlShO5ouBSZnaJz3p+nkw2Wyo36s6GxCK0XbkSP45iniIG4FmwwZkonYF +ypQntHbx2oL7tUQQY0PDo8bGBMcPy/G2j+dciqZRlsnfgMy10SCzQ9MUx92xUG2V +eg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQG +EwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3 +MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNl +cnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBBcmFueSAoQ2xhc3MgR29sZCkgRsWR +dGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgxMjA2MTUwODIxWjCB +pzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxOZXRM +b2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlm +aWNhdGlvbiBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNz +IEdvbGQpIEbFkXRhbsO6c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAxCRec75LbRTDofTjl5Bu0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrT +lF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw/HpYzY6b7cNGbIRwXdrz +AZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAkH3B5r9s5 +VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRG +ILdwfzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2 +BJtr+UBdADTHLpl1neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAG +AQH/AgEEMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2M +U9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwWqZw8UQCgwBEIBaeZ5m8BiFRh +bvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTtaYtOUZcTh5m2C ++C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC +bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2F +uLjbvrW5KfnaNwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2 +XjG4Kvte9nHfRCaexOYNkbQudZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBM +MSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5D +ZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBU +cnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIyMTIwNzM3WhcNMjkxMjMxMTIwNzM3 +WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMg +Uy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSIw +IAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rH +UV+rpDKmYYe2bg+G0jACl/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LM +TXPb865Px1bVWqeWifrzq2jUI4ZZJ88JJ7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVU +BBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4fOQtf/WsX+sWn7Et0brM +kUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0cvW0QM8x +AcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNV +HRMBAf8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNV +HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15y +sHhE49wcrwn9I0j6vSrEuVUEtRCjjSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfL +I9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1mS1FhIrlQgnXdAIv94nYmem8 +J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5ajZt3hrvJBW8qY +VoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI +03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNV +BAMML0VCRyBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx +c8SxMTcwNQYDVQQKDC5FQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXpt +ZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAeFw0wNjA4MTcwMDIxMDlaFw0xNjA4 +MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25payBTZXJ0aWZpa2Eg +SGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2ltIFRl +a25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIi +MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h +4fuXd7hxlugTlkaDT7byX3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAk +tiHq6yOU/im/+4mRDGSaBUorzAzu8T2bgmmkTPiab+ci2hC6X5L8GCcKqKpE+i4s +tPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfreYteIAbTdgtsApWjluTL +dlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZTqNGFav4 +c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8Um +TDGyY5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z ++kI2sSXFCjEmN1ZnuqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0O +Lna9XvNRiYuoP1Vzv9s6xiQFlpJIqkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMW +OeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vmExH8nYQKE3vwO9D8owrXieqW +fo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0Nokb+Clsi7n2 +l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB +/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgw +FoAU587GT/wWZ5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+ +8ygjdsZs93/mQJ7ANtyVDR2tFcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI +6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgmzJNSroIBk5DKd8pNSe/iWtkqvTDO +TLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64kXPBfrAowzIpAoHME +wfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqTbCmY +Iai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJn +xk1Gj7sURT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4Q +DgZxGhBM/nV+/x5XOULK1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9q +Kd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11t +hie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQY9iJSrSq3RZj9W6+YKH4 +7ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9AahH3eU7 +QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML +RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp +bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5 +IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp +ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0yOTA3 +MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3 +LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp +YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG +A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq +K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe +sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX +MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT +XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/ +HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH +4QIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV +HQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJKoZIhvcNAQEFBQADggEBADub +j1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPyT/4xmf3IDExo +U8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf +zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5b +u/8j72gZyxKTJ1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+ +bYQLCIt+jerXmCHG8+c8eS9enNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/Er +fF6adulZkMV8gzURZVE= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIGJDCCBY2gAwIBAgIEQoaroDANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC +VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u +ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc +KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u +ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjA3 +MTQxNzEwMjhaFw0xNDA3MTQxNzQwMjhaMFwxCzAJBgNVBAYTAlVTMRUwEwYDVQQK +EwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGzAZBgNV +BAMTEkRpZ2lDZXJ0IEdsb2JhbCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBAMQ8vMy66mLmnkIjr7SyEa5ijdmh04/MFHIZ7Zn2/d5du1nAsMKvaplS +lVcLNf/hhvqvosPBBWUnIHYvClQlfOor3ZVBV5sPO89H6AEGjMVESPwHLvNygzBR +lJ5pOoOph5AU2V7EoniPwT7UGWEOGufcGpUgQb5vF9q4HEHumLD61x01PxanBCgT +XT0FdZouhp4ssBeHIFhX7+HqVWC4LHAhrCljDBD8YLz51Rw3ZNW0+x6rJjlGiKTL +zTBnwCZ55cpo+SLX5dKxu0hMmwuYW0KS5dLtDkcw+t0nVmNqpQHHjq/wTjsbVRVE +1T5NVx7hkeq4oI/OOmNflom6CD7+RLsCAwEAAaOCAwUwggMBMBIGA1UdEwEB/wQI +MAYBAf8CAQAwggEyBgNVHSAEggEpMIIBJTCCASEGCSqGSIb2fQdLAjCCARIwJgYI +KwYBBQUHAgEWGmh0dHA6Ly93d3cuZW50cnVzdC5uZXQvY3BzMIHnBggrBgEFBQcC +AjCB2hqB10ZvciB1c2Ugc29sZWx5IHdpdGggU1NMIGFuZCBTL01JTUUgY2VydGlm +aWNhdGVzIGlzc3VlZCBieSBEaWdpY2VydCwgSW5jLiB0byBhdXRob3JpemVkIHN1 +YnNjcmliZXJzLg0KRE9FUyBOT1QgcmVwcmVzZW50IGFueSBlbmRvcnNlbWVudCBi +eSBFbnRydXN0IEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMgYXMgdG8gdGhlIGlkZW50 +aXR5IG9mIGFueSBjZXJ0aWZpY2F0ZSBob2xkZXIuMDEGA1UdJQQqMCgGCCsGAQUF +BwMBBggrBgEFBQcDAgYIKwYBBQUHAwQGCCsGAQUFBwMJMIIBGAYDVR0fBIIBDzCC +AQswKKAmoCSGImh0dHA6Ly9jcmwuZW50cnVzdC5uZXQvc2VydmVyMS5jcmwwgd6g +gduggdikgdUwgdIxCzAJBgNVBAYTAlVTMRQwEgYDVQQKEwtFbnRydXN0Lm5ldDE7 +MDkGA1UECxMyd3d3LmVudHJ1c3QubmV0L0NQUyBpbmNvcnAuIGJ5IHJlZi4gKGxp +bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0 +ZWQxOjA4BgNVBAMTMUVudHJ1c3QubmV0IFNlY3VyZSBTZXJ2ZXIgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkxDTALBgNVBAMTBENSTDEwCwYDVR0PBAQDAgEGMB8GA1Ud +IwQYMBaAFPAXYhNVPbP/CgBr+1CEl/PtYtAaMB0GA1UdDgQWBBSnxxOgegE8ne+C +SIJI1XNRthJWKjAZBgkqhkiG9n0HQQAEDDAKGwRWNy4xAwIAgTANBgkqhkiG9w0B +AQUFAAOBgQBK8bPOaGnjWKNh7bYWyJOxGDA+4HLfTz3iTeG4/D/ByeNFqV2pwdqj +5TbXjtYPrTavbLxE5ppGlKYRoNBS59pVsPYchftjUnu2mY8f4stHZKLrCGXmUdsc +S21/U58eDTGT1DBdHm4BBydgXbvT9ONsHSAPdSozEKe3idepFxQyAw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOc +UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx +c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xS +S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg +SGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcNMDUxMTA3MTAwNzU3 +WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVrdHJv +bmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJU +UjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSw +bGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWe +LiAoYykgS2FzxLFtIDIwMDUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqeLCDe2JAOCtFp0if7qnef +J1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKIx+XlZEdh +R3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJ +Qv2gQrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGX +JHpsmxcPbe9TmJEr5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1p +zpwACPI2/z7woQ8arBT9pmAPAgMBAAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58S +Fq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8GA1UdEwEB/wQFMAMBAf8wDQYJ +KoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/nttRbj2hWyfIvwq +ECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4 +Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFz +gw2lGh1uEpJ+hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotH +uFEJjOp9zYhys2AzsfAKRO8P9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LS +y3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5UrbnBEI= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICPDCCAaUCEC0b/EoXjaOR6+f/9YtFvgswDQYJKoZIhvcNAQECBQAwXzELMAkG +A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz +cyAyIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2 +MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV +BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAyIFB1YmxpYyBQcmlt +YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN +ADCBiQKBgQC2WoujDWojg4BrzzmH9CETMwZMJaLtVRKXxaeAufqDwSCg+i8VDXyh +YGt+eSz6Bg86rvYbb7HS/y8oUl+DfUvEerf4Zh+AVPy3wo5ZShRXRtGak75BkQO7 +FYCTXOvnzAhsPz6zSvz/S2wj1VCCJkQZjiPDceoZJEcEnnW/yKYAHwIDAQABMA0G +CSqGSIb3DQEBAgUAA4GBAIobK/o5wXTXXtgZZKJYSi034DNHD6zt96rbHuSLBlxg +J8pFUs4W7z8GZOeUaHxgMxURaa+dYo2jA1Rrpr7l7gUYYAS/QoD90KioHgE796Nc +r6Pc5iaAIzy4RHT3Cq5Ji2F4zCS/iIqnDupzGUH9TQPwiNHleI2lKk/2lw0Xd8rY +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIETzCCAzegAwIBAgIEO63vKTANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJQ +TDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2Vu +dHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MRswGQYDVQQDExJDQyBTaWduZXQgLSBS +b290Q0EwHhcNMDEwOTIzMTQxODE3WhcNMTEwOTIzMTMxODE3WjB1MQswCQYDVQQG +EwJQTDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMb +Q2VudHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MR8wHQYDVQQDExZDQyBTaWduZXQg +LSBDQSBLbGFzYSAxMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4SRW9Q58g +5DY1Hw7hgCRKBEdPdGn0MFHsfw7rlu/oQm7IChI/uWd9q5wwo77YojtTDjRnpgZs +jqBeynX8T90vFILqsY2K5CF1OESalwvVr3sZiQX79lisuFKat92u6hBFikFIVxfH +HB67Af+g7u0dEHdDW7lwy81MwFYxBTRy9wIDAQABo4IBbTCCAWkwDwYDVR0TAQH/ +BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwggEEBgNVHSAEgfwwgfkwgfYGDSsGAQQB +vj8CAQoBAQAwgeQwgZoGCCsGAQUFBwICMIGNGoGKQ2VydHlmaWthdCB3eXN0YXdp +b255IHpnb2RuaWUgeiBkb2t1bWVudGVtOiAiUG9saXR5a2EgQ2VydHlmaWthY2pp +IGRsYSBSb290Q0EiLiBDZXJ0eWZpa2F0IHd5c3Rhd2lvbnkgcHJ6ZXogUm9vdENB +IHcgaGllcmFyY2hpaSBDQyBTaWduZXQuMEUGCCsGAQUFBwIBFjlodHRwOi8vd3d3 +LnNpZ25ldC5wbC9yZXBvenl0b3JpdW0vZG9rdW1lbnR5L3BjX3Jvb3RjYS50eHQw +HwYDVR0jBBgwFoAUwJvFIw0C4aZOSGsfAOnjmhQbsa8wHQYDVR0OBBYEFMODHtVZ +d1T7TftXR/nEI1zR54njMA0GCSqGSIb3DQEBBQUAA4IBAQBRIHQBFIGh8Jpxt87A +gSLwIEEk4+oGy769u3NtoaR0R3WNMdmt7fXTi0tyTQ9V4AIszxVjhnUPaKnF1KYy +f8Tl+YTzk9ZfFkZ3kCdSaILZAOIrmqWNLPmjUQ5/JiMGho0e1YmWUcMci84+pIis +TsytFzVP32/W+sz2H4FQAvOIMmxB7EJX9AdbnXn9EXZ+4nCqi0ft5z96ZqOJJiCB +3vSaoYg+wdkcvb6souMJzuc2uptXtR1Xf3ihlHaGW+hmnpcwFA6AoNrom6Vgzk6U +1ienx0Cw28BhRSKqzKkyXkuK8gRflZUx84uftXncwKJrMiE3lvgOOBITRzcahirL +er4c +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsx +FjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3Qg +Um9vdCBDQSAxMB4XDTAzMDUxNTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkG +A1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdr +b25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1ApzQ +jVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEn +PzlTCeqrauh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjh +ZY4bXSNmO7ilMlHIhqqhqZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9 +nnV0ttgCXjqQesBCNnLsak3c78QA3xMYV18meMjWCnl3v/evt3a5pQuEF10Q6m/h +q5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgED +MA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7ih9legYsC +mEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI3 +7piol7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clB +oiMBdDhViw+5LmeiIAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJs +EhTkYY2sEJCehFC78JZvRZ+K88psT/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpO +fMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilTc4afU9hDDl3WY4JxHYB0yvbi +AmvZWg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB +lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug +Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho +dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt +SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG +A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe +MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v +d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh +cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn +0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ +M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a +MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd +oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI +DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy +oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD +VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0 +dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy +bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF +BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM +//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli +CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE +CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t +3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS +KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBb +MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3Qx +ETAPBgNVBAsTCERTVCBBQ0VTMRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0w +MzExMjAyMTE5NThaFw0xNzExMjAyMTE5NThaMFsxCzAJBgNVBAYTAlVTMSAwHgYD +VQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UECxMIRFNUIEFDRVMx +FzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPu +ktKe1jzIDZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7 +gLFViYsx+tC3dr5BPTCapCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZH +fAjIgrrep4c9oW24MFbCswKBXy314powGCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4a +ahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPyMjwmR/onJALJfh1biEIT +ajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1UdEwEB/wQF +MAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rk +c3QuY29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjto +dHRwOi8vd3d3LnRydXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMt +aW5kZXguaHRtbDAdBgNVHQ4EFgQUCXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZI +hvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V25FYrnJmQ6AgwbN99Pe7lv7Uk +QIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6tFr8hlxCBPeP/ +h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq +nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpR +rscL9yuwNwXsvFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf2 +9w4LTJxoeHtxMcfrHuBnQfO3oKfN5XozNmr6mis= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIH9zCCB2CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARwxCzAJBgNVBAYTAkVT @@ -897,950 +1171,6 @@ HnNDJGD1HWHc3JagvPsd4+cSACczAsDAK1M92GsDgaPb1pOVIO/Tln4mkImcJpvN b2ar7QMiRDjMWb2f2/YHogF/JsRj9SVCXmK9 -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIH6jCCB1OgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARIxCzAJBgNVBAYTAkVT -MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE -ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE -ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEuMCwGA1UECxMl -SVBTIENBIENMQVNFMSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMl -SVBTIENBIENMQVNFMSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEeMBwGCSqGSIb3 -DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTAxMTIyOTAwNTkzOFoXDTI1MTIyNzAw -NTkzOFowggESMQswCQYDVQQGEwJFUzESMBAGA1UECBMJQmFyY2Vsb25hMRIwEAYD -VQQHEwlCYXJjZWxvbmExLjAsBgNVBAoTJUlQUyBJbnRlcm5ldCBwdWJsaXNoaW5n -IFNlcnZpY2VzIHMubC4xKzApBgNVBAoUImlwc0BtYWlsLmlwcy5lcyBDLkkuRi4g -IEItNjA5Mjk0NTIxLjAsBgNVBAsTJUlQUyBDQSBDTEFTRTEgQ2VydGlmaWNhdGlv -biBBdXRob3JpdHkxLjAsBgNVBAMTJUlQUyBDQSBDTEFTRTEgQ2VydGlmaWNhdGlv -biBBdXRob3JpdHkxHjAcBgkqhkiG9w0BCQEWD2lwc0BtYWlsLmlwcy5lczCBnzAN -BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4FEnpwvdr9G5Q1uCN0VWcu+atsIS7ywS -zHb5BlmvXSHU0lq4oNTzav3KaY1mSPd05u42veiWkXWmcSjK5yISMmmwPh5r9FBS -YmL9Yzt9fuzuOOpi9GyocY3h6YvJP8a1zZRCb92CRTzo3wno7wpVqVZHYUxJZHMQ -KD/Kvwn/xi8CAwEAAaOCBEowggRGMB0GA1UdDgQWBBTrsxl588GlHKzcuh9morKb -adB4CDCCAUQGA1UdIwSCATswggE3gBTrsxl588GlHKzcuh9morKbadB4CKGCARqk -ggEWMIIBEjELMAkGA1UEBhMCRVMxEjAQBgNVBAgTCUJhcmNlbG9uYTESMBAGA1UE -BxMJQmFyY2Vsb25hMS4wLAYDVQQKEyVJUFMgSW50ZXJuZXQgcHVibGlzaGluZyBT -ZXJ2aWNlcyBzLmwuMSswKQYDVQQKFCJpcHNAbWFpbC5pcHMuZXMgQy5JLkYuICBC -LTYwOTI5NDUyMS4wLAYDVQQLEyVJUFMgQ0EgQ0xBU0UxIENlcnRpZmljYXRpb24g -QXV0aG9yaXR5MS4wLAYDVQQDEyVJUFMgQ0EgQ0xBU0UxIENlcnRpZmljYXRpb24g -QXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOCAQAwDAYD -VR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMBBggr -BgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIB -FQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhC -AQEEBAMCAAcwGgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGB -D2lwc0BtYWlsLmlwcy5lczBBBglghkgBhvhCAQ0ENBYyQ0xBU0UxIENBIENlcnRp -ZmljYXRlIGlzc3VlZCBieSBodHRwOi8vd3d3Lmlwcy5lcy8wKQYJYIZIAYb4QgEC -BBwWGmh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvMDoGCWCGSAGG+EIBBAQtFito -dHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRTEuY3JsMD8GCWCG -SAGG+EIBAwQyFjBodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL3Jldm9jYXRpb25D -TEFTRTEuaHRtbD8wPAYJYIZIAYb4QgEHBC8WLWh0dHA6Ly93d3cuaXBzLmVzL2lw -czIwMDIvcmVuZXdhbENMQVNFMS5odG1sPzA6BglghkgBhvhCAQgELRYraHR0cDov -L3d3dy5pcHMuZXMvaXBzMjAwMi9wb2xpY3lDTEFTRTEuaHRtbDBzBgNVHR8EbDBq -MDGgL6AthitodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRTEu -Y3JsMDWgM6Axhi9odHRwOi8vd3d3YmFjay5pcHMuZXMvaXBzMjAwMi9pcHMyMDAy -Q0xBU0UxLmNybDAvBggrBgEFBQcBAQQjMCEwHwYIKwYBBQUHMAGGE2h0dHA6Ly9v -Y3NwLmlwcy5lcy8wDQYJKoZIhvcNAQEFBQADgYEAK9Dr/drIyllq2tPMMi7JVBuK -Yn4VLenZMdMu9Ccj/1urxUq2ckCuU3T0vAW0xtnIyXf7t/k0f3gA+Nak5FI/LEpj -V4F1Wo7ojPsCwJTGKbqz3Bzosq/SLmJbGqmODszFV0VRFOlOHIilkfSj945RyKm+ -hjM+5i9Ibq9UkE6tsSU= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIH6jCCB1OgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARIxCzAJBgNVBAYTAkVT -MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE -ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE -ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEuMCwGA1UECxMl -SVBTIENBIENMQVNFMyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMl -SVBTIENBIENMQVNFMyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEeMBwGCSqGSIb3 -DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTAxMTIyOTAxMDE0NFoXDTI1MTIyNzAx -MDE0NFowggESMQswCQYDVQQGEwJFUzESMBAGA1UECBMJQmFyY2Vsb25hMRIwEAYD -VQQHEwlCYXJjZWxvbmExLjAsBgNVBAoTJUlQUyBJbnRlcm5ldCBwdWJsaXNoaW5n -IFNlcnZpY2VzIHMubC4xKzApBgNVBAoUImlwc0BtYWlsLmlwcy5lcyBDLkkuRi4g -IEItNjA5Mjk0NTIxLjAsBgNVBAsTJUlQUyBDQSBDTEFTRTMgQ2VydGlmaWNhdGlv -biBBdXRob3JpdHkxLjAsBgNVBAMTJUlQUyBDQSBDTEFTRTMgQ2VydGlmaWNhdGlv -biBBdXRob3JpdHkxHjAcBgkqhkiG9w0BCQEWD2lwc0BtYWlsLmlwcy5lczCBnzAN -BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqxf+DrDGaBtT8FK+n/ra+osTBLsBjzLZ -H49NzjaY2uQARIwo2BNEKqRrThckQpzTiKRBgtYj+4vJhuW5qYIF3PHeH+AMmVWY -8jjsbJ0gA8DvqqPGZARRLXgNo9KoOtYkTOmWehisEyMiG3zoMRGzXwmqMHBxRiVr -SXGAK5UBsh8CAwEAAaOCBEowggRGMB0GA1UdDgQWBBS4k/8uy9wsjqLnev42USGj -mFsMNDCCAUQGA1UdIwSCATswggE3gBS4k/8uy9wsjqLnev42USGjmFsMNKGCARqk -ggEWMIIBEjELMAkGA1UEBhMCRVMxEjAQBgNVBAgTCUJhcmNlbG9uYTESMBAGA1UE -BxMJQmFyY2Vsb25hMS4wLAYDVQQKEyVJUFMgSW50ZXJuZXQgcHVibGlzaGluZyBT -ZXJ2aWNlcyBzLmwuMSswKQYDVQQKFCJpcHNAbWFpbC5pcHMuZXMgQy5JLkYuICBC -LTYwOTI5NDUyMS4wLAYDVQQLEyVJUFMgQ0EgQ0xBU0UzIENlcnRpZmljYXRpb24g -QXV0aG9yaXR5MS4wLAYDVQQDEyVJUFMgQ0EgQ0xBU0UzIENlcnRpZmljYXRpb24g -QXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOCAQAwDAYD -VR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMBBggr -BgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIB -FQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhC -AQEEBAMCAAcwGgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGB -D2lwc0BtYWlsLmlwcy5lczBBBglghkgBhvhCAQ0ENBYyQ0xBU0UzIENBIENlcnRp -ZmljYXRlIGlzc3VlZCBieSBodHRwOi8vd3d3Lmlwcy5lcy8wKQYJYIZIAYb4QgEC -BBwWGmh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvMDoGCWCGSAGG+EIBBAQtFito -dHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRTMuY3JsMD8GCWCG -SAGG+EIBAwQyFjBodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL3Jldm9jYXRpb25D -TEFTRTMuaHRtbD8wPAYJYIZIAYb4QgEHBC8WLWh0dHA6Ly93d3cuaXBzLmVzL2lw -czIwMDIvcmVuZXdhbENMQVNFMy5odG1sPzA6BglghkgBhvhCAQgELRYraHR0cDov -L3d3dy5pcHMuZXMvaXBzMjAwMi9wb2xpY3lDTEFTRTMuaHRtbDBzBgNVHR8EbDBq -MDGgL6AthitodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRTMu -Y3JsMDWgM6Axhi9odHRwOi8vd3d3YmFjay5pcHMuZXMvaXBzMjAwMi9pcHMyMDAy -Q0xBU0UzLmNybDAvBggrBgEFBQcBAQQjMCEwHwYIKwYBBQUHMAGGE2h0dHA6Ly9v -Y3NwLmlwcy5lcy8wDQYJKoZIhvcNAQEFBQADgYEAF2VcmZVDAyevJuXr0LMXI/dD -qsfwfewPxqmurpYPdikc4gYtfibFPPqhwYHOU7BC0ZdXGhd+pFFhxu7pXu8Fuuu9 -D6eSb9ijBmgpjnn1/7/5p6/ksc7C0YBCJwUENPjDfxZ4IwwHJPJGR607VNCv1TGy -r33I6unUVtkOE7LFRVA= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIH9zCCB2CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARQxCzAJBgNVBAYTAkVT -MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE -ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE -ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEvMC0GA1UECxMm -SVBTIENBIENMQVNFQTEgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLzAtBgNVBAMT -JklQUyBDQSBDTEFTRUExIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZI -hvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMwHhcNMDExMjI5MDEwNTMyWhcNMjUxMjI3 -MDEwNTMyWjCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ -BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hp -bmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5G -LiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTEgQ2VydGlmaWNh -dGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUExIENlcnRpZmlj -YXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMw -gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALsw19zQVL01Tp/FTILq0VA8R5j8 -m2mdd81u4D/u6zJfX5/S0HnllXNEITLgCtud186Nq1KLK3jgm1t99P1tCeWu4Wwd -ByOgF9H5fahGRpEiqLJpxq339fWUoTCUvQDMRH/uxJ7JweaPCjbB/SQ9AaD1e+J8 -eGZDi09Z8pvZ+kmzAgMBAAGjggRTMIIETzAdBgNVHQ4EFgQUZyaW56G/2LUDnf47 -3P7yiuYV3TAwggFGBgNVHSMEggE9MIIBOYAUZyaW56G/2LUDnf473P7yiuYV3TCh -ggEcpIIBGDCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ -BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hp -bmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5G -LiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTEgQ2VydGlmaWNh -dGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUExIENlcnRpZmlj -YXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOC -AQAwDAYDVR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUF -BwMBBggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYB -BAGCNwIBFQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglg -hkgBhvhCAQEEBAMCAAcwGgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1Ud -EgQTMBGBD2lwc0BtYWlsLmlwcy5lczBCBglghkgBhvhCAQ0ENRYzQ0xBU0VBMSBD -QSBDZXJ0aWZpY2F0ZSBpc3N1ZWQgYnkgaHR0cDovL3d3dy5pcHMuZXMvMCkGCWCG -SAGG+EIBAgQcFhpodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyLzA7BglghkgBhvhC -AQQELhYsaHR0cDovL3d3dy5pcHMuZXMvaXBzMjAwMi9pcHMyMDAyQ0xBU0VBMS5j -cmwwQAYJYIZIAYb4QgEDBDMWMWh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmV2 -b2NhdGlvbkNMQVNFQTEuaHRtbD8wPQYJYIZIAYb4QgEHBDAWLmh0dHA6Ly93d3cu -aXBzLmVzL2lwczIwMDIvcmVuZXdhbENMQVNFQTEuaHRtbD8wOwYJYIZIAYb4QgEI -BC4WLGh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcG9saWN5Q0xBU0VBMS5odG1s -MHUGA1UdHwRuMGwwMqAwoC6GLGh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvaXBz -MjAwMkNMQVNFQTEuY3JsMDagNKAyhjBodHRwOi8vd3d3YmFjay5pcHMuZXMvaXBz -MjAwMi9pcHMyMDAyQ0xBU0VBMS5jcmwwLwYIKwYBBQUHAQEEIzAhMB8GCCsGAQUF -BzABhhNodHRwOi8vb2NzcC5pcHMuZXMvMA0GCSqGSIb3DQEBBQUAA4GBAH66iqyA -AIQVCtWYUQxkxZwCWINmyq0eB81+atqAB98DNEock8RLWCA1NnHtogo1EqWmZaeF -aQoO42Hu6r4okzPV7Oi+xNtff6j5YzHIa5biKcJboOeXNp13XjFr/tOn2yrb25aL -H2betgPAK7N41lUH5Y85UN4HI3LmvSAUS7SG ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIH9zCCB2CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARQxCzAJBgNVBAYTAkVT -MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE -ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE -ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEvMC0GA1UECxMm -SVBTIENBIENMQVNFQTMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLzAtBgNVBAMT -JklQUyBDQSBDTEFTRUEzIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZI -hvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMwHhcNMDExMjI5MDEwNzUwWhcNMjUxMjI3 -MDEwNzUwWjCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ -BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hp -bmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5G -LiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTMgQ2VydGlmaWNh -dGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUEzIENlcnRpZmlj -YXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMw -gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAO6AAPYaZC6tasiDsYun7o/ZttvN -G7uGBiJ2MwwSbUhWYdLcgiViL5/SaTBlA0IjWLxH3GvWdV0XPOH/8lhneaDBgbHU -VqLyjRGZ/fZ98cfEXgIqmuJKtROKAP2Md4bm15T1IHUuDky/dMQ/gT6DtKM4Ninn -6Cr1jIhBqoCm42zvAgMBAAGjggRTMIIETzAdBgNVHQ4EFgQUHp9XUEe2YZM50yz8 -2l09BXW3mQIwggFGBgNVHSMEggE9MIIBOYAUHp9XUEe2YZM50yz82l09BXW3mQKh -ggEcpIIBGDCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ -BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hp -bmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5G -LiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTMgQ2VydGlmaWNh -dGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUEzIENlcnRpZmlj -YXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOC -AQAwDAYDVR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUF -BwMBBggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYB -BAGCNwIBFQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglg -hkgBhvhCAQEEBAMCAAcwGgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1Ud -EgQTMBGBD2lwc0BtYWlsLmlwcy5lczBCBglghkgBhvhCAQ0ENRYzQ0xBU0VBMyBD -QSBDZXJ0aWZpY2F0ZSBpc3N1ZWQgYnkgaHR0cDovL3d3dy5pcHMuZXMvMCkGCWCG -SAGG+EIBAgQcFhpodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyLzA7BglghkgBhvhC -AQQELhYsaHR0cDovL3d3dy5pcHMuZXMvaXBzMjAwMi9pcHMyMDAyQ0xBU0VBMy5j -cmwwQAYJYIZIAYb4QgEDBDMWMWh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmV2 -b2NhdGlvbkNMQVNFQTMuaHRtbD8wPQYJYIZIAYb4QgEHBDAWLmh0dHA6Ly93d3cu -aXBzLmVzL2lwczIwMDIvcmVuZXdhbENMQVNFQTMuaHRtbD8wOwYJYIZIAYb4QgEI -BC4WLGh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcG9saWN5Q0xBU0VBMy5odG1s -MHUGA1UdHwRuMGwwMqAwoC6GLGh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvaXBz -MjAwMkNMQVNFQTMuY3JsMDagNKAyhjBodHRwOi8vd3d3YmFjay5pcHMuZXMvaXBz -MjAwMi9pcHMyMDAyQ0xBU0VBMy5jcmwwLwYIKwYBBQUHAQEEIzAhMB8GCCsGAQUF -BzABhhNodHRwOi8vb2NzcC5pcHMuZXMvMA0GCSqGSIb3DQEBBQUAA4GBAEo9IEca -2on0eisxeewBwMwB9dbB/MjD81ACUZBYKp/nNQlbMAqBACVHr9QPDp5gJqiVp4MI -3y2s6Q73nMify5NF8bpqxmdRSmlPa/59Cy9SKcJQrSRE7SOzSMtEQMEDlQwKeAYS -AfWRMS1Jjbs/RU4s4OjNtckUFQzjB4ObJnXv ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIIODCCB6GgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCAR4xCzAJBgNVBAYTAkVT -MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE -ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE -ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjE0MDIGA1UECxMr -SVBTIENBIFRpbWVzdGFtcGluZyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTE0MDIG -A1UEAxMrSVBTIENBIFRpbWVzdGFtcGluZyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0 -eTEeMBwGCSqGSIb3DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTAxMTIyOTAxMTAx -OFoXDTI1MTIyNzAxMTAxOFowggEeMQswCQYDVQQGEwJFUzESMBAGA1UECBMJQmFy -Y2Vsb25hMRIwEAYDVQQHEwlCYXJjZWxvbmExLjAsBgNVBAoTJUlQUyBJbnRlcm5l -dCBwdWJsaXNoaW5nIFNlcnZpY2VzIHMubC4xKzApBgNVBAoUImlwc0BtYWlsLmlw -cy5lcyBDLkkuRi4gIEItNjA5Mjk0NTIxNDAyBgNVBAsTK0lQUyBDQSBUaW1lc3Rh -bXBpbmcgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxNDAyBgNVBAMTK0lQUyBDQSBU -aW1lc3RhbXBpbmcgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxHjAcBgkqhkiG9w0B -CQEWD2lwc0BtYWlsLmlwcy5lczCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA -vLjuVqWajOY2ycJioGaBjRrVetJznw6EZLqVtJCneK/K/lRhW86yIFcBrkSSQxA4 -Efdo/BdApWgnMjvEp+ZCccWZ73b/K5Uk9UmSGGjKALWkWi9uy9YbLA1UZ2t6KaFY -q6JaANZbuxjC3/YeE1Z2m6Vo4pjOxgOKNNtMg0GmqaMCAwEAAaOCBIAwggR8MB0G -A1UdDgQWBBSL0BBQCYHynQnVDmB4AyKiP8jKZjCCAVAGA1UdIwSCAUcwggFDgBSL -0BBQCYHynQnVDmB4AyKiP8jKZqGCASakggEiMIIBHjELMAkGA1UEBhMCRVMxEjAQ -BgNVBAgTCUJhcmNlbG9uYTESMBAGA1UEBxMJQmFyY2Vsb25hMS4wLAYDVQQKEyVJ -UFMgSW50ZXJuZXQgcHVibGlzaGluZyBTZXJ2aWNlcyBzLmwuMSswKQYDVQQKFCJp -cHNAbWFpbC5pcHMuZXMgQy5JLkYuICBCLTYwOTI5NDUyMTQwMgYDVQQLEytJUFMg -Q0EgVGltZXN0YW1waW5nIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MTQwMgYDVQQD -EytJUFMgQ0EgVGltZXN0YW1waW5nIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4w -HAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOCAQAwDAYDVR0TBAUwAwEB/zAM -BgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYB -BQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIBFQYKKwYBBAGCNwIB -FgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhCAQEEBAMCAAcwGgYD -VR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGBD2lwc0BtYWlsLmlw -cy5lczBHBglghkgBhvhCAQ0EOhY4VGltZXN0YW1waW5nIENBIENlcnRpZmljYXRl -IGlzc3VlZCBieSBodHRwOi8vd3d3Lmlwcy5lcy8wKQYJYIZIAYb4QgECBBwWGmh0 -dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvMEAGCWCGSAGG+EIBBAQzFjFodHRwOi8v -d3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJUaW1lc3RhbXBpbmcuY3JsMEUGCWCG -SAGG+EIBAwQ4FjZodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL3Jldm9jYXRpb25U -aW1lc3RhbXBpbmcuaHRtbD8wQgYJYIZIAYb4QgEHBDUWM2h0dHA6Ly93d3cuaXBz -LmVzL2lwczIwMDIvcmVuZXdhbFRpbWVzdGFtcGluZy5odG1sPzBABglghkgBhvhC -AQgEMxYxaHR0cDovL3d3dy5pcHMuZXMvaXBzMjAwMi9wb2xpY3lUaW1lc3RhbXBp -bmcuaHRtbDB/BgNVHR8EeDB2MDegNaAzhjFodHRwOi8vd3d3Lmlwcy5lcy9pcHMy -MDAyL2lwczIwMDJUaW1lc3RhbXBpbmcuY3JsMDugOaA3hjVodHRwOi8vd3d3YmFj -ay5pcHMuZXMvaXBzMjAwMi9pcHMyMDAyVGltZXN0YW1waW5nLmNybDAvBggrBgEF -BQcBAQQjMCEwHwYIKwYBBQUHMAGGE2h0dHA6Ly9vY3NwLmlwcy5lcy8wDQYJKoZI -hvcNAQEFBQADgYEAZbrBzAAalZHK6Ww6vzoeFAh8+4Pua2JR0zORtWB5fgTYXXk3 -6MNbsMRnLWhasl8OCvrNPzpFoeo2zyYepxEoxZSPhExTCMWTs/zif/WN87GphV+I -3pGW7hdbrqXqcGV4LCFkAZXOzkw+UPS2Wctjjba9GNSHSl/c7+lW8AoM6HU= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC -TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0 -aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0 -aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz -MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw -IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR -dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp -li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D -rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ -WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug -F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU -xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC -Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv -dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw -ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl -IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh -c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy -ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh -Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI -KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T -KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq -y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p -dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD -VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL -MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk -fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8 -7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R -cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y -mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW -xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK -SnQ2+Q== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0 -IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz -BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y -aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG -9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMjIzM1oXDTE5MDYy -NjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y -azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs -YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw -Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl -cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjmFGWHOjVsQaBalfD -cnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td3zZxFJmP3MKS8edgkpfs -2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89HBFx1cQqY -JJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliE -Zwgs3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJ -n0WuPIqpsHEzXcjFV9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/A -PhmcGcwTTYJBtYze4D1gCCAPRX5ron+jjBXu ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIICXDCCAcWgAwIBAgIQCgEBAQAAAnwAAAALAAAAAjANBgkqhkiG9w0BAQUFADA6 -MRkwFwYDVQQKExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJp -dHkgMTAyNCBWMzAeFw0wMTAyMjIyMTAxNDlaFw0yNjAyMjIyMDAxNDlaMDoxGTAX -BgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAbBgNVBAsTFFJTQSBTZWN1cml0eSAx -MDI0IFYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDV3f5mCc8kPD6ugU5O -isRpgFtZO9+5TUzKtS3DJy08rwBCbbwoppbPf9dYrIMKo1W1exeQFYRMiu4mmdxY -78c4pqqv0I5CyGLXq6yp+0p9v+r+Ek3d/yYtbzZUaMjShFbuklNhCbM/OZuoyZu9 -zp9+1BlqFikYvtc6adwlWzMaUQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4G -A1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBTEwBykB5T9zU0B1FTapQxf3q4FWjAd -BgNVHQ4EFgQUxMAcpAeU/c1NAdRU2qUMX96uBVowDQYJKoZIhvcNAQEFBQADgYEA -Py1q4yZDlX2Jl2X7deRyHUZXxGFraZ8SmyzVWujAovBDleMf6XbN3Ou8k6BlCsdN -T1+nr6JGFLkM88y9am63nd4lQtBU/55oc2PcJOsiv6hy8l4A4Q1OOkNumU4/iXgD -mMrzVcydro7BqkWY+o8aoI2II/EVQQ2lRj6RP4vr93E= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6 -MRkwFwYDVQQKExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJp -dHkgMjA0OCBWMzAeFw0wMTAyMjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAX -BgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAbBgNVBAsTFFJTQSBTZWN1cml0eSAy -MDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt49VcdKA3Xtp -eafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7Jylg -/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGl -wSMiuLgbWhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnh -AMFRD0xS+ARaqn1y07iHKrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2 -PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP+Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpu -AWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB -BjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4EFgQUB8NR -MKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYc -HnmYv/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/ -Zb5gEydxiKRz44Rj0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+ -f00/FGj1EVDVwfSQpQgdMWD/YIwjVAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVO -rSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395nzIlQnQFgCi/vcEkllgVsRch -6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kApKnXwiJPZ9d3 -7CAFYd4= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY -MBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21t -dW5pY2F0aW9uIFJvb3RDQTEwHhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5 -WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYD -VQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEwggEiMA0GCSqGSIb3 -DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw8yl8 -9f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJ -DKaVv0uMDPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9 -Ms+k2Y7CI9eNqPPYJayX5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/N -QV3Is00qVUarH9oe4kA92819uZKAnDfdDJZkndwi92SL32HeFZRSFaB9UslLqCHJ -xrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2JChzAgMBAAGjPzA9MB0G -A1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYwDwYDVR0T -AQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vG -kl3g0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfr -Uj94nK9NrvjVT8+amCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5 -Bw+SUEmK3TGXX8npN6o7WWWXlDLJs58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJU -JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot -RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDIDCCAgigAwIBAgIBJDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP -MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MxIENBMB4XDTAx -MDQwNjEwNDkxM1oXDTIxMDQwNjEwNDkxM1owOTELMAkGA1UEBhMCRkkxDzANBgNV -BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMSBDQTCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBALWJHytPZwp5/8Ue+H887dF+2rDNbS82rDTG -29lkFwhjMDMiikzujrsPDUJVyZ0upe/3p4zDq7mXy47vPxVnqIJyY1MPQYx9EJUk -oVqlBvqSV536pQHydekfvFYmUk54GWVYVQNYwBSujHxVX3BbdyMGNpfzJLWaRpXk -3w0LBUXl0fIdgrvGE+D+qnr9aTCU89JFhfzyMlsy3uhsXR/LpCJ0sICOXZT3BgBL -qdReLjVQCfOAl/QMF6452F/NM8EcyonCIvdFEu1eEpOdY6uCLrnrQkFEy0oaAIIN -nvmLVz5MxxftLItyM19yejhW1ebZrgUaHXVFsculJRwSVzb9IjcCAwEAAaMzMDEw -DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQIR+IMi/ZTiFIwCwYDVR0PBAQDAgEG -MA0GCSqGSIb3DQEBBQUAA4IBAQCLGrLJXWG04bkruVPRsoWdd44W7hE928Jj2VuX -ZfsSZ9gqXLar5V7DtxYvyOirHYr9qxp81V9jz9yw3Xe5qObSIjiHBxTZ/75Wtf0H -DjxVyhbMp6Z3N/vbXB9OWQaHowND9Rart4S9Tu+fMTfwRvFAttEMpWT4Y14h21VO -TzF2nBBhjrZTOqMRvq9tfB69ri3iDGnHhVNoomG6xT60eVR4ngrHAr5i0RGCS2Uv -kVrCqIexVmiUefkl98HVrhq4uz2PqYo4Ffdz0Fpg0YCw8NzVUM1O7pJIae2yIx4w -zMiUyLb1O4Z/P6Yun/Y+LLWSlj7fLJOK/4GMDw9ZIRlXvVWa ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP -MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx -MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV -BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o -Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt -5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s -3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej -vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu -8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw -DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG -MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil -zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/ -3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD -FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6 -Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2 -ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJO -TDEeMBwGA1UEChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFh -dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEy -MTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4wHAYDVQQKExVTdGFhdCBkZXIgTmVk -ZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxhbmRlbiBSb290IENB -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFtvszn -ExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw71 -9tV2U02PjLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MO -hXeiD+EwR+4A5zN9RGcaC1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+U -tFE5A3+y3qcym7RHjm+0Sq7lr7HcsBthvJly3uSJt3omXdozSVtSnA71iq3DuD3o -BmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn622r+I/q85Ej0ZytqERAh -SQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRVHSAAMDww -OgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMv -cm9vdC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA -7Jbg0zTBLL9s+DANBgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k -/rvuFbQvBgwp8qiSpGEN/KtcCFtREytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzm -eafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbwMVcoEoJz6TMvplW0C5GUR5z6 -u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3ynGQI0DvDKcWy -7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR -iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEKzCCAxOgAwIBAgIEOsylTDANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJE -SzEVMBMGA1UEChMMVERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQg -Um9vdCBDQTAeFw0wMTA0MDUxNjMzMTdaFw0yMTA0MDUxNzAzMTdaMEMxCzAJBgNV -BAYTAkRLMRUwEwYDVQQKEwxUREMgSW50ZXJuZXQxHTAbBgNVBAsTFFREQyBJbnRl -cm5ldCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxLhA -vJHVYx/XmaCLDEAedLdInUaMArLgJF/wGROnN4NrXceO+YQwzho7+vvOi20jxsNu -Zp+Jpd/gQlBn+h9sHvTQBda/ytZO5GhgbEaqHF1j4QeGDmUApy6mcca8uYGoOn0a -0vnRrEvLznWv3Hv6gXPU/Lq9QYjUdLP5Xjg6PEOo0pVOd20TDJ2PeAG3WiAfAzc1 -4izbSysseLlJ28TQx5yc5IogCSEWVmb/Bexb4/DPqyQkXsN/cHoSxNK1EKC2IeGN -eGlVRGn1ypYcNIUXJXfi9i8nmHj9eQY6otZaQ8H/7AQ77hPv01ha/5Lr7K7a8jcD -R0G2l8ktCkEiu7vmpwIDAQABo4IBJTCCASEwEQYJYIZIAYb4QgEBBAQDAgAHMGUG -A1UdHwReMFwwWqBYoFakVDBSMQswCQYDVQQGEwJESzEVMBMGA1UEChMMVERDIElu -dGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTENMAsGA1UEAxME -Q1JMMTArBgNVHRAEJDAigA8yMDAxMDQwNTE2MzMxN1qBDzIwMjEwNDA1MTcwMzE3 -WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUbGQBx/2FbazI2p5QCIUItTxWqFAw -HQYDVR0OBBYEFGxkAcf9hW2syNqeUAiFCLU8VqhQMAwGA1UdEwQFMAMBAf8wHQYJ -KoZIhvZ9B0EABBAwDhsIVjUuMDo0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4IBAQBO -Q8zR3R0QGwZ/t6T609lN+yOfI1Rb5osvBCiLtSdtiaHsmGnc540mgwV5dOy0uaOX -wTUA/RXaOYE6lTGQ3pfphqiZdwzlWqCE/xIWrG64jcN7ksKsLtB9KOy282A4aW8+ -2ARVPp7MVdK6/rtHBNcK2RYKNCn1WBPVT8+PVkuzHu7TmHnaCB4Mb7j4Fifvwm89 -9qNLPg7kbWzbO0ESm70NRyN/PErQr8Cv9u8btRXE64PECV90i9kR+8JWsTz4cMo0 -jUNAE4z9mQNUecYu6oah9jrUCbz0vGbMPVjQV0kK7iXiQe4T+Zs4NNEA9X7nlB38 -aQNiuJkFBT1reBK9sG9l ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFGTCCBAGgAwIBAgIEPki9xDANBgkqhkiG9w0BAQUFADAxMQswCQYDVQQGEwJE -SzEMMAoGA1UEChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTAeFw0wMzAyMTEw -ODM5MzBaFw0zNzAyMTEwOTA5MzBaMDExCzAJBgNVBAYTAkRLMQwwCgYDVQQKEwNU -REMxFDASBgNVBAMTC1REQyBPQ0VTIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -MIIBCgKCAQEArGL2YSCyz8DGhdfjeebM7fI5kqSXLmSjhFuHnEz9pPPEXyG9VhDr -2y5h7JNp46PMvZnDBfwGuMo2HP6QjklMxFaaL1a8z3sM8W9Hpg1DTeLpHTk0zY0s -2RKY+ePhwUp8hjjEqcRhiNJerxomTdXkoCJHhNlktxmW/OwZ5LKXJk5KTMuPJItU -GBxIYXvViGjaXbXqzRowwYCDdlCqT9HU3Tjw7xb04QxQBr/q+3pJoSgrHPb8FTKj -dGqPqcNiKXEx5TukYBdedObaE+3pHx8b0bJoc8YQNHVGEBDjkAB2QMuLt0MJIf+r -TpPGWOmlgtt3xDqZsXKVSQTwtyv6e1mO3QIDAQABo4ICNzCCAjMwDwYDVR0TAQH/ -BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwgewGA1UdIASB5DCB4TCB3gYIKoFQgSkB -AQEwgdEwLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuY2VydGlmaWthdC5kay9yZXBv -c2l0b3J5MIGdBggrBgEFBQcCAjCBkDAKFgNUREMwAwIBARqBgUNlcnRpZmlrYXRl -ciBmcmEgZGVubmUgQ0EgdWRzdGVkZXMgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEu -MS4xLiBDZXJ0aWZpY2F0ZXMgZnJvbSB0aGlzIENBIGFyZSBpc3N1ZWQgdW5kZXIg -T0lEIDEuMi4yMDguMTY5LjEuMS4xLjARBglghkgBhvhCAQEEBAMCAAcwgYEGA1Ud -HwR6MHgwSKBGoESkQjBAMQswCQYDVQQGEwJESzEMMAoGA1UEChMDVERDMRQwEgYD -VQQDEwtUREMgT0NFUyBDQTENMAsGA1UEAxMEQ1JMMTAsoCqgKIYmaHR0cDovL2Ny -bC5vY2VzLmNlcnRpZmlrYXQuZGsvb2Nlcy5jcmwwKwYDVR0QBCQwIoAPMjAwMzAy -MTEwODM5MzBagQ8yMDM3MDIxMTA5MDkzMFowHwYDVR0jBBgwFoAUYLWF7FZkfhIZ -J2cdUBVLc647+RIwHQYDVR0OBBYEFGC1hexWZH4SGSdnHVAVS3OuO/kSMB0GCSqG -SIb2fQdBAAQQMA4bCFY2LjA6NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEACrom -JkbTc6gJ82sLMJn9iuFXehHTuJTXCRBuo7E4A9G28kNBKWKnctj7fAXmMXAnVBhO -inxO5dHKjHiIzxvTkIvmI/gLDjNDfZziChmPyQE+dF10yYscA+UYyAFMP8uXBV2Y -caaYb7Z8vTd/vuGTJW1v8AqtFxjhA7wHKcitJuj4YfD9IQl+mo6paH1IYnK9AOoB -mbgGglGBTvH1tJFUuSN6AJqfXY3gPGS5GhKSKseCRHI53OI8xthV9RVOyAUO28bQ -YqbsFbS1AoLbrIyigfCbmTH1ICCoiGEKB5+U/NDXG8wuF/MEJ3Zn61SD/aSQfgY9 -BKNDLdr8C2LqL19iUw== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDITCCAoqgAwIBAgIBADANBgkqhkiG9w0BAQQFADCByzELMAkGA1UEBhMCWkEx -FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYD -VQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBT -ZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFBlcnNvbmFsIEJhc2lj -IENBMSgwJgYJKoZIhvcNAQkBFhlwZXJzb25hbC1iYXNpY0B0aGF3dGUuY29tMB4X -DTk2MDEwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgcsxCzAJBgNVBAYTAlpBMRUw -EwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEaMBgGA1UE -ChMRVGhhd3RlIENvbnN1bHRpbmcxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2Vy -dmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQZXJzb25hbCBCYXNpYyBD -QTEoMCYGCSqGSIb3DQEJARYZcGVyc29uYWwtYmFzaWNAdGhhd3RlLmNvbTCBnzAN -BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvLyTU23AUE+CFeZIlDWmWr5vQvoPR+53 -dXLdjUmbllegeNTKP1GzaQuRdhciB5dqxFGTS+CN7zeVoQxN2jSQHReJl+A1OFdK -wPQIcOk8RHtQfmGakOMj04gRRif1CwcOu93RfyAKiLlWCy4cgNrx454p7xS9CkT7 -G1sY0b8jkyECAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQQF -AAOBgQAt4plrsD16iddZopQBHyvdEktTwq1/qqcAXJFAVyVKOKqEcLnZgA+le1z7 -c8a914phXAPjLSeoF+CEhULcXpvGt7Jtu3Sv5D/Lp7ew4F2+eIMllNLbgQ95B21P -9DkVWlIBe94y1k049hJcBlDfBVu9FEuh3ym6O0GN92NWod8isQ== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDLTCCApagAwIBAgIBADANBgkqhkiG9w0BAQQFADCB0TELMAkGA1UEBhMCWkEx -FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYD -VQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBT -ZXJ2aWNlcyBEaXZpc2lvbjEkMCIGA1UEAxMbVGhhd3RlIFBlcnNvbmFsIEZyZWVt -YWlsIENBMSswKQYJKoZIhvcNAQkBFhxwZXJzb25hbC1mcmVlbWFpbEB0aGF3dGUu -Y29tMB4XDTk2MDEwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgdExCzAJBgNVBAYT -AlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEa -MBgGA1UEChMRVGhhd3RlIENvbnN1bHRpbmcxKDAmBgNVBAsTH0NlcnRpZmljYXRp -b24gU2VydmljZXMgRGl2aXNpb24xJDAiBgNVBAMTG1RoYXd0ZSBQZXJzb25hbCBG -cmVlbWFpbCBDQTErMCkGCSqGSIb3DQEJARYccGVyc29uYWwtZnJlZW1haWxAdGhh -d3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1GnX1LCUZFtx6UfY -DFG26nKRsIRefS0Nj3sS34UldSh0OkIsYyeflXtL734Zhx2G6qPduc6WZBrCFG5E -rHzmj+hND3EfQDimAKOHePb5lIZererAXnbr2RSjXW56fAylS1V/Bhkpf56aJtVq -uzgkCGqYx7Hao5iR/Xnb5VrEHLkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zAN -BgkqhkiG9w0BAQQFAAOBgQDH7JJ+Tvj1lqVnYiqk8E0RYNBvjWBYYawmu1I1XAjP -MPuoSpaKH2JCI4wXD/S6ZJwXrEcp352YXtJsYHFcoqzceePnbgBHH7UNKOgCneSa -/RP0ptl8sfjcXyMmCZGAc9AUG95DqYMl8uacLxXK/qarigd1iwzdUYRr5PjRznei -gQ== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDKTCCApKgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBzzELMAkGA1UEBhMCWkEx -FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYD -VQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBT -ZXJ2aWNlcyBEaXZpc2lvbjEjMCEGA1UEAxMaVGhhd3RlIFBlcnNvbmFsIFByZW1p -dW0gQ0ExKjAoBgkqhkiG9w0BCQEWG3BlcnNvbmFsLXByZW1pdW1AdGhhd3RlLmNv -bTAeFw05NjAxMDEwMDAwMDBaFw0yMDEyMzEyMzU5NTlaMIHPMQswCQYDVQQGEwJa -QTEVMBMGA1UECBMMV2VzdGVybiBDYXBlMRIwEAYDVQQHEwlDYXBlIFRvd24xGjAY -BgNVBAoTEVRoYXd0ZSBDb25zdWx0aW5nMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9u -IFNlcnZpY2VzIERpdmlzaW9uMSMwIQYDVQQDExpUaGF3dGUgUGVyc29uYWwgUHJl -bWl1bSBDQTEqMCgGCSqGSIb3DQEJARYbcGVyc29uYWwtcHJlbWl1bUB0aGF3dGUu -Y29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJZtn4B0TPuYwu8KHvE0Vs -Bd/eJxZRNkERbGw77f4QfRKe5ZtCmv5gMcNmt3M6SK5O0DI3lIi1DbbZ8/JE2dWI -Et12TfIa/G8jHnrx2JhFTgcQ7xZC0EN1bUre4qrJMf8fAHB8Zs8QJQi6+u4A6UYD -ZicRFTuqW/KY3TZCstqIdQIDAQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqG -SIb3DQEBBAUAA4GBAGk2ifc0KjNyL2071CKyuG+axTZmDhs8obF1Wub9NdP4qPIH -b4Vnjt4rueIXsDqg8A6iAJrf8xQVbrvIhVqYgPn/vnQdPfP+MCXRNzRn+qVxeTBh -KXLA4CxM+1bkOqhv5TJZUtt1KFBZDPgLGeSs2a+WjS9Q2wfD6h+rM+D1KzGJ ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx -FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD -VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv -biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy -dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t -MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB -MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG -A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp -b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl -cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv -bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE -VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ -ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR -uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG -9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI -hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM -pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkEx -FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD -VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv -biBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEm -MCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wHhcNOTYwODAx -MDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT -DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3 -dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNl -cyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3 -DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD -gY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl/Kj0R1HahbUgdJSGHg91 -yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg71CcEJRCX -L+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGj -EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG -7oWDTSEwjsrZqG9JGubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6e -QNuozDJ0uW8NxuOzRAvZim+aKZuZGCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZ -qdq5snUb9kLy78fyGPmJvKP/iiMucEc= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIICoTCCAgqgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBizELMAkGA1UEBhMCWkEx -FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTEUMBIGA1UEBxMLRHVyYmFudmlsbGUxDzAN -BgNVBAoTBlRoYXd0ZTEdMBsGA1UECxMUVGhhd3RlIENlcnRpZmljYXRpb24xHzAd -BgNVBAMTFlRoYXd0ZSBUaW1lc3RhbXBpbmcgQ0EwHhcNOTcwMTAxMDAwMDAwWhcN -MjAxMjMxMjM1OTU5WjCBizELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4g -Q2FwZTEUMBIGA1UEBxMLRHVyYmFudmlsbGUxDzANBgNVBAoTBlRoYXd0ZTEdMBsG -A1UECxMUVGhhd3RlIENlcnRpZmljYXRpb24xHzAdBgNVBAMTFlRoYXd0ZSBUaW1l -c3RhbXBpbmcgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANYrWHhhRYZT -6jR7UZztsOYuGA7+4F+oJ9O0yeB8WU4WDnNUYMF/9p8u6TqFJBU820cEY8OexJQa -Wt9MevPZQx08EHp5JduQ/vBR5zDWQQD9nyjfeb6Uu522FOMjhdepQeBMpHmwKxqL -8vg7ij5FrHGSALSQQZj7X+36ty6K+Ig3AgMBAAGjEzARMA8GA1UdEwEB/wQFMAMB -Af8wDQYJKoZIhvcNAQEEBQADgYEAZ9viwuaHPUCDhjc1fR/OmsMMZiCouqoEiYbC -9RAIDb/LogWK0E02PvTX72nGXuSwlG9KuefeW4i2e9vjJ+V2w/A1wcu1J5szedyQ -pgCed/r8zSeUQhac0xxo7L9c3eWpexAKMnRUEzGLhQOEkbdYATAUOK8oyvyxUBkZ -CayJSdM= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB -kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug -Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho -dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw -IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG -EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD -VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu -dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN -BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6 -E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ -D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK -4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq -lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW -bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB -o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT -MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js -LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr -BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB -AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft -Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj -j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH -KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv -2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3 -mfnGV/TJVTl4uix5yaaIK/QI ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEojCCA4qgAwIBAgIQRL4Mi1AAJLQR0zYlJWfJiTANBgkqhkiG9w0BAQUFADCB -rjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug -Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho -dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xNjA0BgNVBAMTLVVUTi1VU0VSRmlyc3Qt -Q2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBFbWFpbDAeFw05OTA3MDkxNzI4NTBa -Fw0xOTA3MDkxNzM2NThaMIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAV -BgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5l -dHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UE -AxMtVVROLVVTRVJGaXJzdC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWls -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsjmFpPJ9q0E7YkY3rs3B -YHW8OWX5ShpHornMSMxqmNVNNRm5pELlzkniii8efNIxB8dOtINknS4p1aJkxIW9 -hVE1eaROaJB7HHqkkqgX8pgV8pPMyaQylbsMTzC9mKALi+VuG6JG+ni8om+rWV6l -L8/K2m2qL+usobNqqrcuZzWLeeEeaYji5kbNoKXqvgvOdjp6Dpvq/NonWz1zHyLm -SGHGTPNpsaguG7bUMSAsvIKKjqQOpdeJQ/wWWq8dcdcRWdq6hw2v+vPhwvCkxWeM -1tZUOt4KpLoDd7NlyP0e03RiqhjKaJMeoYV+9Udly/hNVyh00jT/MLbu9mIwFIws -6wIDAQABo4G5MIG2MAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud -DgQWBBSJgmd9xJ0mcABLtFBIfN49rgRufTBYBgNVHR8EUTBPME2gS6BJhkdodHRw -Oi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLVVTRVJGaXJzdC1DbGllbnRBdXRoZW50 -aWNhdGlvbmFuZEVtYWlsLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH -AwQwDQYJKoZIhvcNAQEFBQADggEBALFtYV2mGn98q0rkMPxTbyUkxsrt4jFcKw7u -7mFVbwQ+zznexRtJlOTrIEy05p5QLnLZjfWqo7NK2lYcYJeA3IKirUq9iiv/Cwm0 -xtcgBEXkzYABurorbs6q15L+5K/r9CYdFip/bDCVNy8zEqx/3cfREYxRmLLQo5HQ -rfafnoOTHh1CuEava2bwm3/q4wMC5QJRwarVNZ1yQAOJujEdxRBoUp7fooXFXAim -eOZTT7Hot9MUnpOmw2TjrH5xzbyf6QMbzPvprDHBr3wVdAKZw7JHpsIyYdfHb0gk -USeh1YdV8nuPmD0Wnu51tvjQjvLzxq4oW6fw8zYX/MMF08oDSlQ= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB -lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug -Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho -dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt -SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG -A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe -MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v -d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh -cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn -0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ -M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a -MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd -oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI -DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy -oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD -VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0 -dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy -bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF -BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM -//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli -CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE -CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t -3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS -KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEZDCCA0ygAwIBAgIQRL4Mi1AAJLQR0zYwS8AzdzANBgkqhkiG9w0BAQUFADCB -ozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug -Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho -dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VSRmlyc3Qt -TmV0d29yayBBcHBsaWNhdGlvbnMwHhcNOTkwNzA5MTg0ODM5WhcNMTkwNzA5MTg1 -NzQ5WjCBozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0 -IExha2UgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYD -VQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VS -Rmlyc3QtTmV0d29yayBBcHBsaWNhdGlvbnMwggEiMA0GCSqGSIb3DQEBAQUAA4IB -DwAwggEKAoIBAQCz+5Gh5DZVhawGNFugmliy+LUPBXeDrjKxdpJo7CNKyXY/45y2 -N3kDuatpjQclthln5LAbGHNhSuh+zdMvZOOmfAz6F4CjDUeJT1FxL+78P/m4FoCH -iZMlIJpDgmkkdihZNaEdwH+DBmQWICzTSaSFtMBhf1EI+GgVkYDLpdXuOzr0hARe -YFmnjDRy7rh4xdE7EkpvfmUnuaRVxblvQ6TFHSyZwFKkeEwVs0CYCGtDxgGwenv1 -axwiP8vv/6jQOkt2FZ7S0cYu49tXGzKiuG/ohqY/cKvlcJKrRB5AUPuco2LkbG6g -yN7igEL66S/ozjIEj3yNtxyjNTwV3Z7DrpelAgMBAAGjgZEwgY4wCwYDVR0PBAQD -AgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFPqGydvguul49Uuo1hXf8NPh -ahQ8ME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9V -VE4tVVNFUkZpcnN0LU5ldHdvcmtBcHBsaWNhdGlvbnMuY3JsMA0GCSqGSIb3DQEB -BQUAA4IBAQCk8yXM0dSRgyLQzDKrm5ZONJFUICU0YV8qAhXhi6r/fWRRzwr/vH3Y -IWp4yy9Rb/hCHTO967V7lMPDqaAt39EpHx3+jz+7qEUqf9FuVSTiuwL7MT++6Lzs -QCv4AdRWOOTKRIK1YSAhZ2X28AvnNPilwpyjXEAfhZOVBt5P1CeptqX8Fs1zMT+4 -ZSfP1FMa8Kxun08FDAOBp4QpxFq9ZFdyrTvPNximmMatBrTcCKME1SmklpoSZ0qM -YEWd8SOasACcaLWYUNPvji6SZbFIPiG+FTAqDbUMo2s/rn9X9R+WfN9v3YIwLGUb -QErNaLly7HF27FSOH4UMAWr6pjisH8SE ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEZjCCA06gAwIBAgIQRL4Mi1AAJLQR0zYt4LNfGzANBgkqhkiG9w0BAQUFADCB -lTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug -Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho -dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHTAbBgNVBAMTFFVUTi1VU0VSRmlyc3Qt -T2JqZWN0MB4XDTk5MDcwOTE4MzEyMFoXDTE5MDcwOTE4NDAzNlowgZUxCzAJBgNV -BAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxHjAc -BgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMYaHR0cDovL3d3 -dy51c2VydHJ1c3QuY29tMR0wGwYDVQQDExRVVE4tVVNFUkZpcnN0LU9iamVjdDCC -ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6qgT+jo2F4qjEAVZURnicP -HxzfOpuCaDDASmEd8S8O+r5596Uj71VRloTN2+O5bj4x2AogZ8f02b+U60cEPgLO -KqJdhwQJ9jCdGIqXsqoc/EHSoTbL+z2RuufZcDX65OeQw5ujm9M89RKZd7G3CeBo -5hy485RjiGpq/gt2yb70IuRnuasaXnfBhQfdDWy/7gbHd2pBnqcP1/vulBe3/IW+ -pKvEHDHd17bR5PDv3xaPslKT16HUiaEHLr/hARJCHhrh2JU022R5KP+6LhHC5ehb -kkj7RwvCbNqtMoNB86XlQXD9ZZBt+vpRxPm9lisZBCzTbafc8H9vg2XiaquHhnUC -AwEAAaOBrzCBrDALBgNVHQ8EBAMCAcYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E -FgQU2u1kdBScFDyr3ZmpvVsoTYs8ydgwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDov -L2NybC51c2VydHJ1c3QuY29tL1VUTi1VU0VSRmlyc3QtT2JqZWN0LmNybDApBgNV -HSUEIjAgBggrBgEFBQcDAwYIKwYBBQUHAwgGCisGAQQBgjcKAwQwDQYJKoZIhvcN -AQEFBQADggEBAAgfUrE3RHjb/c652pWWmKpVZIC1WkDdIaXFwfNfLEzIR1pp6ujw -NTX00CXzyKakh0q9G7FzCL3Uw8q2NbtZhncxzaeAFK4T7/yxSPlrJSUtUbYsbUXB -mMiKVl0+7kNOPmsnjtA6S4ULX9Ptaqd1y9Fahy85dRNacrACgZ++8A+EVCBibGnU -4U3GDZlDAQ0Slox4nb9QorFEqmrPF3rPbw/U+CRVX/A0FklmPlBGyWNxODFiuGK5 -81OtbLUrohKqGU8J2l7nk8aOFAj+8DCAGKCGhU3IfdeLA/5u1fedFqySLKAj5ZyR -Uh+U3xeUc8OzwcFxBSAAeL0TUh2oPs0AH8g= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0 -IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz -BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y -aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG -9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIyMjM0OFoXDTE5MDYy -NTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y -azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs -YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw -Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl -cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9Y -LqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIiGQj4/xEjm84H9b9pGib+ -TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCmDuJWBQ8Y -TfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0 -LBwGlN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLW -I8sogTLDAHkY7FkXicnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPw -nXS3qT6gpf+2SQMT2iLM7XGCK5nPOrf1LXLI ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0 -IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz -BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y -aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG -9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy -NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y -azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs -YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw -Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl -cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY -dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9 -WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS -v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v -UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu -IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC -W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIICPTCCAaYCEQDNun9W8N/kvFT+IqyzcqpVMA0GCSqGSIb3DQEBAgUAMF8xCzAJ -BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xh -c3MgMSBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05 -NjAxMjkwMDAwMDBaFw0yODA4MDEyMzU5NTlaMF8xCzAJBgNVBAYTAlVTMRcwFQYD -VQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgMSBQdWJsaWMgUHJp -bWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOB -jQAwgYkCgYEA5Rm/baNWYS2ZSHH2Z965jeu3noaACpEO+jglr0aIguVzqKCbJF0N -H8xlbgyw0FaEGIeaBpsQoXPftFg5a27B9hXVqKg/qhIGjTGsf7A01480Z4gJzRQR -4k5FVmkfeAKA2txHkSm7NsljXMXg1y2He6G3MrB7MLoqLzGq7qNn2tsCAwEAATAN -BgkqhkiG9w0BAQIFAAOBgQBMP7iLxmjf7kMzDl3ppssHhE16M/+SG/Q2rdiVIjZo -EWx8QszznC7EBz8UsA9P/5CSdvnivErpj82ggAr3xSnxgiJduLHdgSOjeyUVRjB5 -FvjqBUuUfx3CHMjjt/QQQDwTw18fU+hI5Ia0e6E1sHslurjTjqs/OJ0ANACY89Fx -lA== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDAjCCAmsCEEzH6qqYPnHTkxD4PTqJkZIwDQYJKoZIhvcNAQEFBQAwgcExCzAJ -BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh -c3MgMSBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy -MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp -emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X -DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw -FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMSBQdWJsaWMg -UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo -YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5 -MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB -AQUAA4GNADCBiQKBgQCq0Lq+Fi24g9TK0g+8djHKlNgdk4xWArzZbxpvUjZudVYK -VdPfQ4chEWWKfo+9Id5rMj8bhDSVBZ1BNeuS65bdqlk/AVNtmU/t5eIqWpDBucSm -Fc/IReumXY6cPvBkJHalzasab7bYe1FhbqZ/h8jit+U03EGI6glAvnOSPWvndQID -AQABMA0GCSqGSIb3DQEBBQUAA4GBAKlPww3HZ74sy9mozS11534Vnjty637rXC0J -h9ZrbWB85a7FkCMMXErQr7Fd88e2CtvgFZMN3QO8x3aKtd1Pw5sTdbgBwObJW2ul -uIncrKTdcu1OofdPvAbT6shkdHvClUGcZXNY8ZCaPGqxmMnEh7zPRW1F4m4iP/68 -DzFc6PLZ ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEGjCCAwICEQCLW3VWhFSFCwDPrzhIzrGkMA0GCSqGSIb3DQEBBQUAMIHKMQsw -CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl -cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu -LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT -aWduIENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp -dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD -VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT -aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ -bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu -IENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg -LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN2E1Lm0+afY8wR4 -nN493GwTFtl63SRRZsDHJlkNrAYIwpTRMx/wgzUfbhvI3qpuFU5UJ+/EbRrsC+MO -8ESlV8dAWB6jRx9x7GD2bZTIGDnt/kIYVt/kTEkQeE4BdjVjEjbdZrwBBDajVWjV -ojYJrKshJlQGrT/KFOCsyq0GHZXi+J3x4GD/wn91K0zM2v6HmSHquv4+VNfSWXjb -PG7PoBMAGrgnoeS+Z5bKoMWznN3JdZ7rMJpfo83ZrngZPyPpXNspva1VyBtUjGP2 -6KbqxzcSXKMpHgLZ2x87tNcPVkeBFQRKr4Mn0cVYiMHd9qqnoxjaaKptEVHhv2Vr -n5Z20T0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAq2aN17O6x5q25lXQBfGfMY1a -qtmqRiYPce2lrVNWYgFHKkTp/j90CxObufRNG7LRX7K20ohcs5/Ny9Sn2WCVhDr4 -wTcdYcrnsMXlkdpUpqwxga6X3s0IrLjAl4B/bnKk52kTlWUfxJM8/XmPBNQ+T+r3 -ns7NZ3xPZQL/kYVUc8f/NveGLezQXk//EZ9yBta4GvFMDSZl4kSAHsef493oCtrs -pSCAaWihT37ha88HQfqDjrw43bAuEbFrskLMmrz5SCJ5ShkPshw+IHTZasO+8ih4 -E1Z5T21Q6huwtVexN2ZYI/PcD98Kh8TvhgXVOBRgmaNL3gaWcSzy27YfpO8/7g== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIICPDCCAaUCEC0b/EoXjaOR6+f/9YtFvgswDQYJKoZIhvcNAQECBQAwXzELMAkG -A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz -cyAyIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2 -MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV -BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAyIFB1YmxpYyBQcmlt -YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN -ADCBiQKBgQC2WoujDWojg4BrzzmH9CETMwZMJaLtVRKXxaeAufqDwSCg+i8VDXyh -YGt+eSz6Bg86rvYbb7HS/y8oUl+DfUvEerf4Zh+AVPy3wo5ZShRXRtGak75BkQO7 -FYCTXOvnzAhsPz6zSvz/S2wj1VCCJkQZjiPDceoZJEcEnnW/yKYAHwIDAQABMA0G -CSqGSIb3DQEBAgUAA4GBAIobK/o5wXTXXtgZZKJYSi034DNHD6zt96rbHuSLBlxg -J8pFUs4W7z8GZOeUaHxgMxURaa+dYo2jA1Rrpr7l7gUYYAS/QoD90KioHgE796Nc -r6Pc5iaAIzy4RHT3Cq5Ji2F4zCS/iIqnDupzGUH9TQPwiNHleI2lKk/2lw0Xd8rY ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDAzCCAmwCEQC5L2DMiJ+hekYJuFtwbIqvMA0GCSqGSIb3DQEBBQUAMIHBMQsw -CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0Ns -YXNzIDIgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH -MjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9y -aXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazAe -Fw05ODA1MTgwMDAwMDBaFw0yODA4MDEyMzU5NTlaMIHBMQswCQYDVQQGEwJVUzEX -MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGlj -IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMx -KGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s -eTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazCBnzANBgkqhkiG9w0B -AQEFAAOBjQAwgYkCgYEAp4gBIXQs5xoD8JjhlzwPIQjxnNuX6Zr8wgQGE75fUsjM -HiwSViy4AWkszJkfrbCWrnkE8hM5wXuYuggs6MKEEyyqaekJ9MepAqRCwiNPStjw -DqL7MWzJ5m+ZJwf15vRMeJ5t60aG+rmGyVTyssSv1EYcWskVMP8NbPUtDm3Of3cC -AwEAATANBgkqhkiG9w0BAQUFAAOBgQByLvl/0fFx+8Se9sVeUYpAmLho+Jscg9ji -nb3/7aHmZuovCfTK1+qlK5X2JGCGTUQug6XELaDTrnhpb3LabK4I8GOSN+a7xDAX -rXfMSTWqz9iP0b63GJZHc2pUIjRkLbYWm1lbtFFZOrMLFPQS32eg9K0yZF6xRnIn -jBJ7xUS0rg== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEGTCCAwECEGFwy0mMX5hFKeewptlQW3owDQYJKoZIhvcNAQEFBQAwgcoxCzAJ -BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVy -aVNpZ24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24s -IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNp -Z24gQ2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0 -eSAtIEczMB4XDTk5MTAwMTAwMDAwMFoXDTM2MDcxNjIzNTk1OVowgcoxCzAJBgNV -BAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNp -Z24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIElu -Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNpZ24g -Q2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt -IEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArwoNwtUs22e5LeWU -J92lvuCwTY+zYVY81nzD9M0+hsuiiOLh2KRpxbXiv8GmR1BeRjmL1Za6tW8UvxDO -JxOeBUebMXoT2B/Z0wI3i60sR/COgQanDTAM6/c8DyAd3HJG7qUCyFvDyVZpTMUY -wZF7C9UTAJu878NIPkZgIIUq1ZC2zYugzDLdt/1AVbJQHFauzI13TccgTacxdu9o -koqQHgiBVrKtaaNS0MscxCM9H5n+TOgWY47GCI72MfbS+uV23bUckqNJzc0BzWjN -qWm6o+sdDZykIKbBoMXRRkwXbdKsZj+WjOCE1Db/IlnF+RFgqF8EffIa9iVCYQ/E -Srg+iQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA0JhU8wI1NQ0kdvekhktdmnLfe -xbjQ5F1fdiLAJvmEOjr5jLX77GDx6M4EsMjdpwOPMPOY36TmpDHf0xwLRtxyID+u -7gU8pDM/CzmscHhzS5kr3zDCVLCoO1Wh/hYozUK9dG6A2ydEp85EXdQbkJgNHkKU -sQAsBNB0owIFImNjzYO1+8FtYmtpdf1dcEG59b98377BMnMiIYtYgXsVkXq642RI -sH/7NiXaldDxJBQX3RiAa0YjOVT1jmIJBB2UkKab5iXiQkWquJCtvgiPqQtCGJTP -cjnhsUPgKM+351psE2tJs//jGHyJizNdrDPXp/naOlXJWBD5qu9ats9LS98q ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG -A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz -cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2 -MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV -BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt -YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN -ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE -BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is -I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G -CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do -lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc -AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ -BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh -c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy -MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp -emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X -DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw -FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg -UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo -YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5 -MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB -AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4 -pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0 -13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID -AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk -U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i -F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY -oJ2daZH9 ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw -CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl -cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu -LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT -aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp -dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD -VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT -aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ -bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu -IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg -LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b -N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t -KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu -kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm -CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ -Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu -imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te -2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe -DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC -/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p -F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt -TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDAjCCAmsCEDKIjprS9esTR/h/xCA3JfgwDQYJKoZIhvcNAQEFBQAwgcExCzAJ -BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh -c3MgNCBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy -MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp -emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X -DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw -FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgNCBQdWJsaWMg -UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo -YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5 -MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB -AQUAA4GNADCBiQKBgQC68OTP+cSuhVS5B1f5j8V/aBH4xBewRNzjMHPVKmIquNDM -HO0oW369atyzkSTKQWI8/AIBvxwWMZQFl3Zuoq29YRdsTjCG8FE3KlDHqGKB3FtK -qsGgtG7rL+VXxbErQHDbWk2hjh+9Ax/YA9SPTJlxvOKCzFjomDqG04Y48wApHwID -AQABMA0GCSqGSIb3DQEBBQUAA4GBAIWMEsGnuVAVess+rLhDityq3RS6iYF+ATwj -cSGIL4LcY/oCRaxFWdcqWERbt5+BO5JoPeI3JPV7bI92NZYJqFmduc4jq3TWg/0y -cyfYaT5DdPauxYma51N86Xv2S/PBZYPejYqcPIiNOVn8qj8ijaHBZlCBckztImRP -T8qAkbYp ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQsw -CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl -cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu -LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT -aWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp -dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD -VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT -aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ -bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu -IENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg -LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK3LpRFpxlmr8Y+1 -GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaStBO3IFsJ -+mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0Gbd -U6LM8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLm -NxdLMEYH5IBtptiWLugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XY -ufTsgsbSPZUd5cBPhMnZo0QoBmrXRazwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/ -ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAj/ola09b5KROJ1WrIhVZPMq1 -CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXttmhwwjIDLk5Mq -g6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm -fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c -2NU8Qh0XwRJdRTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/ -bLvSHgCwIe34QWKCudiyxLtGUPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBr MQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRl cm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv @@ -1863,136 +1193,186 @@ LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pzzkWKsKZJ/0x9nXGIxHYdkFsd 398znM/jra6O1I7mT1GvFpLgXPYHDw== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIDgDCCAmigAwIBAgICAx4wDQYJKoZIhvcNAQEFBQAwYTELMAkGA1UEBhMCVVMx -DTALBgNVBAoTBFZJU0ExLzAtBgNVBAsTJlZpc2EgSW50ZXJuYXRpb25hbCBTZXJ2 -aWNlIEFzc29jaWF0aW9uMRIwEAYDVQQDEwlHUCBSb290IDIwHhcNMDAwODE2MjI1 -MTAwWhcNMjAwODE1MjM1OTAwWjBhMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklT -QTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRp -b24xEjAQBgNVBAMTCUdQIFJvb3QgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBAKkBcLWqxEDwq2omYXkZAPy/mzdZDK9vZBv42pWUJGkzEXDK41Z0ohdX -ZFwgBuHW73G3O/erwWnQSaSxBNf0V2KJXLB1LRckaeNCYOTudNargFbYiCjh+20i -/SN8RnNPflRzHqgsVVh1t0zzWkWlAhr62p3DRcMiXvOL8WAp0sdftAw6UYPvMPjU -58fy+pmjIlC++QU3o63tmsPm7IgbthknGziLgE3sucfFicv8GjLtI/C1AVj59o/g -halMCXI5Etuz9c9OYmTaxhkVOmMd6RdVoUwiPDQyRvhlV7or7zaMavrZ2UT0qt2E -1w0cslSsMoW0ZA3eQbuxNMYBhjJk1Z8CAwEAAaNCMEAwHQYDVR0OBBYEFJ59SzS/ -ca3CBfYDdYDOqU8axCRMMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEG -MA0GCSqGSIb3DQEBBQUAA4IBAQAhpXYUVfmtJ3CPPPTVbMjMCqujmAuKBiPFyWHb -mQdpNSYx/scuhMKZYdQN6X0uEyt8joW2hcdLzzW2LEc9zikv2G+fiRxkk78IvXbQ -kIqUs38oW26sTTMs7WXcFsziza6kPWKSBpUmv9+55CCmc2rBvveURNZNbyoLaxhN -dBA2aGpawWqn3TYpjLgwi08hPwAuVDAHOrqK5MOeyti12HvOdUVmB/RtLdh6yumJ -ivIj2C/LbgA2T/vwLwHMD8AiZfSr4k5hLQOCfZEWtTDVFN5ex5D8ofyrEK9ca3Cn -B+8phuiyJccg/ybdd+95RBTEvd07xQObdyPsoOy7Wjm1zK0G +MIIH8jCCB1ugAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARIxCzAJBgNVBAYTAkVT +MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE +ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE +ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEuMCwGA1UECxMl +SVBTIENBIENMQVNFMyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMl +SVBTIENBIENMQVNFMyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEeMBwGCSqGSIb3 +DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTAxMTIzMTExMTkzMVoXDTI1MTIyOTEx +MTkzMVowggESMQswCQYDVQQGEwJFUzESMBAGA1UECBMJQmFyY2Vsb25hMRIwEAYD +VQQHEwlCYXJjZWxvbmExLjAsBgNVBAoTJUlQUyBJbnRlcm5ldCBwdWJsaXNoaW5n +IFNlcnZpY2VzIHMubC4xKzApBgNVBAoUImlwc0BtYWlsLmlwcy5lcyBDLkkuRi4g +IEItNjA5Mjk0NTIxLjAsBgNVBAsTJUlQUyBDQSBDTEFTRTMgQ2VydGlmaWNhdGlv +biBBdXRob3JpdHkxLjAsBgNVBAMTJUlQUyBDQSBDTEFTRTMgQ2VydGlmaWNhdGlv +biBBdXRob3JpdHkxHjAcBgkqhkiG9w0BCQEWD2lwc0BtYWlsLmlwcy5lczCBnzAN +BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAve2QhYLxoN2P3DVo4Xw+6Gyb2vDjfzvB +JRvH+WFIXO3KItC1dJk2W7iFnsZJnb65Q6NDKxhwfQ4XnLuBSPqMVJ6EHB++I1p2 +pg0j7YOtec++o3ysS6zf1r01HSh8i85+AcGcgLO4Z79w9jtEGlSdrFhCLUjJJSEs +XdzSbkEFrkMCAwEAAaOCBFIwggROMB0GA1UdDgQWBBT7o4z3Z4tAqk02rzCA6po7 +4C9o6DCCAUQGA1UdIwSCATswggE3gBT7o4z3Z4tAqk02rzCA6po74C9o6KGCARqk +ggEWMIIBEjELMAkGA1UEBhMCRVMxEjAQBgNVBAgTCUJhcmNlbG9uYTESMBAGA1UE +BxMJQmFyY2Vsb25hMS4wLAYDVQQKEyVJUFMgSW50ZXJuZXQgcHVibGlzaGluZyBT +ZXJ2aWNlcyBzLmwuMSswKQYDVQQKFCJpcHNAbWFpbC5pcHMuZXMgQy5JLkYuICBC +LTYwOTI5NDUyMS4wLAYDVQQLEyVJUFMgQ0EgQ0xBU0UzIENlcnRpZmljYXRpb24g +QXV0aG9yaXR5MS4wLAYDVQQDEyVJUFMgQ0EgQ0xBU0UzIENlcnRpZmljYXRpb24g +QXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOCAQAwDAYD +VR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMBBggr +BgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIB +FQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhC +AQEEBAMCAAcwGgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGB +D2lwc0BtYWlsLmlwcy5lczBCBglghkgBhvhCAQ0ENRYzQ0xBU0UzIENBIENlcnRp +ZmljYXRlIGlzc3VlZCBieSBodHRwczovL3d3dy5pcHMuZXMvMCoGCWCGSAGG+EIB +AgQdFhtodHRwczovL3d3dy5pcHMuZXMvaXBzMjAwMi8wOwYJYIZIAYb4QgEEBC4W +LGh0dHBzOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRTMuY3JsMEAG +CWCGSAGG+EIBAwQzFjFodHRwczovL3d3dy5pcHMuZXMvaXBzMjAwMi9yZXZvY2F0 +aW9uQ0xBU0UzLmh0bWw/MD0GCWCGSAGG+EIBBwQwFi5odHRwczovL3d3dy5pcHMu +ZXMvaXBzMjAwMi9yZW5ld2FsQ0xBU0UzLmh0bWw/MDsGCWCGSAGG+EIBCAQuFixo +dHRwczovL3d3dy5pcHMuZXMvaXBzMjAwMi9wb2xpY3lDTEFTRTMuaHRtbDB1BgNV +HR8EbjBsMDKgMKAuhixodHRwczovL3d3dy5pcHMuZXMvaXBzMjAwMi9pcHMyMDAy +Q0xBU0UzLmNybDA2oDSgMoYwaHR0cHM6Ly93d3diYWNrLmlwcy5lcy9pcHMyMDAy +L2lwczIwMDJDTEFTRTMuY3JsMC8GCCsGAQUFBwEBBCMwITAfBggrBgEFBQcwAYYT +aHR0cDovL29jc3AuaXBzLmVzLzANBgkqhkiG9w0BAQUFAAOBgQAiu2FuR8MoQlYw +3QtFc/BI7DgkUUeSIM49JoMU0H3a4Y+JbQxQ4q/n6yAbEuMETUyqob/HmS/NkLJq +ur3RvGBseDXgxNyePGjFc97ITNWf5X1+4CXtBf+TTKNEMg1UpPbCz+9EkjzTcYj1 +5tjLbAp/mmLLZmCOV7cCGuXGSTBNzA== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIETzCCAzegAwIBAgIEO63vKTANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJQ -TDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2Vu -dHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MRswGQYDVQQDExJDQyBTaWduZXQgLSBS -b290Q0EwHhcNMDEwOTIzMTQxODE3WhcNMTEwOTIzMTMxODE3WjB1MQswCQYDVQQG -EwJQTDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMb -Q2VudHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MR8wHQYDVQQDExZDQyBTaWduZXQg -LSBDQSBLbGFzYSAxMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4SRW9Q58g -5DY1Hw7hgCRKBEdPdGn0MFHsfw7rlu/oQm7IChI/uWd9q5wwo77YojtTDjRnpgZs -jqBeynX8T90vFILqsY2K5CF1OESalwvVr3sZiQX79lisuFKat92u6hBFikFIVxfH -HB67Af+g7u0dEHdDW7lwy81MwFYxBTRy9wIDAQABo4IBbTCCAWkwDwYDVR0TAQH/ -BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwggEEBgNVHSAEgfwwgfkwgfYGDSsGAQQB -vj8CAQoBAQAwgeQwgZoGCCsGAQUFBwICMIGNGoGKQ2VydHlmaWthdCB3eXN0YXdp -b255IHpnb2RuaWUgeiBkb2t1bWVudGVtOiAiUG9saXR5a2EgQ2VydHlmaWthY2pp -IGRsYSBSb290Q0EiLiBDZXJ0eWZpa2F0IHd5c3Rhd2lvbnkgcHJ6ZXogUm9vdENB -IHcgaGllcmFyY2hpaSBDQyBTaWduZXQuMEUGCCsGAQUFBwIBFjlodHRwOi8vd3d3 -LnNpZ25ldC5wbC9yZXBvenl0b3JpdW0vZG9rdW1lbnR5L3BjX3Jvb3RjYS50eHQw -HwYDVR0jBBgwFoAUwJvFIw0C4aZOSGsfAOnjmhQbsa8wHQYDVR0OBBYEFMODHtVZ -d1T7TftXR/nEI1zR54njMA0GCSqGSIb3DQEBBQUAA4IBAQBRIHQBFIGh8Jpxt87A -gSLwIEEk4+oGy769u3NtoaR0R3WNMdmt7fXTi0tyTQ9V4AIszxVjhnUPaKnF1KYy -f8Tl+YTzk9ZfFkZ3kCdSaILZAOIrmqWNLPmjUQ5/JiMGho0e1YmWUcMci84+pIis -TsytFzVP32/W+sz2H4FQAvOIMmxB7EJX9AdbnXn9EXZ+4nCqi0ft5z96ZqOJJiCB -3vSaoYg+wdkcvb6souMJzuc2uptXtR1Xf3ihlHaGW+hmnpcwFA6AoNrom6Vgzk6U -1ienx0Cw28BhRSKqzKkyXkuK8gRflZUx84uftXncwKJrMiE3lvgOOBITRzcahirL -er4c +MIIG0zCCBbugAwIBAgIBADANBgkqhkiG9w0BAQUFADCBzDELMAkGA1UEBhMCQVQx +EDAOBgNVBAgTB0F1c3RyaWExDzANBgNVBAcTBlZpZW5uYTE6MDgGA1UEChMxQVJH +RSBEQVRFTiAtIEF1c3RyaWFuIFNvY2lldHkgZm9yIERhdGEgUHJvdGVjdGlvbjEl +MCMGA1UECxMcQS1DRVJUIENlcnRpZmljYXRpb24gU2VydmljZTEYMBYGA1UEAxMP +QS1DRVJUIEFEVkFOQ0VEMR0wGwYJKoZIhvcNAQkBFg5pbmZvQGEtY2VydC5hdDAe +Fw0wNDEwMjMxNDE0MTRaFw0xMTEwMjMxNDE0MTRaMIHMMQswCQYDVQQGEwJBVDEQ +MA4GA1UECBMHQXVzdHJpYTEPMA0GA1UEBxMGVmllbm5hMTowOAYDVQQKEzFBUkdF +IERBVEVOIC0gQXVzdHJpYW4gU29jaWV0eSBmb3IgRGF0YSBQcm90ZWN0aW9uMSUw +IwYDVQQLExxBLUNFUlQgQ2VydGlmaWNhdGlvbiBTZXJ2aWNlMRgwFgYDVQQDEw9B +LUNFUlQgQURWQU5DRUQxHTAbBgkqhkiG9w0BCQEWDmluZm9AYS1jZXJ0LmF0MIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3euXIy+mnf6BYKbK+QH5k679 +tUFqeT8jlZxMew8eNiHuw9KoxWBzL6KksK+5uK7Gatw+sbAYntEGE80P+Jg1hADM +e+Fr5V0bc6QS3gkVtfUCW/RIvfMM39oxvmqJmOgPnJU7H6+nmLtsq61tv9kVJi/2 +4Y5wXW3odet72sF57EoG6s78w0BUVLNcMngS9bZZzmdG3/d6JbkGgoNF/8DcgCBJ +W/t0JrcIzyppXIOVtUzzOrrU86zuUgT3Rtkl5kjG7DEHpFb9H0fTOY1v8+gRoaO6 +2gA0PCiysgVZjwgVeYe3KAg11nznyleDv198uK3Dc1oXIGYjJx2FpKWUvAuAEwID +AQABo4ICvDCCArgwHQYDVR0OBBYEFDd/Pj6ZcWDKJNSRE3nQdCm0qCTYMIH5BgNV +HSMEgfEwge6AFDd/Pj6ZcWDKJNSRE3nQdCm0qCTYoYHSpIHPMIHMMQswCQYDVQQG +EwJBVDEQMA4GA1UECBMHQXVzdHJpYTEPMA0GA1UEBxMGVmllbm5hMTowOAYDVQQK +EzFBUkdFIERBVEVOIC0gQXVzdHJpYW4gU29jaWV0eSBmb3IgRGF0YSBQcm90ZWN0 +aW9uMSUwIwYDVQQLExxBLUNFUlQgQ2VydGlmaWNhdGlvbiBTZXJ2aWNlMRgwFgYD +VQQDEw9BLUNFUlQgQURWQU5DRUQxHTAbBgkqhkiG9w0BCQEWDmluZm9AYS1jZXJ0 +LmF0ggEAMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgHmMEcGA1UdJQRAMD4G +CCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcD +CAYKKwYBBAGCNwoDBDARBglghkgBhvhCAQEEBAMCAP8wUQYDVR0gBEowSDBGBggq +KAAYAQEBAzA6MDgGCCsGAQUFBwIBFixodHRwOi8vd3d3LmEtY2VydC5hdC9jZXJ0 +aWZpY2F0ZS1wb2xpY3kuaHRtbDA7BglghkgBhvhCAQgELhYsaHR0cDovL3d3dy5h +LWNlcnQuYXQvY2VydGlmaWNhdGUtcG9saWN5Lmh0bWwwGQYDVR0RBBIwEIEOaW5m +b0BhLWNlcnQuYXQwLwYDVR0SBCgwJoEOaW5mb0BhLWNlcnQuYXSGFGh0dHA6Ly93 +d3cuYS1jZXJ0LmF0MEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHBzOi8vc2VjdXJlLmEt +Y2VydC5hdC9jZ2ktYmluL2EtY2VydC1hZHZhbmNlZC5jZ2kwDQYJKoZIhvcNAQEF +BQADggEBACX1IvgfdG2rvfv35O48vSEvcVaEdlN8USFBHWz3JRAozgzvaBtwHkjK +Zwt5l/BWOtjbvHfRjDt7ijlBEcxOOrNC1ffyMHwHrXpvff6YpQ5wnxmIYEQcURiG +HMqruEX0WkuDNgSKwefsgXs27eeBauHgNGVcTYH1rmHu/ZyLpLxOyJQ2PCzA1DzW +3rWkIX92ogJ7lTRdWrbxwUL1XGinxnnaQ74+/y0pI9JNEv7ic2tpkweRMpkedaLW +msC1+orfKTebsg69aMaCx7o6jNONRmR/7TVaPf8/k6g52cHZ9YWjQvup22b5rWxG +J5r5LZ4vCPmF4+T4lutjUYAa/lGuQTg= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIE9zCCA9+gAwIBAgIEPL/xoTANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJQ -TDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2Vu -dHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MSAwHgYDVQQDExdDQyBTaWduZXQgLSBQ -Q0EgS2xhc2EgMjAeFw0wMjA0MTkxMDI5NTNaFw0xNzA0MTgxMjUzMDdaMHUxCzAJ -BgNVBAYTAlBMMR8wHQYDVQQKExZUUCBJbnRlcm5ldCBTcC4geiBvLm8uMSQwIgYD -VQQLExtDZW50cnVtIENlcnR5ZmlrYWNqaSBTaWduZXQxHzAdBgNVBAMTFkNDIFNp -Z25ldCAtIENBIEtsYXNhIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB -AQCqgLJuQqY4yavbSgHg8CyfKTx4BokNSDOVz4eD9vptUr11Kqd06ED1hlH7Sg0g -oBFAfntNU/QTKwSBaNuime7C4sSEdgsKrPoAhGb4Mq8y7Ty7RqZz7mkzNMqzL2L2 -U4yQ2QjvpH8MH0IBqOWEcpSkpwnrCDImRoTfd+YlZWKi2JceQixUUYIQ45Ox8+x8 -hHbvvZdgqtcvo8PW27qoHkp/7hMuJ44kDAGrmxffBXl/OBRZp0uO1CSLcMcVJzyr -2phKhy406MYdWrtNPEluGs0GFDzd0nrIctiWAO4cmct4S72S9Q6e//0GO9f3/Ca5 -Kb2I1xYLj/xE+HgjHX9aD2MhAgMBAAGjggGMMIIBiDAPBgNVHRMBAf8EBTADAQH/ -MA4GA1UdDwEB/wQEAwIBBjCB4wYDVR0gBIHbMIHYMIHVBg0rBgEEAb4/AhQKAQEA -MIHDMHUGCCsGAQUFBwICMGkaZ0NlcnR5ZmlrYXQgd3lzdGF3aW9ueSB6Z29kbmll -IHogZG9rdW1lbnRlbTogIlBvbGl0eWthIENlcnR5ZmlrYWNqaSBQQ0EyIC0gQ2Vy -dHlmaWthdHkgVXJ6ZWRvdyBLbGFzeSAyIi4wSgYIKwYBBQUHAgEWPmh0dHA6Ly93 -d3cuc2lnbmV0LnBsL3JlcG96eXRvcml1bS9kb2t1bWVudHkva2xhc2EyL3BjX3Bj -YTIudHh0MD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6Ly93d3cuc2lnbmV0LnBsL3Jl -cG96eXRvcml1bS9jcmwvcGNhMi5jcmwwHwYDVR0jBBgwFoAUwGxGyl2CfpYHRonE -82AVXO08kMIwHQYDVR0OBBYEFLtFBlILy4HNKVSzvHxBTM0HDowlMA0GCSqGSIb3 -DQEBBQUAA4IBAQBWTsCbqXrXhBBev5v5cIuc6gJM8ww7oR0uMQRZoFSqvQUPWBYM -2/TLI/f8UM9hSShUVj3zEsSj/vFHagUVmzuVXo5u0WK8iaqATSyEVBhADHrPG6wY -cLKJlagge/ILA0m+SieyP2sjYD9MUB9KZIEyBKv0429UuDTw6P7pslxMWJBSNyQx -aLIs0SRKsqZZWkc7ZYAj2apSkBMX2Is1oHA+PwkF6jQMwCao/+CndXPUzfCF6caa -9WwW31W26MlXCvSmJgfiTPwGvm4PkPmOnmWZ3CczzhHl4q7ztHFzshJH3sZWDnrW -wBFjzz5ePr3WHV1wA7EY6oT4zBx+2gT9XBTB +MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM +MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD +QTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBM +MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD +QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/E +jG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWo +ePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GI +ULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapu +Ob7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUg +AKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7 +HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA +uI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQa +TOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTg +xSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1q +CjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5x +O/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs +6GAqm4VKQPNriiTsBhYscw== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEejCCA2KgAwIBAgIEP4vk6TANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJQ -TDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2Vu -dHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MR8wHQYDVQQDExZDQyBTaWduZXQgLSBD -QSBLbGFzYSAyMB4XDTAzMTAxNDExNTgyMloXDTE3MDQxODEyNTMwN1owdzELMAkG -A1UEBhMCUEwxHzAdBgNVBAoTFlRQIEludGVybmV0IFNwLiB6IG8uby4xJDAiBgNV -BAsTG0NlbnRydW0gQ2VydHlmaWthY2ppIFNpZ25ldDEhMB8GA1UEAxMYQ0MgU2ln -bmV0IC0gT0NTUCBLbGFzYSAyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCo -VCsaBStblXQYVNthe3dvaCrfvKpPXngh4almm988iIlEv9CVTaAdCfaJNihvA+Vs -Qw8++ix1VqteMQE474/MV/YaXigP0Zr0QB+g+/7PWVlv+5U9Gzp9+Xx4DJay8AoI -iB7Iy5Qf9iZiHm5BiPRIuUXT4ZRbZRYPh0/76vgRsQIDAQABo4IBkjCCAY4wDgYD -VR0PAQH/BAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMJMEEGA1UdHwQ6MDgwNqA0 -oDKGMGh0dHA6Ly93d3cuc2lnbmV0LnBsL3JlcG96eXRvcml1bS9jcmwva2xhc2Ey -LmNybDCB2AYDVR0gBIHQMIHNMIHKBg4rBgEEAb4/AoFICgwBADCBtzBsBggrBgEF -BQcCAjBgGl5DZXJ0eWZpa2F0IHd5ZGFueSB6Z29kbmllIHogZG9rdW1lbnRlbSAi -UG9saXR5a2EgQ2VydHlmaWthY2ppIC0gQ2VydHlmaWthdHkgcmVzcG9uZGVyb3cg -T0NTUCIuMEcGCCsGAQUFBwIBFjtodHRwOi8vd3d3LnNpZ25ldC5wbC9yZXBvenl0 -b3JpdW0vZG9rdW1lbnR5L3BjX29jc3BfMV8wLnBkZjAfBgNVHSMEGDAWgBS7RQZS -C8uBzSlUs7x8QUzNBw6MJTAdBgNVHQ4EFgQUKEVrOY7cEHvsVgvoyZdytlbtgwEw -CQYDVR0TBAIwADANBgkqhkiG9w0BAQUFAAOCAQEAQrRg5MV6dxr0HU2IsLInxhvt -iUVmSFkIUsBCjzLoewOXA16d2oDyHhI/eE+VgAsp+2ANjZu4xRteHIHoYMsN218M -eD2MLRsYS0U9xxAFK9gDj/KscPbrrdoqLvtPSMhUb4adJS9HLhvUe6BicvBf3A71 -iCNe431axGNDWKnpuj2KUpj4CFHYsWCXky847YtTXDjri9NIwJJauazsrSjK+oXp -ngRS506mdQ7vWrtApkh8zhhWp7duCkjcCo1O8JxqYr2qEW1fXmgOISe010v2mmuv -hHxPyVwoAU4KkOw0nbXZn53yak0is5+XmAjh0wWue44AssHrjC9nUh3mkLt6eQ== +MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j +ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL +MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3 +LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug +RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm ++9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW +PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM +xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB +Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3 +hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg +EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF +MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA +FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec +nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z +eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF +hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2 +Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe +vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep ++OkuE6N36B9K -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIFGjCCBAKgAwIBAgIEPL7eEDANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJQ -TDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2Vu -dHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MRswGQYDVQQDExJDQyBTaWduZXQgLSBS -b290Q0EwHhcNMDIwNDE4MTQ1NDA4WhcNMjYwOTIxMTU0MjE5WjB2MQswCQYDVQQG -EwJQTDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMb -Q2VudHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MSAwHgYDVQQDExdDQyBTaWduZXQg -LSBQQ0EgS2xhc2EgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM7B -rBlbN5maM5eg0BOTqoZ+9NBDvU8Lm5rTdrMswFTCathzpVVLK/JD4K3+4oCZ9SRA -spEXE4gvwb08ASY6w5s+HpRkeJw8YzMFR5kDZD5adgnCAy4vDfIXYZgppXPaTQ8w -nfUZ7BZ7Zfa7QBemUIcJIzJBB0UqgtxWCeol9IekpBRVmuuSA6QG0Jkm+pGDJ05y -j2eQG8jTcBENM7sVA8rGRMyFA4skSZ+D0OG6FS2xC1i9JyN0ag1yII/LPx8HK5J4 -W9MaPRNjAEeaa2qI9EpchwrOxnyVbQfSedCG1VRJfAsE/9tT9CMUPZ3xW20QjQcS -ZJqVcmGW9gVsXKQOVLsCAwEAAaOCAbMwggGvMA8GA1UdEwEB/wQFMAMBAf8wDgYD -VR0PAQH/BAQDAgEGMIIBBAYDVR0gBIH8MIH5MIH2Bg0rBgEEAb4/AgEKAQEBMIHk -MIGaBggrBgEFBQcCAjCBjRqBikNlcnR5ZmlrYXQgd3lzdGF3aW9ueSB6Z29kbmll -IHogZG9rdW1lbnRlbTogIlBvbGl0eWthIENlcnR5ZmlrYWNqaSBkbGEgUm9vdENB -Ii4gQ2VydHlmaWthdCB3eXN0YXdpb255IHByemV6IFJvb3RDQSB3IGhpZXJhcmNo -aWkgQ0MgU2lnbmV0LjBFBggrBgEFBQcCARY5aHR0cDovL3d3dy5zaWduZXQucGwv -cmVwb3p5dG9yaXVtL2Rva3VtZW50eS9wY19yb290Y2EudHh0MEQGA1UdHwQ9MDsw -OaA3oDWGM2h0dHA6Ly93d3cuc2lnbmV0LnBsL3JlcG96eXRvcml1bS9yb290Y2Ev -cm9vdGNhLmNybDAfBgNVHSMEGDAWgBTAm8UjDQLhpk5Iax8A6eOaFBuxrzAdBgNV -HQ4EFgQUwGxGyl2CfpYHRonE82AVXO08kMIwDQYJKoZIhvcNAQEFBQADggEBABp1 -TAUsa+BeVWg4cjowc8yTJ5XN3GvN96GObMkxUGY7U9kVrLI71xBgoNVyzXTiMNDB -vjh7vdPWjpl5SDiRpnnKiOFXA43HvNWzUaOkTu1mxjJsZsanot1Xt6j0ZDC+03Fj -LHdYMyM9kSWp6afb4980EPYZCcSzgM5TOGfJmNii5Tq468VFKrX+52Aou1G22Ohu -+EEOlOrG7ylKv1hHUJJCjwN0ZVEIn1nDbrU9FeGCz8J9ihVUvnENEBbBkU37PWqW -uHitKQDVtcwTwJJdR8cmKq3NmkwAm9fPacidQLpaw0WkuGrS+fEDhu1Nhy9xELP6 -NA9GRTCNxm/dXlcwnmY= +MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhV +MRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMe +TmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0 +dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFzcyBB +KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oXDTE5MDIxOTIzMTQ0 +N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhC +dWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQu +MRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBL +b3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSMD7tM9DceqQWC2ObhbHDqeLVu0ThEDaiD +zl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZz+qMkjvN9wfcZnSX9EUi +3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC/tmwqcm8 +WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LY +Oph7tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2Esi +NCubMvJIH5+hCoR64sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCC +ApswDgYDVR0PAQH/BAQDAgAGMBIGA1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4 +QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZRUxFTSEgRXplbiB0 +YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRhdGFz +aSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu +IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtm +ZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMg +ZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVs +amFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJhc2EgbWVndGFsYWxoYXRv +IGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBzOi8vd3d3 +Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6 +ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1 +YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3Qg +dG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRs +b2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNAbmV0bG9jay5uZXQuMA0G +CSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5ayZrU3/b39/zcT0mwBQO +xmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjPytoUMaFP +0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQ +QeJBCWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxk +f1qbFFgBJ34TUMdrKuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK +8CtmdWOMovsEPoMOmzbwGOQmIMOM8CgHrTwXZoi1/baI +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDAjCCAmsCEEzH6qqYPnHTkxD4PTqJkZIwDQYJKoZIhvcNAQEFBQAwgcExCzAJ +BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh +c3MgMSBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy +MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp +emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X +DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw +FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMSBQdWJsaWMg +UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo +YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5 +MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB +AQUAA4GNADCBiQKBgQCq0Lq+Fi24g9TK0g+8djHKlNgdk4xWArzZbxpvUjZudVYK +VdPfQ4chEWWKfo+9Id5rMj8bhDSVBZ1BNeuS65bdqlk/AVNtmU/t5eIqWpDBucSm +Fc/IReumXY6cPvBkJHalzasab7bYe1FhbqZ/h8jit+U03EGI6glAvnOSPWvndQID +AQABMA0GCSqGSIb3DQEBBQUAA4GBAKlPww3HZ74sy9mozS11534Vnjty637rXC0J +h9ZrbWB85a7FkCMMXErQr7Fd88e2CtvgFZMN3QO8x3aKtd1Pw5sTdbgBwObJW2ul +uIncrKTdcu1OofdPvAbT6shkdHvClUGcZXNY8ZCaPGqxmMnEh7zPRW1F4m4iP/68 +DzFc6PLZ -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIFGjCCBAKgAwIBAgIEPV0tNDANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJQ @@ -2025,81 +1405,6 @@ OcePEhKz1Ag52y6Wf0nJJB9yk0sFakqZH18F7eQecQImgZyyeRtsG95leNugB3BX WCW+KxwiBrtQTXv4dTE= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEzzCCA7egAwIBAgIEO6ocGTANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJQ -TDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2Vu -dHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MRswGQYDVQQDExJDQyBTaWduZXQgLSBS -b290Q0EwHhcNMDEwOTIwMTY0MjE5WhcNMjYwOTIxMTU0MjE5WjBxMQswCQYDVQQG -EwJQTDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMb -Q2VudHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MRswGQYDVQQDExJDQyBTaWduZXQg -LSBSb290Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrr2vydnNp -ELfGW3KsARiDhJvwDtUe4AbWev+OfMc3+vA29nX8ZmIwno3gmItjo5DbUCCRiCMq -5c9epcGu+kg4a3BJChVXREl8gVh0ST15rr3RKrSc4VgsvQzl0ZUraeQLl8JoRT5P -LsUj3qwF78jUCQVckiiLVcnGfZtFCm+DCJXliQBDMB9XFAUEiO/DtEBs0B7wJGx7 -lgJeJpQUcGiaOPjcJDYOk7rNAYmmD2gWeSlepufO8luUYG/YDxTC4mqhRqfa4MnV -O5dqy+ICj2UvUpHbZDB0KfGRibgBYeQP1kuqgIzJN4UqknVAJb0aMBSPl+9k2fAU -dchx1njlbdcbAgMBAAGjggFtMIIBaTAPBgNVHRMBAf8EBTADAQH/MIIBBAYDVR0g -BIH8MIH5MIH2Bg0rBgEEAb4/AgEKAQEAMIHkMIGaBggrBgEFBQcCAjCBjRqBikNl -cnR5ZmlrYXQgd3lzdGF3aW9ueSB6Z29kbmllIHogZG9rdW1lbnRlbTogIlBvbGl0 -eWthIENlcnR5ZmlrYWNqaSBkbGEgUm9vdENBIi4gQ2VydHlmaWthdCB3eXN0YXdp -b255IHByemV6IFJvb3RDQSB3IGhpZXJhcmNoaWkgQ0MgU2lnbmV0LjBFBggrBgEF -BQcCARY5aHR0cDovL3d3dy5zaWduZXQucGwvcmVwb3p5dG9yaXVtL2Rva3VtZW50 -eS9wY19yb290Y2EudHh0MB0GA1UdDgQWBBTAm8UjDQLhpk5Iax8A6eOaFBuxrzAf -BgNVHSMEGDAWgBTAm8UjDQLhpk5Iax8A6eOaFBuxrzAOBgNVHQ8BAf8EBAMCAQYw -DQYJKoZIhvcNAQEFBQADggEBAGnY5QmYqnnO9OqFOWZxxb25UHRnaRF6IV9aaGit -5BZufZj2Tq3v8L3SgE34GOoIcdRMMG5JEpEU4mN/Ef3oY6Eo+7HfqaPHI4KFmbDS -PiK5s+wmf+bQSm0Yq5/h4ZOdcAESlLQeLSt1CQk2JoKQJ6pyAf6xJBgWEIlm4RXE -4J3324PUiOp83kW6MDvaa1xY976WyInr4rwoLgxVl11LZeKWha0RJJxJgw/NyWpK -G7LWCm1fglF8JH51vZNndGYq1iKtfnrIOvLZq6bzaCiZm1EurD8HE6P7pmABKK6o -3C2OXlNfNIgwkDN/cDqk5TYsTkrpfriJPdxXBH8hQOkW89g= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID/TCCA2agAwIBAgIEP4/gkTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJQ -TDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2Vu -dHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MR8wHQYDVQQDExZDQyBTaWduZXQgLSBD -QSBLbGFzYSAxMB4XDTAzMTAxNzEyMjkwMloXDTExMDkyMzExMTgxN1owdjELMAkG -A1UEBhMCUEwxHzAdBgNVBAoTFlRQIEludGVybmV0IFNwLiB6IG8uby4xJDAiBgNV -BAsTG0NlbnRydW0gQ2VydHlmaWthY2ppIFNpZ25ldDEgMB4GA1UEAxMXQ0MgU2ln -bmV0IC0gVFNBIEtsYXNhIDEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOJY -rISEtSsduHajROh5/n7NGrkpYTT9NEaPe9+ucuQ37KxIbfJwXJjgUc1dw4wCkcQ1 -2FJarD1X6mSQ4cfN/60vLfKI5ZD4nhJTMKlAj1pX9ScQ/MuyvKStCbn5WTkjPhjR -AM0tdwXSnzuTEunfw0Oup559y3Iqxg1cExflB6cfAgMBAAGjggGXMIIBkzBBBgNV -HR8EOjA4MDagNKAyhjBodHRwOi8vd3d3LnNpZ25ldC5wbC9yZXBvenl0b3JpdW0v -Y3JsL2tsYXNhMS5jcmwwDgYDVR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQMMAoGCCsG -AQUFBwMIMIHaBgNVHSAEgdIwgc8wgcwGDSsGAQQBvj8CZAoRAgEwgbowbwYIKwYB -BQUHAgIwYxphQ2VydHlmaWthdCB3eXN0YXdpb255IHpnb2RuaWUgeiBkb2t1bWVu -dGVtICJQb2xpdHlrYSBDZXJ0eWZpa2FjamkgQ0MgU2lnbmV0IC0gWm5ha293YW5p -ZSBjemFzZW0iLjBHBggrBgEFBQcCARY7aHR0cDovL3d3dy5zaWduZXQucGwvcmVw -b3p5dG9yaXVtL2Rva3VtZW50eS9wY190c2ExXzJfMS5wZGYwHwYDVR0jBBgwFoAU -w4Me1Vl3VPtN+1dH+cQjXNHnieMwHQYDVR0OBBYEFJdDwEqtcavOYd9u9tej53vW -XwNBMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEFBQADgYEAnpiQkqLCJQYXUrqMHUEz -+z3rOqS0XzSFnVVLhkVssvXc8S3FkJIiQTUrkScjI4CToCzujj3EyfNxH6yiLlMb -skF8I31JxIeBvueqV+s+o76CZm3ycu9hb0I4lswuxoT+q5ZzPR8Irrb51rZXlolR -+7KtwMg4sFDJZ8RNgOf7tbA= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDvjCCA3ygAwIBAgIFJQaThoEwCwYHKoZIzjgEAwUAMIGFMQswCQYDVQQGEwJG -UjEPMA0GA1UECBMGRnJhbmNlMQ4wDAYDVQQHEwVQYXJpczEQMA4GA1UEChMHUE0v -U0dETjEOMAwGA1UECxMFRENTU0kxDjAMBgNVBAMTBUlHQy9BMSMwIQYJKoZIhvcN -AQkBFhRpZ2NhQHNnZG4ucG0uZ291di5mcjAeFw0wMjEyMTMxNDM5MTVaFw0yMDEw -MTcxNDM5MTRaMIGFMQswCQYDVQQGEwJGUjEPMA0GA1UECBMGRnJhbmNlMQ4wDAYD -VQQHEwVQYXJpczEQMA4GA1UEChMHUE0vU0dETjEOMAwGA1UECxMFRENTU0kxDjAM -BgNVBAMTBUlHQy9BMSMwIQYJKoZIhvcNAQkBFhRpZ2NhQHNnZG4ucG0uZ291di5m -cjCCAbYwggErBgcqhkjOOAQBMIIBHgKBgQCFkMImdk9zDzJfTO4XPdAAmLbAdWws -ZiEMZh19RyTo3CyhFqO77OIXrwY6vc1pcc3MgWJ0dgQpAgrDMtmFFxpUu4gmjVsx -8GpxQC+4VOgLY8Cvmcd/UDzYg07EIRto8BwCpPJ/JfUxwzV2V3N713aAX+cEoKZ/ -s+kgxC6nZCA7oQIVALME/JYjkdW2uKIGngsEPbXAjdhDAoGADh/uqWJx94UBm31c -9d8ZTBfRGRnmSSRVFDgPWgA69JD4BR5da8tKz+1HjfMhDXljbMH86ixpD5Ka1Z0V -pRYUPbyAoB37tsmXMJY7kjyD19d5VdaZboUjVvhH6UJy5lpNNNGSvFl4fqkxyvw+ -pq1QV0N5RcvK120hlXdfHUX+YKYDgYQAAoGAQGr7IuKJcYIvJRMjxwl43KxXY2xC -aoCiM/bv117MfI94aNf1UusGhp7CbYAY9CXuL60P0oPMAajbaTE5Z34AuITeHq3Y -CNMHwxalip8BHqSSGmGiQsXeK7T+r1rPXsccZ1c5ikGDZ4xn5gUaCyy2rCmb+fOJ -6VAfCbAbAjmNKwejdzB1MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgFGMBUG -A1UdIAQOMAwwCgYIKoF6AXkBAQEwHQYDVR0OBBYEFPkeNRcUf8idzpKblYbLNxs0 -MQhSMB8GA1UdIwQYMBaAFPkeNRcUf8idzpKblYbLNxs0MQhSMAsGByqGSM44BAMF -AAMvADAsAhRVh+CJA5eVyEYU5AO9Tm7GxX0rmQIUBCqsU5u1WxoZ5lEXicDX5/Ob -sRQ= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYT AkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQ TS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG @@ -2124,397 +1429,272 @@ NjSaTFR+FwNIlQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R 0982gaEbeC9xs/FZTEYYKKuF0mBWWg== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCB -gTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G -A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNV -BAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEyMDEwMDAw -MDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3Jl -YXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01P -RE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0 -aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3 -UcEbVASY06m/weaKXTuH+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI -2GqGd0S7WWaXUF601CxwRM/aN5VCaTwwxHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8 -Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV4EajcNxo2f8ESIl33rXp -+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA1KGzqSX+ -DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5O -nKVIrLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW -/zAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6g -PKA6hjhodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9u -QXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOCAQEAPpiem/Yb6dc5t3iuHXIY -SdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CPOGEIqB6BCsAv -IC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/ -RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4 -zJVSk/BwJVmcIGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5dd -BA6+C4OmF4O5MBKgxTMVBbkN+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IB -ZQ== +MIIH/zCCB2igAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARwxCzAJBgNVBAYTAkVT +MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE +ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE +ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEzMDEGA1UECxMq +SVBTIENBIENoYWluZWQgQ0FzIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MTMwMQYD +VQQDEypJUFMgQ0EgQ2hhaW5lZCBDQXMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkx +HjAcBgkqhkiG9w0BCQEWD2lwc0BtYWlsLmlwcy5lczAeFw0wMTEyMzExMTE0NTRa +Fw0yNTEyMjkxMTE0NTRaMIIBHDELMAkGA1UEBhMCRVMxEjAQBgNVBAgTCUJhcmNl +bG9uYTESMBAGA1UEBxMJQmFyY2Vsb25hMS4wLAYDVQQKEyVJUFMgSW50ZXJuZXQg +cHVibGlzaGluZyBTZXJ2aWNlcyBzLmwuMSswKQYDVQQKFCJpcHNAbWFpbC5pcHMu +ZXMgQy5JLkYuICBCLTYwOTI5NDUyMTMwMQYDVQQLEypJUFMgQ0EgQ2hhaW5lZCBD +QXMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxMzAxBgNVBAMTKklQUyBDQSBDaGFp +bmVkIENBcyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEeMBwGCSqGSIb3DQEJARYP +aXBzQG1haWwuaXBzLmVzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpOZZJ +iHAzKHzoV9xIki3eLXp56UjxFehnY+c+Dh1nUiVO0t//vmGMP6B2LTFfx9FBKRBi +kYcW7raIcSDi62Or0sAG5UUgG4ruGLE7XtCnnx4xjgbFZ4tTjdgi5Wh9GVhfP7Oo +9ahi8Eqao+alFbhvB6LD3xZZqM2j9cmD8GzYAQIDAQABo4IESzCCBEcwHQYDVR0O +BBYEFAeUqHBsCqTumbhV3S5MRXf2Nq+5MIIBTgYDVR0jBIIBRTCCAUGAFAeUqHBs +CqTumbhV3S5MRXf2Nq+5oYIBJKSCASAwggEcMQswCQYDVQQGEwJFUzESMBAGA1UE +CBMJQmFyY2Vsb25hMRIwEAYDVQQHEwlCYXJjZWxvbmExLjAsBgNVBAoTJUlQUyBJ +bnRlcm5ldCBwdWJsaXNoaW5nIFNlcnZpY2VzIHMubC4xKzApBgNVBAoUImlwc0Bt +YWlsLmlwcy5lcyBDLkkuRi4gIEItNjA5Mjk0NTIxMzAxBgNVBAsTKklQUyBDQSBD +aGFpbmVkIENBcyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEzMDEGA1UEAxMqSVBT +IENBIENoYWluZWQgQ0FzIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZI +hvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOCAQAwDAYDVR0TBAUwAwEB/zAMBgNVHQ8E +BQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwMG +CCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIBFQYKKwYBBAGCNwIBFgYKKwYB +BAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhCAQEEBAMCAAcwGgYDVR0RBBMw +EYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGBD2lwc0BtYWlsLmlwcy5lczBD +BglghkgBhvhCAQ0ENhY0Q2hhaW5lZCBDQSBDZXJ0aWZpY2F0ZSBpc3N1ZWQgYnkg +aHR0cHM6Ly93d3cuaXBzLmVzLzAqBglghkgBhvhCAQIEHRYbaHR0cHM6Ly93d3cu +aXBzLmVzL2lwczIwMDIvMDgGCWCGSAGG+EIBBAQrFilodHRwczovL3d3dy5pcHMu +ZXMvaXBzMjAwMi9pcHMyMDAyQ0FDLmNybDA9BglghkgBhvhCAQMEMBYuaHR0cHM6 +Ly93d3cuaXBzLmVzL2lwczIwMDIvcmV2b2NhdGlvbkNBQy5odG1sPzA6BglghkgB +hvhCAQcELRYraHR0cHM6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmVuZXdhbENBQy5o +dG1sPzA4BglghkgBhvhCAQgEKxYpaHR0cHM6Ly93d3cuaXBzLmVzL2lwczIwMDIv +cG9saWN5Q0FDLmh0bWwwbwYDVR0fBGgwZjAvoC2gK4YpaHR0cHM6Ly93d3cuaXBz +LmVzL2lwczIwMDIvaXBzMjAwMkNBQy5jcmwwM6AxoC+GLWh0dHBzOi8vd3d3YmFj +ay5pcHMuZXMvaXBzMjAwMi9pcHMyMDAyQ0FDLmNybDAvBggrBgEFBQcBAQQjMCEw +HwYIKwYBBQUHMAGGE2h0dHA6Ly9vY3NwLmlwcy5lcy8wDQYJKoZIhvcNAQEFBQAD +gYEATiRvY2nro9B6QNgTOgojWSrXMKpXHa6hLRxL2GZPEFg059x2ERs3pw7RlJJZ +ctupZam06zvBnGfQL4ZhevXl6ST6RAAmOikuj8kbiFSgujjCJY1wv5/7zzgBWzdL +NzqKC18p1T2KZa8B2qKfQCqzV/J3fgI/725+9ekqKNLiE5Q= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn -MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL -ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMg -b2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAxNjEzNDNaFw0zNzA5MzAxNjEzNDRa -MH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZpcm1hIFNBIENJRiBB -ODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3JnMSIw -IAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0B -AQEFAAOCAQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtb -unXF/KGIJPov7coISjlUxFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0d -BmpAPrMMhe5cG3nCYsS4No41XQEMIwRHNaqbYE6gZj3LJgqcQKH0XZi/caulAGgq -7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jWDA+wWFjbw2Y3npuRVDM3 -0pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFVd9oKDMyX -roDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIG -A1UdEwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5j -aGFtYmVyc2lnbi5vcmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p -26EpW1eLTXYGduHRooowDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIA -BzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hhbWJlcnNpZ24ub3JnMCcGA1Ud -EgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYDVR0gBFEwTzBN -BgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz -aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEB -AAxBl8IahsAifJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZd -p0AJPaxJRUXcLo0waLIJuvvDL8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi -1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wNUPf6s+xCX6ndbcj0dc97wXImsQEc -XCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/nADydb47kMgkdTXg0 -eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1erfu -tGWaIZDgqtCYvDi1czyL+Nw= +MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEc +MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2Vj +IFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENB +IDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5MjM1OTAwWjBxMQswCQYDVQQGEwJE +RTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxl +U2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290 +IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEU +ha88EOQ5bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhC +QN/Po7qCWWqSG6wcmtoIKyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1Mjwr +rFDa1sPeg5TKqAyZMg4ISFZbavva4VhYAUlfckE8FQYBjl2tqriTtM2e66foai1S +NNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aKSe5TBY8ZTNXeWHmb0moc +QqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTVjlsB9WoH +txa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAP +BgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC +AQEAlGRZrTlk5ynrE/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756Abrsp +tJh6sTtU6zkXR34ajgv8HzFZMQSyzhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpa +IzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8rZ7/gFnkm0W09juwzTkZmDLl +6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4Gdyd1Lx+4ivn+ +xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU +Cm26OWMohpLzGITY+9HPBVZkVw== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEn -MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL -ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENo -YW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYxNDE4WhcNMzcwOTMwMTYxNDE4WjB9 -MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgy -NzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4G -A1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUA -A4IBDQAwggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0 -Mi+ITaFgCPS3CU6gSS9J1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/s -QJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8Oby4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpV -eAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl6DJWk0aJqCWKZQbua795 -B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c8lCrEqWh -z0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0T -AQH/BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1i -ZXJzaWduLm9yZy9jaGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4w -TcbOX60Qq+UDpfqpFDAOBgNVHQ8BAf8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAH -MCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBjaGFtYmVyc2lnbi5vcmcwKgYD -VR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9yZzBbBgNVHSAE -VDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh -bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0B -AQUFAAOCAQEAPDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUM -bKGKfKX0j//U2K0X1S0E0T9YgOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXi -ryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJPJ7oKXqJ1/6v/2j1pReQvayZzKWG -VwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4IBHNfTIzSJRUTN3c -ecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREest2d/ -AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A== +MIIFaDCCBFCgAwIBAgIQO1nHe81bV569N1KsdrSqGjANBgkqhkiG9w0BAQUFADBi +MRIwEAYDVQQKEwliZVRSVVNUZWQxGzAZBgNVBAsTEmJlVFJVU1RlZCBSb290IENB +czEvMC0GA1UEAxMmYmVUUlVTVGVkIFJvb3QgQ0EgLSBSU0EgSW1wbGVtZW50YXRp +b24wHhcNMDIwNDExMTExODEzWhcNMjIwNDEyMTEwNzI1WjBiMRIwEAYDVQQKEwli +ZVRSVVNUZWQxGzAZBgNVBAsTEmJlVFJVU1RlZCBSb290IENBczEvMC0GA1UEAxMm +YmVUUlVTVGVkIFJvb3QgQ0EgLSBSU0EgSW1wbGVtZW50YXRpb24wggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkujQwCY5X0LkGLG9uJIAiv11DpvpPrILn +HGhwhRujbrWqeNluB0s/6d/16uhUoWGKDi9pdRi3DOUUjXFumLhV/AyV0Jtu4S2I +1DpAa5LxmZZk3tv/ePTulh1HiXzUvrmIdyM6CeYEnm2qXtLIvZpOGd+J6lsOfsPk +tPDgaTuID0GQ+NRxQyTBjyZLO1bp/4xsN+lFrYWMU8NghpBKlsmzVLC7F/AcRdnU +GxlkVgoZ98zh/4avflherHqQH8koOUV7orbHnB/ahdQhhlkwk75TMzf270HPM8er +cmsl9fNTGwxMLvF1S++gh/f+ihXQbNXL+WhTuXAVE8L1LvtDNXUtAgMBAAGjggIY +MIICFDAMBgNVHRMEBTADAQH/MIIBtQYDVR0gBIIBrDCCAagwggGkBg8rBgEEAbE+ +AAADCSiDkTEwggGPMEEGCCsGAQUFBwIBFjVodHRwOi8vd3d3LmJldHJ1c3RlZC5j +b20vcHJvZHVjdHNfc2VydmljZXMvaW5kZXguaHRtbDCCAUgGCCsGAQUFBwICMIIB +OhqCATZSZWxpYW5jZSBvbiBvciB1c2Ugb2YgdGhpcyBDZXJ0aWZpY2F0ZSBjcmVh +dGVzIGFuIGFja25vd2xlZGdtZW50IGFuZCBhY2NlcHRhbmNlIG9mIHRoZSB0aGVu +IGFwcGxpY2FibGUgc3RhbmRhcmQgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdXNl +LCB0aGUgQ2VydGlmaWNhdGlvbiBQcmFjdGljZSBTdGF0ZW1lbnQgYW5kIHRoZSBS +ZWx5aW5nIFBhcnR5IEFncmVlbWVudCwgd2hpY2ggY2FuIGJlIGZvdW5kIGF0IHRo +ZSBiZVRSVVNUZWQgd2ViIHNpdGUsIGh0dHA6Ly93d3cuYmV0cnVzdGVkLmNvbS9w +cm9kdWN0c19zZXJ2aWNlcy9pbmRleC5odG1sMAsGA1UdDwQEAwIBBjAfBgNVHSME +GDAWgBSp7BR++dlDzFMrFK3P9/BZiUHNGTAdBgNVHQ4EFgQUqewUfvnZQ8xTKxSt +z/fwWYlBzRkwDQYJKoZIhvcNAQEFBQADggEBANuXsHXqDMTBmMpWBcCorSZIry0g +6IHHtt9DwSwddUvUQo3neqh03GZCWYez9Wlt2ames30cMcH1VOJZJEnl7r05pmuK +mET7m9cqg5c0Lcd9NUwtNLg+DcTsiCevnpL9UGGCqGAHFFPMZRPB9kdEadIxyKbd +LrML3kqNWz2rDcI1UqJWN8wyiyiFQpyRQHpwKzg21eFzGh/l+n5f3NacOzDq28Bb +J1zTcwfBwvNMm2+fG8oeqqg4MwlYsq78B+g23FW6L09A/nq9BqaBwZMifIYRCgZ3 +SK41ty8ymmFei74pnykkiFY5LKjSq5YDWtRIn7lAhAuYaPsBQ9Yb4gmxlxw= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAw -PTELMAkGA1UEBhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFz -cyAyIFByaW1hcnkgQ0EwHhcNOTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9 -MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2VydHBsdXMxGzAZBgNVBAMTEkNsYXNz -IDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxQ -ltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR5aiR -VhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyL -kcAbmXuZVg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCd -EgETjdyAYveVqUSISnFOYFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yas -H7WLO7dDWWuwJKZtkIvEcupdM5i3y95ee++U8Rs+yskhwcWYAqqi9lt3m/V+llU0 -HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRMECDAGAQH/AgEKMAsGA1Ud -DwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJYIZIAYb4 -QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMu -Y29tL0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/ -AN9WM2K191EBkOvDP9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8 -yfFC82x/xXp8HVGIutIKPidd3i1RTtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMR -FcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+7UCmnYR0ObncHoUW2ikbhiMA -ybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW//1IMwrh3KWB -kJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7 -l7+ijrRU +MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC +VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u +ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc +KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u +ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05OTA1 +MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIGA1UE +ChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5j +b3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF +bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUg +U2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUA +A4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQaO2f55M28Qpku0f1BBc/ +I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5gXpa0zf3 +wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OC +AdcwggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHb +oIHYpIHVMIHSMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5 +BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p +dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1pdGVk +MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp +b24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu +dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0 +MFqBDzIwMTkwNTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8Bdi +E1U9s/8KAGv7UISX8+1i0BowHQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAa +MAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI +hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyNEwr75Ji174z4xRAN +95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd +2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBb -MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3Qx -ETAPBgNVBAsTCERTVCBBQ0VTMRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0w -MzExMjAyMTE5NThaFw0xNzExMjAyMTE5NThaMFsxCzAJBgNVBAYTAlVTMSAwHgYD -VQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UECxMIRFNUIEFDRVMx -FzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -MIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPu -ktKe1jzIDZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7 -gLFViYsx+tC3dr5BPTCapCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZH -fAjIgrrep4c9oW24MFbCswKBXy314powGCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4a -ahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPyMjwmR/onJALJfh1biEIT -ajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1UdEwEB/wQF -MAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rk -c3QuY29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjto -dHRwOi8vd3d3LnRydXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMt -aW5kZXguaHRtbDAdBgNVHQ4EFgQUCXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZI -hvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V25FYrnJmQ6AgwbN99Pe7lv7Uk -QIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6tFr8hlxCBPeP/ -h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq -nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpR -rscL9yuwNwXsvFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf2 -9w4LTJxoeHtxMcfrHuBnQfO3oKfN5XozNmr6mis= +MIIEUzCCAzugAwIBAgIDAOJDMA0GCSqGSIb3DQEBBQUAMIHPMQswCQYDVQQGEwJB +VDGBizCBiAYDVQQKHoGAAEEALQBUAHIAdQBzAHQAIABHAGUAcwAuACAAZgD8AHIA +IABTAGkAYwBoAGUAcgBoAGUAaQB0AHMAcwB5AHMAdABlAG0AZQAgAGkAbQAgAGUA +bABlAGsAdAByAC4AIABEAGEAdABlAG4AdgBlAHIAawBlAGgAcgAgAEcAbQBiAEgx +GDAWBgNVBAsTD0EtVHJ1c3QtUXVhbC0wMTEYMBYGA1UEAxMPQS1UcnVzdC1RdWFs +LTAxMB4XDTA0MTEzMDIzMDAwMFoXDTE0MTEzMDIzMDAwMFowgc8xCzAJBgNVBAYT +AkFUMYGLMIGIBgNVBAoegYAAQQAtAFQAcgB1AHMAdAAgAEcAZQBzAC4AIABmAPwA +cgAgAFMAaQBjAGgAZQByAGgAZQBpAHQAcwBzAHkAcwB0AGUAbQBlACAAaQBtACAA +ZQBsAGUAawB0AHIALgAgAEQAYQB0AGUAbgB2AGUAcgBrAGUAaAByACAARwBtAGIA +SDEYMBYGA1UECxMPQS1UcnVzdC1RdWFsLTAxMRgwFgYDVQQDEw9BLVRydXN0LVF1 +YWwtMDEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmhgdxIbxTGEOH +fXGiewI3NFldAWKFWfLofO+5I1UbvA5avt7IgsGXz/tI/f5HGUbascI0i7xG0tqV +lA5ctQgLRqxgxHtgTkMcqsAEYdsz3LZsCdXO1QrvEBGLTSABdxiL/gSWJ6z77CSw +x7Xg02HwxPV82cjGkSF3ENGJntuIAAnRDWn/ORHjFatNRymoMbHaOEZXSGhf7Y5F +rrHEqGyi9E6sv784De/T1aTvskn8cWeUmDzv//omiG/a/V9KQex/61XN8OthUQVn +X+u/liL2NKx74I2C/GgHX5B0WkPNqsSOgmlvJ/cKuT0PveUgVFDAA0oYBgcE1KDM +lBbN0kmPAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0OBAoECEs8jB2F +6W+tMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAIUusmJzMJRiQ +8TAHrJAOelfuWoTGcqdIv7Tys/fNl2yF2fjvHT8J01aKialFVpbVeQ2XKb1O2bHO +QYAKgsdZ2jZ/sdL2UVFRTHmidLu6PdgWCBRhJYQELQophO9QVvfhAA0TwbESYqTz ++nlI5Gr7CZe8f6HEmhJmCtUQsdQCufGglRh4T+tIGiNGcnyVEHZ93mSVepFr1VA2 +9CTRPteuGjA81jeAz9peYiFE1CXvxK9cJiv0BcALFLWmADCoRLzIRZhA+sAwYUmw +M1rqVCPA3kBQvIC95tyQvNy2dG0Vs+O6PwLaNX/suSlElQ06X2l1VwMaYb4vZKFq +N0bOhBXEVg== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/ -MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT -DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow -PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD -Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O -rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq -OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b -xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw -7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD -aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV -HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG -SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69 -ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr -AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz -R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5 -JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo -Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ +MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC +VVMxFDASBgNVBAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQ +cmVtaXVtIEVDQzAeFw0xMDAxMjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJ +BgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwXQWZmaXJt +VHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNMF4bFZ0D +0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQN8O9 +ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0G +A1UdDgQWBBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4G +A1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/Vs +aobgxCd05DhT1wV/GzTjxi+zygk8N53X57hG8f2h4nECMEJZh0PUUd+60wkyWs6I +flc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKMeQ== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv -b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG -EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl -cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c -JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP -mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+ -wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4 -VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/ -AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB -AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW -BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun -pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC -dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf -fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm -NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx -H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe -+o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g== +MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV +BAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2ln +biBHb2xkIENBIC0gRzIwHhcNMDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBF +MQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMR8wHQYDVQQDExZT +d2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC +CgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUqt2/8 +76LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+ +bbqBHH5CjCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c +6bM8K8vzARO/Ws/BtQpgvd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqE +emA8atufK+ze3gE/bk3lUIbLtK/tREDFylqM2tIrfKjuvqblCqoOpd8FUrdVxyJd +MmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvRAiTysybUa9oEVeXBCsdt +MDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuendjIj3o02y +MszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69y +FGkOpeUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPi +aG59je883WX0XaxR7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxM +gI93e2CaHt+28kgeDrpOVG2Y4OGiGqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCB +qTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWyV7 +lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn +8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov +L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe6 +45R88a7A3hfm5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczO +UYrHUDFu4Up+GC9pWbY9ZIEr44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5 +O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC +bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv +GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a +77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC +hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3 +92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp +Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w +ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt +Qc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD -QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT -MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j -b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB -CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97 -nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt -43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P -T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4 -gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO -BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR -TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw -DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr -hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg -06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF -PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls -YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk -CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4= +MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDEl +MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMe +U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoX +DTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRy +dXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3VyaXR5IENvbW11bmlj +YXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAV +OVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGr +zbl+dp+++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVM +VAX3NuRFg3sUZdbcDE3R3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQ +hNBqyjoGADdH5H5XTz+L62e4iKrFvlNVspHEfbmwhRkGeC7bYRr6hfVKkaHnFtWO +ojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1KEOtOghY6rCcMU/Gt1SSw +awNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8QIH4D5cs +OPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3 +DQEBCwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpF +coJxDjrSzG+ntKEju/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXc +okgfGT+Ok+vx+hfuzU7jBBJV1uXk3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8 +t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6qtnRGEmyR7jTV7JqR50S+kDFy +1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29mvVXIwAHIRc/ +SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03 -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j -ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL -MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3 -LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug -RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm -+9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW -PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM -xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB -Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3 -hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg -EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF -MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA -FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec -nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z -eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF -hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2 -Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe -vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep -+OkuE6N36B9K +MIIDyzCCArOgAwIBAgIDAOJIMA0GCSqGSIb3DQEBBQUAMIGLMQswCQYDVQQGEwJB +VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp +bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRgwFgYDVQQLDA9BLVRydXN0LVF1 +YWwtMDIxGDAWBgNVBAMMD0EtVHJ1c3QtUXVhbC0wMjAeFw0wNDEyMDIyMzAwMDBa +Fw0xNDEyMDIyMzAwMDBaMIGLMQswCQYDVQQGEwJBVDFIMEYGA1UECgw/QS1UcnVz +dCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVy +a2VociBHbWJIMRgwFgYDVQQLDA9BLVRydXN0LVF1YWwtMDIxGDAWBgNVBAMMD0Et +VHJ1c3QtUXVhbC0wMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJaR +q9eOsFm4Ab20Hq2Z/aH86gyWa48uSUjY6eQkguHYuszr3gdcSMYZggFHQgnhfLmf +ro/27l5rqKhWiDhWs+b+yZ1PNDhRPJy+86ycHMg9XJqErveULBSyZDdgjhSwOyrN +ibUir/fkf+4sKzP5jjytTKJXD/uCxY4fAd9TjMEVpN3umpIS0ijpYhclYDHvzzGU +833z5Dwhq5D8bc9jp8YSAHFJ1xzIoO1jmn3jjyjdYPnY5harJtHQL73nDQnfbtTs +5ThT9GQLulrMgLU4WeyAWWWEMWpfVZFMJOUkmoOEer6A8e5fIAeqdxdsC+JVqpZ4 +CAKel/Arrlj1gFA//jsCAwEAAaM2MDQwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4E +CgQIQj0rJKbBRc4wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBG +yxFjUA2bPkXUSC2SfJ29tmrbiLKal+g6a9M8Xwd+Ejo+oYkNP6F4GfeDtAXpm7xb +9Ly8lhdbHcpRhzCUQHJ1tBCiGdLgmhSx7TXjhhanKOdDgkdsC1T+++piuuYL72TD +gUy2Sb1GHlJ1Nc6rvB4fpxSDAOHqGpUq9LWsc3tFkXqRqmQVtqtR77npKIFBioc6 +2jTBwDMPX3hDJDR1DSPc6BnZliaNw2IHdiMQ0mBoYeRnFdq+TyDKsjmJOOQPLzzL +/saaw6F891+gBjLFEFquDyR73lAPJS279R3csi8WWk4ZYUC/1V8H3Ktip/J6ac8e +qhLCbmJ81Lo92JGHz/ot -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC -VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0 -Lm5ldC9DUFMgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMW -KGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsGA1UEAxMkRW50cnVzdCBSb290IENl -cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0MloXDTI2MTEyNzIw -NTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMTkw -NwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSBy -ZWZlcmVuY2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNV -BAMTJEVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJ -KoZIhvcNAQEBBQADggEPADCCAQoCggEBALaVtkNC+sZtKm9I35RMOVcF7sN5EUFo -Nu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYszA9u3g3s+IIRe7bJWKKf4 -4LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOwwCj0Yzfv9 -KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGI -rb68j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi -94DkZfs0Nw4pgHBNrziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOB -sDCBrTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAi -gA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1MzQyWjAfBgNVHSMEGDAWgBRo -kORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DHhmak8fdLQ/uE -vW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA -A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9t -O1KzKtvn1ISMY/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6Zua -AGAT/3B+XxFNSRuzFVJ7yVTav52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP -9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTSW3iDVuycNsMm4hH2Z0kdkquM++v/ -eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m -0vdXcDazv/wor3ElhVsT/h5/WrQ8 ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEVzCCAz+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCRVMx -IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1 -dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2 -MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w -HhcNMDExMDI0MjIwMDAwWhcNMTMxMDI0MjIwMDAwWjCBnTELMAkGA1UEBhMCRVMx -IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1 -dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2 -MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w -ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnIwNvbyOlXnjOlSztlB5u -Cp4Bx+ow0Syd3Tfom5h5VtP8c9/Qit5Vj1H5WuretXDE7aTt/6MNbg9kUDGvASdY -rv5sp0ovFy3Tc9UTHI9ZpTQsHVQERc1ouKDAA6XPhUJHlShbz++AbOCQl4oBPB3z -hxAwJkh91/zpnZFx/0GaqUC1N5wpIE8fUuOgfRNtVLcK3ulqTgesrBlf3H5idPay -BQC6haD9HThuy1q7hryUZzM1gywfI834yJFxzJeL764P3CkDG8A563DtwW4O2GcL -iam8NeTvtjS0pbbELaW+0MOUJEjb35bTALVmGotmBQ/dPz/LP6pemkr4tErvlTcb -AgMBAAGjgZ8wgZwwKgYDVR0RBCMwIYYfaHR0cDovL3d3dy5maXJtYXByb2Zlc2lv -bmFsLmNvbTASBgNVHRMBAf8ECDAGAQH/AgEBMCsGA1UdEAQkMCKADzIwMDExMDI0 -MjIwMDAwWoEPMjAxMzEwMjQyMjAwMDBaMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E -FgQUMwugZtHq2s7eYpMEKFK1FH84aLcwDQYJKoZIhvcNAQEFBQADggEBAEdz/o0n -VPD11HecJ3lXV7cVVuzH2Fi3AQL0M+2TUIiefEaxvT8Ub/GzR0iLjJcG1+p+o1wq -u00vR+L4OQbJnC4xGgN49Lw4xiKLMzHwFgQEffl25EvXwOaD7FnMP97/T2u3Z36m -hoEyIwOdyPdfwUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzfl -ZKG+TQyTmAyX9odtsz/ny4Cm7YjHX1BiAuiZdBbQ5rQ58SfLyEDW44YQqSMSkuBp -QWOnryULwMWSyx6Yo1q6xTMPoJcB3X/ge9YGVM+h4k0460tQtcsm9MracEpqoeJ5 -quGnM/b9Sh/22WA= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEW -MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFs -IENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQG -EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3Qg -R2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvPE1A -PRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/NTL8 -Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hL -TytCOb1kLUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL -5mkWRxHCJ1kDs6ZgwiFAVvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7 -S4wMcoKK+xfNAGw6EzywhIdLFnopsk/bHdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe -2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE -FHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNHK266ZUap -EBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6td -EPx7srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv -/NgdRN3ggX+d6YvhZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywN -A0ZF66D0f0hExghAzN4bcLUprbqLOzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0 -abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkCx1YAzUm5s2x7UwQa4qjJqhIF -I8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqFH4z1Ir+rzoPz -4iIprn2DQKi6bA== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBY -MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMo -R2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEx -MjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQK -Ew1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQcmltYXJ5IENlcnRp -ZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC -AQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9 -AWbK7hWNb6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjA -ZIVcFU2Ix7e64HXprQU9nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE0 -7e9GceBrAqg1cmuXm2bgyxx5X9gaBGgeRwLmnWDiNpcB3841kt++Z8dtd1k7j53W -kBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGttm/81w7a4DSwDRp35+MI -mO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G -A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJ -KoZIhvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ1 -6CePbJC/kRYkRj5KTs4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl -4b7UVXGYNTq+k+qurUKykG/g/CFNNWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6K -oKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHaFloxt/m0cYASSJlyc1pZU8Fj -UjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG1riR/aYNKxoU -AT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW -MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy -c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE -BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0 -IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV -VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8 -cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT -QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh -F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v -c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w -mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd -VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX -teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ -f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe -Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+ -nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB -/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY -MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG -9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc -aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX -IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn -ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z -uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN -Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja -QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW -koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9 -ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt -DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm -bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEW -MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVy -c2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYD -VQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1 -c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC -AQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81 -WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUG -FF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdq -XbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxL -se4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwb -KNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8Fd -IgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73 -y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRt -hAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgoc -QIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4 -Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNV -HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNV -HSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJ -KoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z -dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQ -L1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgr -Fg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSo -ag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaY -T1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbz -GDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m -1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJV -OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH -6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwX -QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G -A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp -Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1 -MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG -A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL -v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8 -eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq -tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd -C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa -zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB -mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH -V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n -bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG -3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs -J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO -291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS -ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd -AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7 -TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg== +MIIEXzCCA0egAwIBAgIBATANBgkqhkiG9w0BAQUFADCB0DELMAkGA1UEBhMCRVMx +SDBGBgNVBAoTP0laRU5QRSBTLkEuIC0gQ0lGIEEtMDEzMzcyNjAtUk1lcmMuVml0 +b3JpYS1HYXN0ZWl6IFQxMDU1IEY2MiBTODFCMEAGA1UEBxM5QXZkYSBkZWwgTWVk +aXRlcnJhbmVvIEV0b3JiaWRlYSAzIC0gMDEwMTAgVml0b3JpYS1HYXN0ZWl6MRMw +EQYDVQQDEwpJemVucGUuY29tMR4wHAYJKoZIhvcNAQkBFg9JbmZvQGl6ZW5wZS5j +b20wHhcNMDMwMTMwMjMwMDAwWhcNMTgwMTMwMjMwMDAwWjCB0DELMAkGA1UEBhMC +RVMxSDBGBgNVBAoTP0laRU5QRSBTLkEuIC0gQ0lGIEEtMDEzMzcyNjAtUk1lcmMu +Vml0b3JpYS1HYXN0ZWl6IFQxMDU1IEY2MiBTODFCMEAGA1UEBxM5QXZkYSBkZWwg +TWVkaXRlcnJhbmVvIEV0b3JiaWRlYSAzIC0gMDEwMTAgVml0b3JpYS1HYXN0ZWl6 +MRMwEQYDVQQDEwpJemVucGUuY29tMR4wHAYJKoZIhvcNAQkBFg9JbmZvQGl6ZW5w +ZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1btoCXXhp3xIW +D+Bxl8nUCxkyiazWfpt0e68t+Qt9+lZjKZSdEw2Omj4qvr+ovRmDXO3iWpWVOWDl +3JHJjAzFCe8ZEBNDH+QNYwZHmPBaMYFOYFdbAFVHWvys152C308hcFJ6xWWGmjvl +2eMiEl9P2nR2LWue368DCu+ak7j3gjAXaCOdP1a7Bfr+RW3X2SC5R4Xyp8iHlL5J +PHJD/WBkLrezwzQPdACw8m9EG7q9kUwlNpL32mROujS3ZkT6mQTzJieLiE3X04s0 +uIUqVkk5MhjcHFf7al0N5CzjtTcnXYJKN2Z9EDVskk4olAdGi46eSoZXbjUOP5gk +Ej6wVZAXAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEG +MB0GA1UdDgQWBBTqVk/sPIOhFIh4gbIrBSLAB0FbQjANBgkqhkiG9w0BAQUFAAOC +AQEAYp7mEzzhw6o5Hf5+T5kcI+t4BJyiIWy7vHlLs/G8dLYXO81aN/Mzg928eMTR +TxxYZL8dd9uwsJ50TVfX6L0R4Dyw6wikh3fHRrat9ufXi63j5K91Ysr7aXqnF38d +iAgHYkrwC3kuxHBb9C0KBz6h8Q45/KCyN7d37wWAq38yyhPDlaOvyoE6bdUuK5hT +m5EYA5JmPyrhQ1moDOyueWBAjxzMEMj+OAY1H90cLv6wszsqerxRrdTOHBdv7MjB +EIpvEEQkXUxVXAzFuuT6m2t91Lfnwfl/IvljHaVC7DlyyhRYHD6D4Rx+4QKp4tWL +vpw6LkI+gKNJ/YdMCsRZQzEEFA== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh @@ -2572,72 +1752,1161 @@ n3BukxowOR0w2y7jfLKRstE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKS NitjrFgBazMpUIaD8QFI -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUx -ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0 -b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQD -EytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBDKSBUYW51c2l0dmFueWtpYWRvMB4X -DTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJBgNVBAYTAkhVMREw -DwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9u -c2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMr -TmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzAN -BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNA -OoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3ZW3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC -2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63euyucYT2BDMIJTLrdKwW -RMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQwDgYDVR0P -AQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEW -ggJNRklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0 -YWxhbm9zIFN6b2xnYWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFz -b2sgYWxhcGphbiBrZXN6dWx0LiBBIGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBO -ZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1iaXp0b3NpdGFzYSB2ZWRpLiBB -IGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0ZWxlIGF6IGVs -b2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs -ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25s -YXBqYW4gYSBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kg -a2VyaGV0byBheiBlbGxlbm9yemVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4g -SU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5kIHRoZSB1c2Ugb2YgdGhpcyBjZXJ0 -aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQUyBhdmFpbGFibGUg -YXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwgYXQg -Y3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmY -ta3UzbM2xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2g -pO0u9f38vf5NNwgMvOOWgyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4 -Fp1hBWeAyNDYpQcCNJgEjTME1A== +MIICZzCCAdCgAwIBAgIBBDANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJVUzEY +MBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxDDAKBgNVBAsT +A1BLSTEcMBoGA1UEAxMTRG9EIENMQVNTIDMgUm9vdCBDQTAeFw0wMDA1MTkxMzEz +MDBaFw0yMDA1MTQxMzEzMDBaMGExCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMu +IEdvdmVybm1lbnQxDDAKBgNVBAsTA0RvRDEMMAoGA1UECxMDUEtJMRwwGgYDVQQD +ExNEb0QgQ0xBU1MgMyBSb290IENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB +gQC1MP5kvurMbe2BLPd/6Rm6DmlqKOGpqcuVWB/x5pppU+CIP5HFUbljl6jmIYwT +XjY8qFf6+HAsTGrLvzCnTBbkMlz4ErBR+BZXjS+0TfouqJToKmHUVw1Hzm4sL36Y +Z8wACKu2lhY1woWR5VugCsdmUmLzYXWVF668KlYppeArUwIDAQABoy8wLTAdBgNV +HQ4EFgQUbJyl8FyPbUGNxBc7kFfCD6PNbf4wDAYDVR0TBAUwAwEB/zANBgkqhkiG +9w0BAQUFAAOBgQCvcUT5lyPMaGmMQwdBuoggsyIAQciYoFUczT9usZNcrfoYmrsc +c2/9JEKPh59Rz76Gn+nXikhPCNlplKw/5g8tlw8ok3ZPYt//oM1h+KaGDDE0INx/ +L6j7Ob6V7jhZAmLB3mwVT+DfnbvkeXMk/WNklfdKqJkfSGWVx3u/eDLneg== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhV -MRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMe -TmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0 -dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFzcyBB -KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oXDTE5MDIxOTIzMTQ0 -N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhC -dWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQu -MRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBL -b3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSMD7tM9DceqQWC2ObhbHDqeLVu0ThEDaiD -zl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZz+qMkjvN9wfcZnSX9EUi -3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC/tmwqcm8 -WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LY -Oph7tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2Esi -NCubMvJIH5+hCoR64sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCC -ApswDgYDVR0PAQH/BAQDAgAGMBIGA1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4 -QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZRUxFTSEgRXplbiB0 -YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRhdGFz -aSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu -IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtm -ZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMg -ZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVs -amFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJhc2EgbWVndGFsYWxoYXRv -IGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBzOi8vd3d3 -Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6 -ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1 -YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3Qg -dG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRs -b2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNAbmV0bG9jay5uZXQuMA0G -CSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5ayZrU3/b39/zcT0mwBQO -xmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjPytoUMaFP -0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQ -QeJBCWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxk -f1qbFFgBJ34TUMdrKuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK -8CtmdWOMovsEPoMOmzbwGOQmIMOM8CgHrTwXZoi1/baI +MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU +MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs +IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290 +MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux +FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h +bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v +dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt +H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9 +uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX +mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX +a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN +E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0 +WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD +VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0 +Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU +cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx +IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN +AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH +YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5 +6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC +Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX +c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a +mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDNjCCAp+gAwIBAgIQNhIilsXjOKUgodJfTNcJVDANBgkqhkiG9w0BAQUFADCB +zjELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ +Q2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UE +CxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhh +d3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNl +cnZlckB0aGF3dGUuY29tMB4XDTk2MDgwMTAwMDAwMFoXDTIxMDEwMTIzNTk1OVow +gc4xCzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcT +CUNhcGUgVG93bjEdMBsGA1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNV +BAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRo +YXd0ZSBQcmVtaXVtIFNlcnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1z +ZXJ2ZXJAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2 +aovXwlue2oFBYo847kkEVdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560 +ZXUCTe/LCaIhUdib0GfQug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j ++ao6hnO2RlNYyIkFvYMRuHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/ +BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBlkKyID1bZ5jA01CbH0FDxkt5r1DmI +CSLGpmODA/eZd9iy5Ri4XWPz1HP7bJyZePFLeH0ZJMMrAoT4vCLZiiLXoPxx7JGH +IPG47LHlVYCsPVLIOQ7C8MAFT9aCdYy9X9LcdpoFEsmvcsPcJX6kTY4XpeCHf+Ga +WuFg3GQjPEIuTQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICXDCCAcWgAwIBAgIQCgEBAQAAAnwAAAALAAAAAjANBgkqhkiG9w0BAQUFADA6 +MRkwFwYDVQQKExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJp +dHkgMTAyNCBWMzAeFw0wMTAyMjIyMTAxNDlaFw0yNjAyMjIyMDAxNDlaMDoxGTAX +BgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAbBgNVBAsTFFJTQSBTZWN1cml0eSAx +MDI0IFYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDV3f5mCc8kPD6ugU5O +isRpgFtZO9+5TUzKtS3DJy08rwBCbbwoppbPf9dYrIMKo1W1exeQFYRMiu4mmdxY +78c4pqqv0I5CyGLXq6yp+0p9v+r+Ek3d/yYtbzZUaMjShFbuklNhCbM/OZuoyZu9 +zp9+1BlqFikYvtc6adwlWzMaUQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4G +A1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBTEwBykB5T9zU0B1FTapQxf3q4FWjAd +BgNVHQ4EFgQUxMAcpAeU/c1NAdRU2qUMX96uBVowDQYJKoZIhvcNAQEFBQADgYEA +Py1q4yZDlX2Jl2X7deRyHUZXxGFraZ8SmyzVWujAovBDleMf6XbN3Ou8k6BlCsdN +T1+nr6JGFLkM88y9am63nd4lQtBU/55oc2PcJOsiv6hy8l4A4Q1OOkNumU4/iXgD +mMrzVcydro7BqkWY+o8aoI2II/EVQQ2lRj6RP4vr93E= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTEL +MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNV +BAsTG1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1 +c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcNMDYwMzIyMTU1NDI4WhcNMjUxMjMx +MjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIg +R21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYwJAYD +VQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSR +JJZ4Hgmgm5qVSkr1YnwCqMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3T +fCZdzHd55yx4Oagmcw6iXSVphU9VDprvxrlE4Vc93x9UIuVvZaozhDrzznq+VZeu +jRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtwag+1m7Z3W0hZneTvWq3z +wZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9OgdwZu5GQ +fezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYD +VR0jBBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAO +BgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0G +CSqGSIb3DQEBBQUAA4IBAQAo0uCG1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X1 +7caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/CyvwbZ71q+s2IhtNerNXxTPqYn +8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3ghUJGooWMNjs +ydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT +ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/ +2TYcuiUaUj0a7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIH/zCCB2igAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARQxCzAJBgNVBAYTAkVT +MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE +ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE +ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEvMC0GA1UECxMm +SVBTIENBIENMQVNFQTMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLzAtBgNVBAMT +JklQUyBDQSBDTEFTRUEzIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZI +hvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMwHhcNMDExMjMxMTEyMzU5WhcNMjUxMjI5 +MTEyMzU5WjCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ +BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hp +bmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5G +LiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTMgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUEzIENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMw +gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMFh+lWUEmnBK5F6da6IALvvPO6f +MWYw9LFAmwJsjcdKTVElPugUKLwgPLHxjO19kdmXIqPVzGOxq9krIwvdppffBYRU +Fro6y8xja40gpdaeBXFGdVj19mR7C2adPoeVPTy1OTdSVLsWF8W/rdiLMy/p+PrV +gTP/t56Fpu9MOeDjAgMBAAGjggRbMIIEVzAdBgNVHQ4EFgQU/J6FGtwGJXEh8C+L +ElXQxYDuBq4wggFGBgNVHSMEggE9MIIBOYAU/J6FGtwGJXEh8C+LElXQxYDuBq6h +ggEcpIIBGDCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ +BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hp +bmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5G +LiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTMgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUEzIENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOC +AQAwDAYDVR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUF +BwMBBggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYB +BAGCNwIBFQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglg +hkgBhvhCAQEEBAMCAAcwGgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1Ud +EgQTMBGBD2lwc0BtYWlsLmlwcy5lczBDBglghkgBhvhCAQ0ENhY0Q0xBU0VBMyBD +QSBDZXJ0aWZpY2F0ZSBpc3N1ZWQgYnkgaHR0cHM6Ly93d3cuaXBzLmVzLzAqBglg +hkgBhvhCAQIEHRYbaHR0cHM6Ly93d3cuaXBzLmVzL2lwczIwMDIvMDwGCWCGSAGG ++EIBBAQvFi1odHRwczovL3d3dy5pcHMuZXMvaXBzMjAwMi9pcHMyMDAyQ0xBU0VB +My5jcmwwQQYJYIZIAYb4QgEDBDQWMmh0dHBzOi8vd3d3Lmlwcy5lcy9pcHMyMDAy +L3Jldm9jYXRpb25DTEFTRUEzLmh0bWw/MD4GCWCGSAGG+EIBBwQxFi9odHRwczov +L3d3dy5pcHMuZXMvaXBzMjAwMi9yZW5ld2FsQ0xBU0VBMy5odG1sPzA8BglghkgB +hvhCAQgELxYtaHR0cHM6Ly93d3cuaXBzLmVzL2lwczIwMDIvcG9saWN5Q0xBU0VB +My5odG1sMHcGA1UdHwRwMG4wM6AxoC+GLWh0dHBzOi8vd3d3Lmlwcy5lcy9pcHMy +MDAyL2lwczIwMDJDTEFTRUEzLmNybDA3oDWgM4YxaHR0cHM6Ly93d3diYWNrLmlw +cy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRUEzLmNybDAvBggrBgEFBQcBAQQjMCEw +HwYIKwYBBQUHMAGGE2h0dHA6Ly9vY3NwLmlwcy5lcy8wDQYJKoZIhvcNAQEFBQAD +gYEAGG8JN0Ca0pQR0X/Lg33qtKfi2JPe2iRqdRswDoL3CTn+bRN20V/wbKDAwyxc +7eJOroysytPkEF4wZhipaKCjaWJROZGCeU1jM7mZe9pQPzeofT//VLi8zKaUA4lZ +BvYI44gntZQoaFxJna5NHHde+mbbPYlHb8c6g0mf9S3tODs= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDXTCCAkWgAwIBAgIDAOJCMA0GCSqGSIb3DQEBBQUAMFUxCzAJBgNVBAYTAkFU +MRAwDgYDVQQKEwdBLVRydXN0MRkwFwYDVQQLExBBLVRydXN0LW5RdWFsLTAxMRkw +FwYDVQQDExBBLVRydXN0LW5RdWFsLTAxMB4XDTA0MTEzMDIzMDAwMFoXDTE0MTEz +MDIzMDAwMFowVTELMAkGA1UEBhMCQVQxEDAOBgNVBAoTB0EtVHJ1c3QxGTAXBgNV +BAsTEEEtVHJ1c3QtblF1YWwtMDExGTAXBgNVBAMTEEEtVHJ1c3QtblF1YWwtMDEw +ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD/9RyAEZ6eHmhYzNJ328f0 +jmdSUFi6EqRqOxb3jHNPTIpK82CR6z5lmSnZQNUuCPD+htbNZffd2DKVB06NOyZ1 +2zcOMCgj4GtkZoqE0zPpPT3bpoE55nkZZe/qWEX/64wz/L/4EdkvKDSKG/UsP75M +tmCVY5m2Eg73RVFRz4ccBIMpHel4lzEqSkdDtZOY5fnkrE333hx67nxq21vY8Eyf +8O4fPQ5RtN8eohQCcPQ1z6ypU1R7N9jPRpnI+yzMOiwd3+QcKhHi1miCzo0pkOaB +1CwmfsTyNl8qU0NJUL9Ta6cea7WThwTiWol2yD88cd2cy388xpbNkfrCPmZNGLoV +AgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0OBAoECE5ZzscCMocwMA4G +A1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEA69I9R1hU9Gbl9vV7W7AH +QpUJAlFAvv2It/eY8p2ouQUPVaSZikaKtAYrCD/arzfXB43Qet+dM6CpHsn8ikYR +vQKePjXv3Evf+C1bxwJAimcnZV6W+bNOTpdo8lXljxkmfN+Z5S+XzvK2ttUtP4Et +YOVaxHw2mPMNbvDeY+foJkiBn3KYjGabMaR8moZqof5ofj4iS/WyamTZti6v/fKx +n1vII+/uWkcxV5DT5+r9HLon0NYF0Vg317Wh+gWDV59VZo+dcwJDb+keYqMFYoqp +77SGkZGu41S8NGYkQY3X9rNHRkDbLfpKYDmy6NanpOE1EHW1/sNSFAs43qZZKJEQ +xg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDMDCCApmgAwIBAgIQDY4VEuGsu3eNOOMk34ww8jANBgkqhkiG9w0BAQUFADCB +yzELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ +Q2FwZSBUb3duMRowGAYDVQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYGA1UECxMf +Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3Rl +IFBlcnNvbmFsIEJhc2ljIENBMSgwJgYJKoZIhvcNAQkBFhlwZXJzb25hbC1iYXNp +Y0B0aGF3dGUuY29tMB4XDTk2MDEwMTAwMDAwMFoXDTIxMDEwMTIzNTk1OVowgcsx +CzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNh +cGUgVG93bjEaMBgGA1UEChMRVGhhd3RlIENvbnN1bHRpbmcxKDAmBgNVBAsTH0Nl +cnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQ +ZXJzb25hbCBCYXNpYyBDQTEoMCYGCSqGSIb3DQEJARYZcGVyc29uYWwtYmFzaWNA +dGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvLyTU23AUE+C +FeZIlDWmWr5vQvoPR+53dXLdjUmbllegeNTKP1GzaQuRdhciB5dqxFGTS+CN7zeV +oQxN2jSQHReJl+A1OFdKwPQIcOk8RHtQfmGakOMj04gRRif1CwcOu93RfyAKiLlW +Cy4cgNrx454p7xS9CkT7G1sY0b8jkyECAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB +/zANBgkqhkiG9w0BAQUFAAOBgQCIO/64+XpCRhGgpKJkhc1IHJzVilHNL8F9sQfP +1wHeMj+W5IT+0V6tDH4OY0lqDhDkl9A/xacp2aZTHkseP1T6wIQ1c+qRqdxdk1cF +BgwHua8LRDmIIaDugnOpRi9pbCV0qc3fp9f9hTAElDVKpxszJCxEFu0KxN+AqmUa +v3Em8A== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD +QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j +b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB +CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97 +nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt +43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P +T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4 +gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO +BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR +TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw +DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr +hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg +06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF +PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls +YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk +CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMx +EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT +HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVs +ZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAw +MFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6 +b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVj +aG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZp +Y2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAL3twQP89o/8ArFvW59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMg +nLRJdzIpVv257IzdIvpy3Cdhl+72WoTsbhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1 +HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNkN3mSwOxGXn/hbVNMYq/N +Hwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7NfZTD4p7dN +dloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0 +HZbUJtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO +BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0G +CSqGSIb3DQEBCwUAA4IBAQARWfolTwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjU +sHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx4mcujJUDJi5DnUox9g61DLu3 +4jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUwF5okxBDgBPfg +8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K +pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1 +mMpYjn0q7pBZc2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEgzCCA+ygAwIBAgIEOJ725DANBgkqhkiG9w0BAQQFADCBtDEUMBIGA1UEChML +RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9HQ0NBX0NQUyBp +bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAyMDAw +IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENsaWVu +dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMDAyMDcxNjE2NDBaFw0yMDAy +MDcxNjQ2NDBaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3 +LmVudHJ1c3QubmV0L0dDQ0FfQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp +YWIuKTElMCMGA1UECxMcKGMpIDIwMDAgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG +A1UEAxMqRW50cnVzdC5uZXQgQ2xpZW50IENlcnRpZmljYXRpb24gQXV0aG9yaXR5 +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCTdLS25MVL1qFof2LV7PdRV7Ny +Spj10InJrWPNTTVRaoTUrcloeW+46xHbh65cJFET8VQlhK8pK5/jgOLZy93GRUk0 +iJBeAZfv6lOm3fzB3ksqJeTpNfpVBQbliXrqpBFXO/x8PTbNZzVtpKklWb1m9fkn +5JVn1j+SgF7yNH0rhQIDAQABo4IBnjCCAZowEQYJYIZIAYb4QgEBBAQDAgAHMIHd +BgNVHR8EgdUwgdIwgc+ggcyggcmkgcYwgcMxFDASBgNVBAoTC0VudHJ1c3QubmV0 +MUAwPgYDVQQLFDd3d3cuZW50cnVzdC5uZXQvR0NDQV9DUFMgaW5jb3JwLiBieSBy +ZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMjAwMCBFbnRydXN0Lm5l +dCBMaW1pdGVkMTMwMQYDVQQDEypFbnRydXN0Lm5ldCBDbGllbnQgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkxDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMjAwMDAy +MDcxNjE2NDBagQ8yMDIwMDIwNzE2NDY0MFowCwYDVR0PBAQDAgEGMB8GA1UdIwQY +MBaAFISLdP3FjcD/J20gN0V8/i3OutN9MB0GA1UdDgQWBBSEi3T9xY3A/ydtIDdF +fP4tzrrTfTAMBgNVHRMEBTADAQH/MB0GCSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4w +AwIEkDANBgkqhkiG9w0BAQQFAAOBgQBObzWAO9GK9Q6nIMstZVXQkvTnhLUGJoMS +hAusO7JE7r3PQNsgDrpuFOow4DtifH+La3xKp9U1PL6oXOpLu5OOgGarDyn9TS2/ +GpsKkMWr2tGzhtQvJFJcem3G8v7lTRowjJDyutdKPkN+1MhQGof4T4HHdguEOnKd +zmVml64mXg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDKTCCApKgAwIBAgIENnAVljANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJV +UzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQL +EwhEU1RDQSBFMTAeFw05ODEyMTAxODEwMjNaFw0xODEyMTAxODQwMjNaMEYxCzAJ +BgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4x +ETAPBgNVBAsTCERTVENBIEUxMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQCg +bIGpzzQeJN3+hijM3oMv+V7UQtLodGBmE5gGHKlREmlvMVW5SXIACH7TpWJENySZ +j9mDSI+ZbZUTu0M7LklOiDfBu1h//uG9+LthzfNHwJmm8fOR6Hh8AMthyUQncWlV +Sn5JTe2io74CTADKAqjuAQIxZA9SLRN0dja1erQtcQIBA6OCASQwggEgMBEGCWCG +SAGG+EIBAQQEAwIABzBoBgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMx +JDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UECxMI +RFNUQ0EgRTExDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMTk5ODEyMTAxODEw +MjNagQ8yMDE4MTIxMDE4MTAyM1owCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaAFGp5 +fpFpRhgTCgJ3pVlbYJglDqL4MB0GA1UdDgQWBBRqeX6RaUYYEwoCd6VZW2CYJQ6i ++DAMBgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqG +SIb3DQEBBQUAA4GBACIS2Hod3IEGtgllsofIH160L+nEHvI8wbsEkBFKg05+k7lN +QseSJqBcNJo4cvj9axY+IO6CizEqkzaFI4iKPANo08kJD038bKTaKHKTDomAsH3+ +gG9lbRgzl4vCa4nuYD3Im+9/KzJic5PLPON74nZ4RbyhkwS7hp86W0N6w4pl +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB +yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL +ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp +U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW +ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0 +aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL +MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW +ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln +biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp +U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y +aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1 +nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex +t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz +SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG +BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+ +rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/ +NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E +BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH +BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy +aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv +MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE +p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y +5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK +WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ +4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N +hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIESzCCAzOgAwIBAgIJAJigUTEEXRQpMA0GCSqGSIb3DQEBBQUAMHYxCzAJBgNV +BAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xDjAMBgNVBAcTBUZ1bGRhMRAwDgYDVQQK +EwdEZWJjb25mMRMwEQYDVQQDEwpEZWJjb25mIENBMR8wHQYJKoZIhvcNAQkBFhBq +b2VyZ0BkZWJpYW4ub3JnMB4XDTA1MTEwNTE3NTUxNFoXDTE1MTEwMzE3NTUxNFow +djELMAkGA1UEBhMCREUxDzANBgNVBAgTBkhlc3NlbjEOMAwGA1UEBxMFRnVsZGEx +EDAOBgNVBAoTB0RlYmNvbmYxEzARBgNVBAMTCkRlYmNvbmYgQ0ExHzAdBgkqhkiG +9w0BCQEWEGpvZXJnQGRlYmlhbi5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw +ggEKAoIBAQCvbOo0SrIwI5IMlsshH8WF3dHB9r9JlSKhMPaybawa1EyvZspMQ3wa +F5qxNf3Sj+NElEmjseEqvCZiIIzqwerHu0Qw62cDYCdCd2+Wb5m0bPYB5CGHiyU1 +eNP0je42O0YeXG2BvUujN8AviocVo39X2YwNQ0ryy4OaqYgm2pRlbtT2ESbF+SfV +Y2iqQj/f8ymF+lHo/pz8tbAqxWcqaSiHFAVQJrdqtFhtoodoNiE3q76zJoUkZTXB +k60Yc3MJSnatZCpnsSBr/D7zpntl0THrUjjtdRWCjQVhqfhM1yZJV+ApbLdheFh0 +ZWlSxdnp25p0q0XYw/7G92ELyFDfBUUNAgMBAAGjgdswgdgwHQYDVR0OBBYEFMuV +dFNb4mCWUFbcP5LOtxFLrEVTMIGoBgNVHSMEgaAwgZ2AFMuVdFNb4mCWUFbcP5LO +txFLrEVToXqkeDB2MQswCQYDVQQGEwJERTEPMA0GA1UECBMGSGVzc2VuMQ4wDAYD +VQQHEwVGdWxkYTEQMA4GA1UEChMHRGViY29uZjETMBEGA1UEAxMKRGViY29uZiBD +QTEfMB0GCSqGSIb3DQEJARYQam9lcmdAZGViaWFuLm9yZ4IJAJigUTEEXRQpMAwG +A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGZXxHg4mnkvilRIM1EQfGdY +S5b/WcyF2MYSTeTvK4aIB6VHwpZoZCnDGj2m2D3CkHT0upAD9o0zM1tdsfncLzV+ +mDT/jNmBtYo4QXx5vEPwvEIcgrWjwk7SyaEUhZjtolTkHB7ACl0oD0r71St4iEPR +qTUCEXk2E47bg1Fz58wNt/yo2+4iqiRjg1XCH4evkQuhpW+dTZnDyFNqwSYZapOE +TBA+9zBb6xD1KM2DdY7r4GiyYItN0BKLfuWbh9LXGbl1C+f4P11g+m2MPiavIeCe +1iazG5pcS3KoTLACsYlEX24TINtg4kcuS81XdllcnsV3Kdts0nIqPj6uhTTZD0k= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICPTCCAaYCEQDNun9W8N/kvFT+IqyzcqpVMA0GCSqGSIb3DQEBAgUAMF8xCzAJ +BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xh +c3MgMSBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05 +NjAxMjkwMDAwMDBaFw0yODA4MDEyMzU5NTlaMF8xCzAJBgNVBAYTAlVTMRcwFQYD +VQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgMSBQdWJsaWMgUHJp +bWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOB +jQAwgYkCgYEA5Rm/baNWYS2ZSHH2Z965jeu3noaACpEO+jglr0aIguVzqKCbJF0N +H8xlbgyw0FaEGIeaBpsQoXPftFg5a27B9hXVqKg/qhIGjTGsf7A01480Z4gJzRQR +4k5FVmkfeAKA2txHkSm7NsljXMXg1y2He6G3MrB7MLoqLzGq7qNn2tsCAwEAATAN +BgkqhkiG9w0BAQIFAAOBgQBMP7iLxmjf7kMzDl3ppssHhE16M/+SG/Q2rdiVIjZo +EWx8QszznC7EBz8UsA9P/5CSdvnivErpj82ggAr3xSnxgiJduLHdgSOjeyUVRjB5 +FvjqBUuUfx3CHMjjt/QQQDwTw18fU+hI5Ia0e6E1sHslurjTjqs/OJ0ANACY89Fx +lA== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYD +VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv +bHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJv +b3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEzMjM1OTAwWjB1MQswCQYDVQQGEwJV +UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU +cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds +b2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrH +iM3dFw4usJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTS +r41tiGeA5u2ylc9yMcqlHHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X4 +04Wqk2kmhXBIgD8SFcd5tB8FLztimQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAG3r +GwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMWM4ETCJ57NE7fQMh017l9 +3PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OFNMQkpw0P +lZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/ +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY +MBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21t +dW5pY2F0aW9uIFJvb3RDQTEwHhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5 +WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYD +VQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEwggEiMA0GCSqGSIb3 +DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw8yl8 +9f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJ +DKaVv0uMDPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9 +Ms+k2Y7CI9eNqPPYJayX5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/N +QV3Is00qVUarH9oe4kA92819uZKAnDfdDJZkndwi92SL32HeFZRSFaB9UslLqCHJ +xrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2JChzAgMBAAGjPzA9MB0G +A1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYwDwYDVR0T +AQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vG +kl3g0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfr +Uj94nK9NrvjVT8+amCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5 +Bw+SUEmK3TGXX8npN6o7WWWXlDLJs58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJU +JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot +RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID2TCCAsGgAwIBAgIDAjbQMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT +MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i +YWwgQ0EwHhcNMTAwMjE5MjIzOTI2WhcNMjAwMjE4MjIzOTI2WjBAMQswCQYDVQQG +EwJVUzEXMBUGA1UEChMOR2VvVHJ1c3QsIEluYy4xGDAWBgNVBAMTD0dlb1RydXN0 +IFNTTCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJCzgMHk5Uat +cGA9uuUU3Z6KXot1WubKbUGlI+g5hSZ6p1V3mkihkn46HhrxJ6ujTDnMyz1Hr4Gu +FmpcN+9FQf37mpc8oEOdxt8XIdGKolbCA0mEEoE+yQpUYGa5jFTk+eb5lPHgX3UR +8im55IaisYmtph6DKWOy8FQchQt65+EuDa+kvc3nsVrXjAVaDktzKIt1XTTYdwvh +dGLicTBi2LyKBeUxY0pUiWozeKdOVSQdl+8a5BLGDzAYtDRN4dgjOyFbLTAZJQ50 +96QhS6CkIMlszZhWwPKoXz4mdaAN+DaIiixafWcwqQ/RmXAueOFRJq9VeiS+jDkN +d53eAsMMvR8CAwEAAaOB2TCB1jAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFEJ5 +VBthzVUrPmPVPEhX9Z/7Rc5KMB8GA1UdIwQYMBaAFMB6mGiNifurBWQMEX2qfWW4 +ysxOMBIGA1UdEwEB/wQIMAYBAf8CAQAwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDov +L2NybC5nZW90cnVzdC5jb20vY3Jscy9ndGdsb2JhbC5jcmwwNAYIKwYBBQUHAQEE +KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5nZW90cnVzdC5jb20wDQYJKoZI +hvcNAQEFBQADggEBANTvU4ToGr2hiwTAqfVfoRB4RV2yV2pOJMtlTjGXkZrUJPji +J2ZwMZzBYlQG55cdOprApClICq8kx6jEmlTBfEx4TCtoLF0XplR4TEbigMMfOHES +0tdT41SFULgCy+5jOvhWiU1Vuy7AyBh3hjELC3DwfjWDpCoTZFZnNF0WX3OsewYk +2k9QbSqr0E1TQcKOu3EDSSmGGM8hQkx0YlEVxW+o78Qn5Rsz3VqI138S0adhJR/V +4NwdzxoQ2KDLX4z6DOW/cf/lXUQdpj6HR/oaToODEj+IZpWYeZqF6wJHzSXj8gYE +TpnKXKBuervdo5AaRTPvvz7SBMS24CqFZUE+ENQ= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDdjCCAl6gAwIBAgIEOhsEBTANBgkqhkiG9w0BAQUFADBRMQswCQYDVQQGEwJE +SzEMMAoGA1UEChMDS01EMQ8wDQYDVQQLEwZLTUQtQ0ExIzAhBgNVBAMTGktNRC1D +QSBLdmFsaWZpY2VyZXQgUGVyc29uMB4XDTAwMTEyMTIzMjQ1OVoXDTE1MTEyMjIz +MjQ1OVowUTELMAkGA1UEBhMCREsxDDAKBgNVBAoTA0tNRDEPMA0GA1UECxMGS01E +LUNBMSMwIQYDVQQDExpLTUQtQ0EgS3ZhbGlmaWNlcmV0IFBlcnNvbjCCASIwDQYJ +KoZIhvcNAQEBBQADggEPADCCAQoCggEBANriF4Xd6yD7ZlBE317UBDObn+vRMVc6 +p3wNQODdEDJe2z1ncCz9NJvhoLGdOJhyg7VVPh0P2c+KZ9WI9mWOKZI2bp2WkLju +jCcxbhTrurY3Wfc6gwLBqqFV8wWgaZKmvVWizjw9Kyi25f3yX4fOho6Qq2lvVbub +tvVFXAd51GJ+/2Yed+a4Or2bz2RcqHS81B3pywsD4mgJR5xREv5jqPfwNP+V7bkc +X+pfO4kVhZ/V+8MSPdQHgcV/iB3wP2mwgWyIBNc1reBidGTiz8unnWu55hcNfsvt +LJbTs9OHhsR7naRuy+S402nDnD5vnONOFEsiHn46w+T0rtu7h6j4OvkCAwEAAaNW +MFQwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUeWLqmhI42Jxj7DifDsW+ +DlQhKD0wHwYDVR0jBBgwFoAUeWLqmhI42Jxj7DifDsW+DlQhKD0wDQYJKoZIhvcN +AQEFBQADggEBANML/P42OuJ9aUV/0fItuIyc1JhqWvSqn5bXj+9eyEegcp8bHLHY +42D1O+z0lNipdjYPSdMJ0wZOEUhr+150SdDQ1P/zQL8AUaLEBkRt7ZdzXPVH3PER +qnf9IrpYBknZKfCAoVchA6Rr9WU3Sd8bMoRfMLKg8c0M8G6EPwCTcOFriSkbtvNG +zd8r8I+WfUYIN/p8DI9JT9qfjVODnYPRMUm6KPvq27TsrGruKrqyaV94kWc8co8A +v3zFLeCtghvUiRBdx+8Q7m5t4CkuSr0WINrqjIPFW2QrM1r82y09Fd16RkqL4LOg +Lh6vB5KnTApv62rWdw7zWwYnjY6/vXYY1Aw= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIGCDCCA/CgAwIBAgIBATANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290 +IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB +IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA +Y2FjZXJ0Lm9yZzAeFw0wNTEwMTQwNzM2NTVaFw0zMzAzMjgwNzM2NTVaMFQxFDAS +BgNVBAoTC0NBY2VydCBJbmMuMR4wHAYDVQQLExVodHRwOi8vd3d3LkNBY2VydC5v +cmcxHDAaBgNVBAMTE0NBY2VydCBDbGFzcyAzIFJvb3QwggIiMA0GCSqGSIb3DQEB +AQUAA4ICDwAwggIKAoICAQCrSTURSHzSJn5TlM9Dqd0o10Iqi/OHeBlYfA+e2ol9 +4fvrcpANdKGWZKufoCSZc9riVXbHF3v1BKxGuMO+f2SNEGwk82GcwPKQ+lHm9WkB +Y8MPVuJKQs/iRIwlKKjFeQl9RrmK8+nzNCkIReQcn8uUBByBqBSzmGXEQ+xOgo0J +0b2qW42S0OzekMV/CsLj6+YxWl50PpczWejDAz1gM7/30W9HxM3uYoNSbi4ImqTZ +FRiRpoWSR7CuSOtttyHshRpocjWr//AQXcD0lKdq1TuSfkyQBX6TwSyLpI5idBVx +bgtxA+qvFTia1NIFcm+M+SvrWnIl+TlG43IbPgTDZCciECqKT1inA62+tC4T7V2q +SNfVfdQqe1z6RgRQ5MwOQluM7dvyz/yWk+DbETZUYjQ4jwxgmzuXVjit89Jbi6Bb +6k6WuHzX1aCGcEDTkSm3ojyt9Yy7zxqSiuQ0e8DYbF/pCsLDpyCaWt8sXVJcukfV +m+8kKHA4IC/VfynAskEDaJLM4JzMl0tF7zoQCqtwOpiVcK01seqFK6QcgCExqa5g +eoAmSAC4AcCTY1UikTxW56/bOiXzjzFU6iaLgVn5odFTEcV7nQP2dBHgbbEsPyyG +kZlxmqZ3izRg0RS0LKydr4wQ05/EavhvE/xzWfdmQnQeiuP43NJvmJzLR5iVQAX7 +6QIDAQABo4G/MIG8MA8GA1UdEwEB/wQFMAMBAf8wXQYIKwYBBQUHAQEEUTBPMCMG +CCsGAQUFBzABhhdodHRwOi8vb2NzcC5DQWNlcnQub3JnLzAoBggrBgEFBQcwAoYc +aHR0cDovL3d3dy5DQWNlcnQub3JnL2NhLmNydDBKBgNVHSAEQzBBMD8GCCsGAQQB +gZBKMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9yZy9pbmRleC5w +aHA/aWQ9MTAwDQYJKoZIhvcNAQEEBQADggIBAH8IiKHaGlBJ2on7oQhy84r3HsQ6 +tHlbIDCxRd7CXdNlafHCXVRUPIVfuXtCkcKZ/RtRm6tGpaEQU55tiKxzbiwzpvD0 +nuB1wT6IRanhZkP+VlrRekF490DaSjrxC1uluxYG5sLnk7mFTZdPsR44Q4Dvmw2M +77inYACHV30eRBzLI++bPJmdr7UpHEV5FpZNJ23xHGzDwlVks7wU4vOkHx4y/CcV +Bc/dLq4+gmF78CEQGPZE6lM5+dzQmiDgxrvgu1pPxJnIB721vaLbLmINQjRBvP+L +ivVRIqqIMADisNS8vmW61QNXeZvo3MhN+FDtkaVSKKKs+zZYPumUK5FQhxvWXtaM +zPcPEAxSTtAWYeXlCmy/F8dyRlecmPVsYGN6b165Ti/Iubm7aoW8mA3t+T6XhDSU +rgCvoeXnkm5OvfPi2RSLXNLrAWygF6UtEOucekq9ve7O/e0iQKtwOIj1CodqwqsF +YMlIBdpTwd5Ed2qz8zw87YC8pjhKKSRf/lk7myV6VmMAZLldpGJ9VzZPrYPvH5JT +oI53V93lYRE9IwCQTDz6o2CTBKOvNfYOao9PSmCnhQVsRqGP9Md246FZV/dxssRu +FFxtbUFm3xuTsdQAw+7Lzzw9IYCpX2Nl/N3gX6T0K/CFcUHUZyX7GrGXrtaZghNB +0m6lG5kngOcLqagA +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIF8DCCA9igAwIBAgIPBuhGJy8fCo/RhFzjafbVMA0GCSqGSIb3DQEBBQUAMDgx +CzAJBgNVBAYTAkVTMRQwEgYDVQQKDAtJWkVOUEUgUy5BLjETMBEGA1UEAwwKSXpl +bnBlLmNvbTAeFw0wNzEyMTMxMzA4MjdaFw0zNzEyMTMwODI3MjVaMDgxCzAJBgNV +BAYTAkVTMRQwEgYDVQQKDAtJWkVOUEUgUy5BLjETMBEGA1UEAwwKSXplbnBlLmNv +bTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMnTesoPHqynhugWZWqx +whtFMnGV2f4QW8yv56V5AY+Jw8ryVXH3d753lPNypCxE2J6SmxQ6oeckkAoKVo7F +2CaU4dlI4S0+2gpy3aOZFdqBoof0e24md4lYrdbrDLJBenNubdt6eEHpCIgSfocu +ZhFjbFT7PJ1ywLwu/8K33Q124zrX97RovqL144FuwUZvXY3gTcZUVYkaMzEKsVe5 +o4qYw+w7NMWVQWl+dcI8IMVhulFHoCCQk6GQS/NOfIVFVJrRBSZBsLVNHTO+xAPI +JXzBcNs79AktVCdIrC/hxKw+yMuSTFM5NyPs0wH54AlETU1kwOENWocivK0bo/4m +tRXzp/yEGensoYi0RGmEg/OJ0XQGqcwL1sLeJ4VQJsoXuMl6h1YsGgEebL4TrRCs +tST1OJGh1kva8bvS3ke18byB9llrzxlT6Y0Vy0rLqW9E5RtBz+GGp8rQap+8TI0G +M1qiheWQNaBiXBZO8OOi+gMatCxxs1gs3nsL2xoP694hHwZ3BgOwye+Z/MC5TwuG +KP7Suerj2qXDR2kS4Nvw9hmL7Xtw1wLW7YcYKCwEJEx35EiKGsY7mtQPyvp10gFA +Wo15v4vPS8+qFsGV5K1Mij4XkdSxYuWC5YAEpAN+jb/af6IPl08M0w3719Hlcn4c +yHf/W5oPt64FRuXxqBbsR6QXAgMBAAGjgfYwgfMwgbAGA1UdEQSBqDCBpYEPaW5m +b0BpemVucGUuY29tpIGRMIGOMUcwRQYDVQQKDD5JWkVOUEUgUy5BLiAtIENJRiBB +MDEzMzcyNjAtUk1lcmMuVml0b3JpYS1HYXN0ZWl6IFQxMDU1IEY2MiBTODFDMEEG +A1UECQw6QXZkYSBkZWwgTWVkaXRlcnJhbmVvIEV0b3JiaWRlYSAxNCAtIDAxMDEw +IFZpdG9yaWEtR2FzdGVpejAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB +BjAdBgNVHQ4EFgQUHRxlDqjyJXu0kc/ksbHmvVV0bAUwDQYJKoZIhvcNAQEFBQAD +ggIBAMeBRm8hGE+gBe/n1bqXUKJg7aWSFBpSm/nxiEqg3Hh10dUflU7F57dp5iL0 ++CmoKom+z892j+Mxc50m0xwbRxYpB2iEitL7sRskPtKYGCwkjq/2e+pEFhsqxPqg +l+nqbFik73WrAGLRne0TNtsiC7bw0fRue0aHwp28vb5CO7dz0JoqPLRbEhYArxk5 +ja2DUBzIgU+9Ag89njWW7u/kwgN8KRwCfr00J16vU9adF79XbOnQgxCvv11N75B7 +XSus7Op9ACYXzAJcY9cZGKfsK8eKPlgOiofmg59OsjQerFQJTx0CCzl+gQgVuaBp +E8gyK+OtbBPWg50jLbJtooiGfqgNASYJQNntKE6MkyQP2/EeTXp6WuKlWPHcj1+Z +ggwuz7LdmMySlD/5CbOlliVbN/UShUHiGUzGigjB3Bh6Dx4/glmimj4/+eAJn/3B +kUtdyXvWton83x18hqrNA/ILUpLxYm9/h+qrdslsUMIZgq+qHfUgKGgu1fxkN0/P +pUTEvnK0jHS0bKf68r10OEMr3q/53NjgnZ/cPcqlY0S/kqJPTIAcuxrDmkoEVU3K +7iYLHL8CxWTTnn7S05EcS6L1HOUXHA0MUqORH5zwIe0ClG+poEnK6EOMxPQ02nwi +o8ZmPrgbBYhdurz3vOXcFD2nhqi2WVIhA16L4wTtSyoeo09Q +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICsDCCAhmgAwIBAgIQZ8jh6OO+HL38kTuOpiOHSTANBgkqhkiG9w0BAQUFADCB +izELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTEUMBIGA1UEBxML +RHVyYmFudmlsbGUxDzANBgNVBAoTBlRoYXd0ZTEdMBsGA1UECxMUVGhhd3RlIENl +cnRpZmljYXRpb24xHzAdBgNVBAMTFlRoYXd0ZSBUaW1lc3RhbXBpbmcgQ0EwHhcN +OTcwMTAxMDAwMDAwWhcNMjEwMTAxMjM1OTU5WjCBizELMAkGA1UEBhMCWkExFTAT +BgNVBAgTDFdlc3Rlcm4gQ2FwZTEUMBIGA1UEBxMLRHVyYmFudmlsbGUxDzANBgNV +BAoTBlRoYXd0ZTEdMBsGA1UECxMUVGhhd3RlIENlcnRpZmljYXRpb24xHzAdBgNV +BAMTFlRoYXd0ZSBUaW1lc3RhbXBpbmcgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0A +MIGJAoGBANYrWHhhRYZT6jR7UZztsOYuGA7+4F+oJ9O0yeB8WU4WDnNUYMF/9p8u +6TqFJBU820cEY8OexJQaWt9MevPZQx08EHp5JduQ/vBR5zDWQQD9nyjfeb6Uu522 +FOMjhdepQeBMpHmwKxqL8vg7ij5FrHGSALSQQZj7X+36ty6K+Ig3AgMBAAGjEzAR +MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAS+mqF4EF+3kKMZ/F +QfRWVKvpwuWXjhj+kckMPiZkyaFMJ2SnvQGTVXFuF0853BvcSTUQOSP/ypvIz2Y/ +3Ewa1IEGQlIf4SaxFhe65nByMUToTo1b5NP50OOPJWQx5yr4GIg2GlLFDUE1G2m3 +JvUXzMEZXkt8XOKDgJH6L/uatxY= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDtDCCApygAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJKUDEc +MBoGA1UEChMTSmFwYW5lc2UgR292ZXJubWVudDEOMAwGA1UECxMFTVBIUFQxJjAk +BgNVBAsTHU1QSFBUIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTAyMDMxNDA3 +NTAyNloXDTEyMDMxMzE0NTk1OVowYzELMAkGA1UEBhMCSlAxHDAaBgNVBAoTE0ph +cGFuZXNlIEdvdmVybm1lbnQxDjAMBgNVBAsTBU1QSFBUMSYwJAYDVQQLEx1NUEhQ +VCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBAI3GUWlK9G9FVm8DhpKu5t37oxZbj6lZcFvEZY07YrYojWO657ub +z56WE7q/PI/6Sm7i7qYE+Vp80r6thJvfmn7SS3BENrRqiapSenhooYD12jIe3iZQ +2SXqx7WgYwyBGdQwGaYTijzbRFpgc0K8o4a99fIoHhz9J8AKqXasddMCqfJRaH30 +YJ7HnOvRYGL6HBrGhJ7X4Rzijyk9a9+3VOBsYcnIlx9iODoiYhA6r0ojuIu8/JA1 +oTTZrS0MyU/SLdFdJze2O1wnqTULXQybzJz3ad6oC/F5a69c0m92akYd9nGBrPxj +EhucaQynC/QoCLs3aciLgioAnEJqy7i3EgUCAwEAAaNzMHEwHwYDVR0jBBgwFoAU +YML3pLoA0h93Yngl8Gb/UgAh73owHQYDVR0OBBYEFGDC96S6ANIfd2J4JfBm/1IA +Ie96MAwGA1UdEwQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQE +AwIABTANBgkqhkiG9w0BAQUFAAOCAQEANPR8DN66iWZBs/lSm1vOzhqRkXDLT6xL +LvJtjPLqmE469szGyFSKzsof6y+/8YgZlOoeX1inF4ox/SH1ATnwdIIsPbXuRLjt +axboXvBh5y2ffC3hmzJVvJ87tb6mVWQeL9VFUhNhAI0ib+9OIZVEYI/64MFkDk4e +iWG5ts6oqIJH1V7dVZg6pQ1Tc0Ckhn6N1m1hD30S0/zoPn/20Wq6OCF3he8VJrRG +dcW9BD/Bkesko1HKhMBDjHVrJ8cFwbnDSoo+Ki47eJWaz/cOzaSsaMVUsR5POava +/abhhgHn/eOJdXiVslyK0DYscjsdB3aBUfwZlomxYOzG6CgjQPhJdw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEejCCA2KgAwIBAgIEP4vk6TANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJQ +TDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2Vu +dHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MR8wHQYDVQQDExZDQyBTaWduZXQgLSBD +QSBLbGFzYSAyMB4XDTAzMTAxNDExNTgyMloXDTE3MDQxODEyNTMwN1owdzELMAkG +A1UEBhMCUEwxHzAdBgNVBAoTFlRQIEludGVybmV0IFNwLiB6IG8uby4xJDAiBgNV +BAsTG0NlbnRydW0gQ2VydHlmaWthY2ppIFNpZ25ldDEhMB8GA1UEAxMYQ0MgU2ln +bmV0IC0gT0NTUCBLbGFzYSAyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCo +VCsaBStblXQYVNthe3dvaCrfvKpPXngh4almm988iIlEv9CVTaAdCfaJNihvA+Vs +Qw8++ix1VqteMQE474/MV/YaXigP0Zr0QB+g+/7PWVlv+5U9Gzp9+Xx4DJay8AoI +iB7Iy5Qf9iZiHm5BiPRIuUXT4ZRbZRYPh0/76vgRsQIDAQABo4IBkjCCAY4wDgYD +VR0PAQH/BAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMJMEEGA1UdHwQ6MDgwNqA0 +oDKGMGh0dHA6Ly93d3cuc2lnbmV0LnBsL3JlcG96eXRvcml1bS9jcmwva2xhc2Ey +LmNybDCB2AYDVR0gBIHQMIHNMIHKBg4rBgEEAb4/AoFICgwBADCBtzBsBggrBgEF +BQcCAjBgGl5DZXJ0eWZpa2F0IHd5ZGFueSB6Z29kbmllIHogZG9rdW1lbnRlbSAi +UG9saXR5a2EgQ2VydHlmaWthY2ppIC0gQ2VydHlmaWthdHkgcmVzcG9uZGVyb3cg +T0NTUCIuMEcGCCsGAQUFBwIBFjtodHRwOi8vd3d3LnNpZ25ldC5wbC9yZXBvenl0 +b3JpdW0vZG9rdW1lbnR5L3BjX29jc3BfMV8wLnBkZjAfBgNVHSMEGDAWgBS7RQZS +C8uBzSlUs7x8QUzNBw6MJTAdBgNVHQ4EFgQUKEVrOY7cEHvsVgvoyZdytlbtgwEw +CQYDVR0TBAIwADANBgkqhkiG9w0BAQUFAAOCAQEAQrRg5MV6dxr0HU2IsLInxhvt +iUVmSFkIUsBCjzLoewOXA16d2oDyHhI/eE+VgAsp+2ANjZu4xRteHIHoYMsN218M +eD2MLRsYS0U9xxAFK9gDj/KscPbrrdoqLvtPSMhUb4adJS9HLhvUe6BicvBf3A71 +iCNe431axGNDWKnpuj2KUpj4CFHYsWCXky847YtTXDjri9NIwJJauazsrSjK+oXp +ngRS506mdQ7vWrtApkh8zhhWp7duCkjcCo1O8JxqYr2qEW1fXmgOISe010v2mmuv +hHxPyVwoAU4KkOw0nbXZn53yak0is5+XmAjh0wWue44AssHrjC9nUh3mkLt6eQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBI +MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x +FzAVBgNVBAMTDlNlY3VyZVRydXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIz +MTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENv +cnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQXOZEz +Zum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO +0gMdA+9tDWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIao +wW8xQmxSPmjL8xk037uHGFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj +7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b01k/unK8RCSc43Oz969XL0Imnal0ugBS +8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmHursCAwEAAaOBnTCBmjAT +BgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB +/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCeg +JYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGC +NxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt3 +6Z3q059c4EVlew3KW+JwULKUBRSuSceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/ +3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHfmbx8IVQr5Fiiu1cprp6poxkm +D5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZnMUFdAvnZyPS +CPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR +3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIIODCCB6GgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCAR4xCzAJBgNVBAYTAkVT +MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE +ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE +ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjE0MDIGA1UECxMr +SVBTIENBIFRpbWVzdGFtcGluZyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTE0MDIG +A1UEAxMrSVBTIENBIFRpbWVzdGFtcGluZyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0 +eTEeMBwGCSqGSIb3DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTAxMTIyOTAxMTAx +OFoXDTI1MTIyNzAxMTAxOFowggEeMQswCQYDVQQGEwJFUzESMBAGA1UECBMJQmFy +Y2Vsb25hMRIwEAYDVQQHEwlCYXJjZWxvbmExLjAsBgNVBAoTJUlQUyBJbnRlcm5l +dCBwdWJsaXNoaW5nIFNlcnZpY2VzIHMubC4xKzApBgNVBAoUImlwc0BtYWlsLmlw +cy5lcyBDLkkuRi4gIEItNjA5Mjk0NTIxNDAyBgNVBAsTK0lQUyBDQSBUaW1lc3Rh +bXBpbmcgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxNDAyBgNVBAMTK0lQUyBDQSBU +aW1lc3RhbXBpbmcgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxHjAcBgkqhkiG9w0B +CQEWD2lwc0BtYWlsLmlwcy5lczCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA +vLjuVqWajOY2ycJioGaBjRrVetJznw6EZLqVtJCneK/K/lRhW86yIFcBrkSSQxA4 +Efdo/BdApWgnMjvEp+ZCccWZ73b/K5Uk9UmSGGjKALWkWi9uy9YbLA1UZ2t6KaFY +q6JaANZbuxjC3/YeE1Z2m6Vo4pjOxgOKNNtMg0GmqaMCAwEAAaOCBIAwggR8MB0G +A1UdDgQWBBSL0BBQCYHynQnVDmB4AyKiP8jKZjCCAVAGA1UdIwSCAUcwggFDgBSL +0BBQCYHynQnVDmB4AyKiP8jKZqGCASakggEiMIIBHjELMAkGA1UEBhMCRVMxEjAQ +BgNVBAgTCUJhcmNlbG9uYTESMBAGA1UEBxMJQmFyY2Vsb25hMS4wLAYDVQQKEyVJ +UFMgSW50ZXJuZXQgcHVibGlzaGluZyBTZXJ2aWNlcyBzLmwuMSswKQYDVQQKFCJp +cHNAbWFpbC5pcHMuZXMgQy5JLkYuICBCLTYwOTI5NDUyMTQwMgYDVQQLEytJUFMg +Q0EgVGltZXN0YW1waW5nIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MTQwMgYDVQQD +EytJUFMgQ0EgVGltZXN0YW1waW5nIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4w +HAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOCAQAwDAYDVR0TBAUwAwEB/zAM +BgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYB +BQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIBFQYKKwYBBAGCNwIB +FgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhCAQEEBAMCAAcwGgYD +VR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGBD2lwc0BtYWlsLmlw +cy5lczBHBglghkgBhvhCAQ0EOhY4VGltZXN0YW1waW5nIENBIENlcnRpZmljYXRl +IGlzc3VlZCBieSBodHRwOi8vd3d3Lmlwcy5lcy8wKQYJYIZIAYb4QgECBBwWGmh0 +dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvMEAGCWCGSAGG+EIBBAQzFjFodHRwOi8v +d3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJUaW1lc3RhbXBpbmcuY3JsMEUGCWCG +SAGG+EIBAwQ4FjZodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL3Jldm9jYXRpb25U +aW1lc3RhbXBpbmcuaHRtbD8wQgYJYIZIAYb4QgEHBDUWM2h0dHA6Ly93d3cuaXBz +LmVzL2lwczIwMDIvcmVuZXdhbFRpbWVzdGFtcGluZy5odG1sPzBABglghkgBhvhC +AQgEMxYxaHR0cDovL3d3dy5pcHMuZXMvaXBzMjAwMi9wb2xpY3lUaW1lc3RhbXBp +bmcuaHRtbDB/BgNVHR8EeDB2MDegNaAzhjFodHRwOi8vd3d3Lmlwcy5lcy9pcHMy +MDAyL2lwczIwMDJUaW1lc3RhbXBpbmcuY3JsMDugOaA3hjVodHRwOi8vd3d3YmFj +ay5pcHMuZXMvaXBzMjAwMi9pcHMyMDAyVGltZXN0YW1waW5nLmNybDAvBggrBgEF +BQcBAQQjMCEwHwYIKwYBBQUHMAGGE2h0dHA6Ly9vY3NwLmlwcy5lcy8wDQYJKoZI +hvcNAQEFBQADgYEAZbrBzAAalZHK6Ww6vzoeFAh8+4Pua2JR0zORtWB5fgTYXXk3 +6MNbsMRnLWhasl8OCvrNPzpFoeo2zyYepxEoxZSPhExTCMWTs/zif/WN87GphV+I +3pGW7hdbrqXqcGV4LCFkAZXOzkw+UPS2Wctjjba9GNSHSl/c7+lW8AoM6HU= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFujCCBKKgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMCVVMx +HTAbBgNVBAoTFEFwcGxlIENvbXB1dGVyLCBJbmMuMS0wKwYDVQQLEyRBcHBsZSBD +b21wdXRlciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxKTAnBgNVBAMTIEFwcGxlIFJv +b3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTA1MDIxMDAwMTgxNFoXDTI1MDIx +MDAwMTgxNFowgYYxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRBcHBsZSBDb21wdXRl +ciwgSW5jLjEtMCsGA1UECxMkQXBwbGUgQ29tcHV0ZXIgQ2VydGlmaWNhdGUgQXV0 +aG9yaXR5MSkwJwYDVQQDEyBBcHBsZSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0 +eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOSRqQkfkdseR1DrBe1e +eYQt6zaiV0xV7IsZid75S2z1B6siMALoGD74UAnTf0GomPnRymacJGsR0KO75Bsq +wx+VnnoMpEeLW9QWNzPLxA9NzhRp0ckZcvVdDtV/X5vyJQO6VY9NXQ3xZDUjFUsV +WR2zlPf2nJ7PULrBWFBnjwi0IPfLrCwgb3C2PwEwjLdDzw+dPfMrSSgayP7OtbkO +2V4c1ss9tTqt9A8OAJILsSEWLnTVPA3bYharo3GSR1NVwa8vQbP4++NwzeajTEV+ +H0xrUJZBicR0YgsQg0GHM4qBsTBY7FoEMoxos48d3mVz/2deZbxJ2HafMxRloXeU +yS0CAwEAAaOCAi8wggIrMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/ +MB0GA1UdDgQWBBQr0GlHlHYJ/vRrjS5ApvdHTX8IXjAfBgNVHSMEGDAWgBQr0GlH +lHYJ/vRrjS5ApvdHTX8IXjCCASkGA1UdIASCASAwggEcMIIBGAYJKoZIhvdjZAUB +MIIBCTBBBggrBgEFBQcCARY1aHR0cHM6Ly93d3cuYXBwbGUuY29tL2NlcnRpZmlj +YXRlYXV0aG9yaXR5L3Rlcm1zLmh0bWwwgcMGCCsGAQUFBwICMIG2GoGzUmVsaWFu +Y2Ugb24gdGhpcyBjZXJ0aWZpY2F0ZSBieSBhbnkgcGFydHkgYXNzdW1lcyBhY2Nl +cHRhbmNlIG9mIHRoZSB0aGVuIGFwcGxpY2FibGUgc3RhbmRhcmQgdGVybXMgYW5k +IGNvbmRpdGlvbnMgb2YgdXNlLCBjZXJ0aWZpY2F0ZSBwb2xpY3kgYW5kIGNlcnRp +ZmljYXRpb24gcHJhY3RpY2Ugc3RhdGVtZW50cy4wRAYDVR0fBD0wOzA5oDegNYYz +aHR0cHM6Ly93d3cuYXBwbGUuY29tL2NlcnRpZmljYXRlYXV0aG9yaXR5L3Jvb3Qu +Y3JsMFUGCCsGAQUFBwEBBEkwRzBFBggrBgEFBQcwAoY5aHR0cHM6Ly93d3cuYXBw +bGUuY29tL2NlcnRpZmljYXRlYXV0aG9yaXR5L2Nhc2lnbmVycy5odG1sMA0GCSqG +SIb3DQEBBQUAA4IBAQCd2i0oWC99dgS5BNM+zrdmY06PL9T+S61yvaM5xlJNBZhS +9YlRASR5vhoy9+VEi0tEBzmC1lrKtCBe2a4VXR2MHTK/ODFiSF3H4ZCx+CRA+F9Y +m1FdV53B5f88zHIhbsTp6aF31ywXJsM/65roCwO66bNKcuszCVut5mIxauivL9Wv +Hld2j383LS4CXN1jyfJxuCZA3xWNdUQ/eb3mHZnhQyw+rW++uaT+DjUZUWOxw961 +kj5ReAFziqQjyqSI8R5cH0EWLX6VCqrpiUGYGxrdyyC/R14MJsVVNU3GMIuZZxTH +CR+6R8faAQmHJEKVvRNgGQrv6n8Obs3BREM6StXj +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID4TCCAsmgAwIBAgIOYyUAAQACFI0zFQLkbPQwDQYJKoZIhvcNAQEFBQAwezEL +MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNV +BAsTG1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQTEoMCYGA1UEAxMfVEMgVHJ1 +c3RDZW50ZXIgVW5pdmVyc2FsIENBIElJSTAeFw0wOTA5MDkwODE1MjdaFw0yOTEy +MzEyMzU5NTlaMHsxCzAJBgNVBAYTAkRFMRwwGgYDVQQKExNUQyBUcnVzdENlbnRl +ciBHbWJIMSQwIgYDVQQLExtUQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0ExKDAm +BgNVBAMTH1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQSBJSUkwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDC2pxisLlxErALyBpXsq6DFJmzNEubkKLF +5+cvAqBNLaT6hdqbJYUtQCggbergvbFIgyIpRJ9Og+41URNzdNW88jBmlFPAQDYv +DIRlzg9uwliT6CwLOunBjvvya8o84pxOjuT5fdMnnxvVZ3iHLX8LR7PH6MlIfK8v +zArZQe+f/prhsq75U7Xl6UafYOPfjdN/+5Z+s7Vy+EutCHnNaYlAJ/Uqwa1D7KRT +yGG299J5KmcYdkhtWyUB0SbFt1dpIxVbYYqt8Bst2a9c8SaQaanVDED1M4BDj5yj +dipFtK+/fz6HP3bFzSreIMUWWMv5G/UPyw0RUmS40nZid4PxWJ//AgMBAAGjYzBh +MB8GA1UdIwQYMBaAFFbn4VslQ4Dg9ozhcbyO5YAvxEjiMA8GA1UdEwEB/wQFMAMB +Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRW5+FbJUOA4PaM4XG8juWAL8RI +4jANBgkqhkiG9w0BAQUFAAOCAQEAg8ev6n9NCjw5sWi+e22JLumzCecYV42Fmhfz +dkJQEw/HkG8zrcVJYCtsSVgZ1OK+t7+rSbyUyKu+KGwWaODIl0YgoGhnYIg5IFHY +aAERzqf2EQf27OysGh+yZm5WZ2B6dF7AbZc2rrUNXWZzwCUyRdhKBgePxLcHsU0G +DeGl6/R1yrqc0L2z0zIkTO5+4nYES0lT2PLpVDP85XEfPRRclkvxOvIAu2y0+pZV +CIgJwcyRGSmwIC3/yzikQOEXvnlhgP8HA4ZMTnsGnxGGjYnuJ8Tb4rwZjgvDwxPH +LQNjO9Po5KIqwoIIlBZU8O8fJ5AluA0OKBtHd0e9HKgl8ZS0Zg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDvjCCA3ygAwIBAgIFJQaThoEwCwYHKoZIzjgEAwUAMIGFMQswCQYDVQQGEwJG +UjEPMA0GA1UECBMGRnJhbmNlMQ4wDAYDVQQHEwVQYXJpczEQMA4GA1UEChMHUE0v +U0dETjEOMAwGA1UECxMFRENTU0kxDjAMBgNVBAMTBUlHQy9BMSMwIQYJKoZIhvcN +AQkBFhRpZ2NhQHNnZG4ucG0uZ291di5mcjAeFw0wMjEyMTMxNDM5MTVaFw0yMDEw +MTcxNDM5MTRaMIGFMQswCQYDVQQGEwJGUjEPMA0GA1UECBMGRnJhbmNlMQ4wDAYD +VQQHEwVQYXJpczEQMA4GA1UEChMHUE0vU0dETjEOMAwGA1UECxMFRENTU0kxDjAM +BgNVBAMTBUlHQy9BMSMwIQYJKoZIhvcNAQkBFhRpZ2NhQHNnZG4ucG0uZ291di5m +cjCCAbYwggErBgcqhkjOOAQBMIIBHgKBgQCFkMImdk9zDzJfTO4XPdAAmLbAdWws +ZiEMZh19RyTo3CyhFqO77OIXrwY6vc1pcc3MgWJ0dgQpAgrDMtmFFxpUu4gmjVsx +8GpxQC+4VOgLY8Cvmcd/UDzYg07EIRto8BwCpPJ/JfUxwzV2V3N713aAX+cEoKZ/ +s+kgxC6nZCA7oQIVALME/JYjkdW2uKIGngsEPbXAjdhDAoGADh/uqWJx94UBm31c +9d8ZTBfRGRnmSSRVFDgPWgA69JD4BR5da8tKz+1HjfMhDXljbMH86ixpD5Ka1Z0V +pRYUPbyAoB37tsmXMJY7kjyD19d5VdaZboUjVvhH6UJy5lpNNNGSvFl4fqkxyvw+ +pq1QV0N5RcvK120hlXdfHUX+YKYDgYQAAoGAQGr7IuKJcYIvJRMjxwl43KxXY2xC +aoCiM/bv117MfI94aNf1UusGhp7CbYAY9CXuL60P0oPMAajbaTE5Z34AuITeHq3Y +CNMHwxalip8BHqSSGmGiQsXeK7T+r1rPXsccZ1c5ikGDZ4xn5gUaCyy2rCmb+fOJ +6VAfCbAbAjmNKwejdzB1MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgFGMBUG +A1UdIAQOMAwwCgYIKoF6AXkBAQEwHQYDVR0OBBYEFPkeNRcUf8idzpKblYbLNxs0 +MQhSMB8GA1UdIwQYMBaAFPkeNRcUf8idzpKblYbLNxs0MQhSMAsGByqGSM44BAMF +AAMvADAsAhRVh+CJA5eVyEYU5AO9Tm7GxX0rmQIUBCqsU5u1WxoZ5lEXicDX5/Ob +sRQ= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl +MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp +U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw +NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE +ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp +ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3 +DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf +8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN ++lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0 +X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa +K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA +1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G +A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR +zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0 +YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD +bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w +DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3 +L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D +eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl +xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp +VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY +WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ +BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh +c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy +MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp +emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X +DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw +FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg +UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo +YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5 +MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB +AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4 +pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0 +13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID +AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk +U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i +F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY +oJ2daZH9 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNV +BAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4X +DTA3MDYyOTE1MTMwNVoXDTI3MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQ +BgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwIQ2VydGlnbmEwggEiMA0GCSqGSIb3 +DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7qXOEm7RFHYeGifBZ4 +QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyHGxny +gQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbw +zBfsV1/pogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q +130yGLMLLGq/jj8UEYkgDncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2 +JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKfIrjxwo1p3Po6WAbfAgMBAAGjgbwwgbkw +DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQtCRZvgHyUtVF9lo53BEw +ZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJBgNVBAYT +AkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzj +AQ/JSP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG +9w0BAQUFAAOCAQEAhQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8h +bV6lUmPOEvjvKtpv6zf+EwLHyzs+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFnc +fca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1kluPBS1xp81HlDQwY9qcEQCYsuu +HWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY1gkIl2PlwS6w +t0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw +WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG +A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv +b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw +MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i +YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT +aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ +jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp +xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp +1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG +snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ +U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8 +9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E +BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B +AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz +yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE +38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP +AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad +DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME +HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDIDCCAgigAwIBAgIBJDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP +MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MxIENBMB4XDTAx +MDQwNjEwNDkxM1oXDTIxMDQwNjEwNDkxM1owOTELMAkGA1UEBhMCRkkxDzANBgNV +BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMSBDQTCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBALWJHytPZwp5/8Ue+H887dF+2rDNbS82rDTG +29lkFwhjMDMiikzujrsPDUJVyZ0upe/3p4zDq7mXy47vPxVnqIJyY1MPQYx9EJUk +oVqlBvqSV536pQHydekfvFYmUk54GWVYVQNYwBSujHxVX3BbdyMGNpfzJLWaRpXk +3w0LBUXl0fIdgrvGE+D+qnr9aTCU89JFhfzyMlsy3uhsXR/LpCJ0sICOXZT3BgBL +qdReLjVQCfOAl/QMF6452F/NM8EcyonCIvdFEu1eEpOdY6uCLrnrQkFEy0oaAIIN +nvmLVz5MxxftLItyM19yejhW1ebZrgUaHXVFsculJRwSVzb9IjcCAwEAAaMzMDEw +DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQIR+IMi/ZTiFIwCwYDVR0PBAQDAgEG +MA0GCSqGSIb3DQEBBQUAA4IBAQCLGrLJXWG04bkruVPRsoWdd44W7hE928Jj2VuX +ZfsSZ9gqXLar5V7DtxYvyOirHYr9qxp81V9jz9yw3Xe5qObSIjiHBxTZ/75Wtf0H +DjxVyhbMp6Z3N/vbXB9OWQaHowND9Rart4S9Tu+fMTfwRvFAttEMpWT4Y14h21VO +TzF2nBBhjrZTOqMRvq9tfB69ri3iDGnHhVNoomG6xT60eVR4ngrHAr5i0RGCS2Uv +kVrCqIexVmiUefkl98HVrhq4uz2PqYo4Ffdz0Fpg0YCw8NzVUM1O7pJIae2yIx4w +zMiUyLb1O4Z/P6Yun/Y+LLWSlj7fLJOK/4GMDw9ZIRlXvVWa +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIF5jCCA86gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMCVVMx +HTAbBgNVBAoTFEFPTCBUaW1lIFdhcm5lciBJbmMuMRwwGgYDVQQLExNBbWVyaWNh +IE9ubGluZSBJbmMuMTcwNQYDVQQDEy5BT0wgVGltZSBXYXJuZXIgUm9vdCBDZXJ0 +aWZpY2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyOTA2MDAwMFoXDTM3MDkyODIz +NDMwMFowgYMxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRBT0wgVGltZSBXYXJuZXIg +SW5jLjEcMBoGA1UECxMTQW1lcmljYSBPbmxpbmUgSW5jLjE3MDUGA1UEAxMuQU9M +IFRpbWUgV2FybmVyIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIw +DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALQ3WggWmRToVbEbJGv8x4vmh6mJ +7ouZzU9AhqS2TcnZsdw8TQ2FTBVsRotSeJ/4I/1n9SQ6aF3Q92RhQVSji6UI0ilb +m2BPJoPRYxJWSXakFsKlnUWsi4SVqBax7J/qJBrvuVdcmiQhLE0OcR+mrF1FdAOY +xFSMFkpBd4aVdQxHAWZg/BXxD+r1FHjHDtdugRxev17nOirYlxcwfACtCJ0zr7iZ +YYCLqJV+FNwSbKTQ2O9ASQI2+W6p1h2WVgSysy0WVoaP2SBXgM1nEG2wTPDaRrbq +JS5Gr42whTg0ixQmgiusrpkLjhTXUr2eacOGAgvqdnUxCc4zGSGFQ+aJLZ8lN2fx +I2rSAG2X+Z/nKcrdH9cG6rjJuQkhn8g/BsXS6RJGAE57COtCPStIbp1n3UsC5ETz +kxmlJ85per5n0/xQpCyrw2u544BMzwVhSyvcG7mm0tCq9Stz+86QNZ8MUhy/XCFh +EVsVS6kkUfykXPcXnbDS+gfpj1bkGoxoigTTfFrjnqKhynFbotSg5ymFXQNoKk/S +Btc9+cMDLz9l+WceR0DTYw/j1Y75hauXTLPXJuuWCpTehTacyH+BCQJJKg71ZDIM +gtG6aoIbs0t0EfOMd9afv9w3pKdVBC/UMejTRrkDfNoSTllkt1ExMVCgyhwn2RAu +rda9EGYrw7AiShJbAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE +FE9pbQN+nZ8HGEO8txBO1b+pxCAoMB8GA1UdIwQYMBaAFE9pbQN+nZ8HGEO8txBO +1b+pxCAoMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAO/Ouyugu +h4X7ZVnnrREUpVe8WJ8kEle7+z802u6teio0cnAxa8cZmIDJgt43d15Ui47y6mdP +yXSEkVYJ1eV6moG2gcKtNuTxVBFT8zRFASbI5Rq8NEQh3q0l/HYWdyGQgJhXnU7q +7C+qPBR7V8F+GBRn7iTGvboVsNIYvbdVgaxTwOjdaRITQrcCtQVBynlQboIOcXKT +RuidDV29rs4prWPVVRaAMCf/drr3uNZK49m1+VLQTkCpx+XCMseqdiThawVQ68W/ +ClTluUI8JPu3B5wwn3la5uBAUhX0/Kr0VvlEl4ftDmVyXr4m+02kLQgH3thcoNyB +M5kYJRF3p+v9WAksmWsbivNSPxpNSGDxoPYzAlOL7SUJuA0t7Zdz7NeWH45gDtoQ +my8YJPamTQr5O8t1wswvziRpyQoijlmn94IM19drNZxDAGrElWe6nEXLuA4399xO +AU++CrYD062KRffaJ00psUjf5BHklka9bAI+1lHIlRcBFanyqqryvy9lG2/QuRqT +9Y41xICHPpQvZuTpqP9BnHAqTyo5GJUefvthATxRCC4oGKQWDzH9OmwjkyB24f0H +hdFbP9IcczLd+rn4jM8Ch3qaluTtT4mNU0OrDhPAARW0eTjb/G49nlG2uBOLZ8/5 +fNkiHfZdxRwBL5joeiQYvITX+txyW/fBOmg= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDIDCCAomgAwIBAgIEN3DPtTANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV +UzEXMBUGA1UEChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2Vj +dXJlIGVCdXNpbmVzcyBDQS0yMB4XDTk5MDYyMzEyMTQ0NVoXDTE5MDYyMzEyMTQ0 +NVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDkVxdWlmYXggU2VjdXJlMSYwJAYD +VQQLEx1FcXVpZmF4IFNlY3VyZSBlQnVzaW5lc3MgQ0EtMjCBnzANBgkqhkiG9w0B +AQEFAAOBjQAwgYkCgYEA5Dk5kx5SBhsoNviyoynF7Y6yEb3+6+e0dMKP/wXn2Z0G +vxLIPw7y1tEkshHe0XMJitSxLJgJDR5QRrKDpkWNYmi7hRsgcDKqQM2mll/EcTc/ +BPO3QSQ5BxoeLmFYoBIL5aXfxavqN3HMHMg3OrmXUqesxWoklE6ce8/AatbfIb0C +AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEX +MBUGA1UEChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2VjdXJl +IGVCdXNpbmVzcyBDQS0yMQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTkw +NjIzMTIxNDQ1WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUUJ4L6q9euSBIplBq +y/3YIHqngnYwHQYDVR0OBBYEFFCeC+qvXrkgSKZQasv92CB6p4J2MAwGA1UdEwQF +MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA +A4GBAAyGgq3oThr1jokn4jVYPSm0B482UJW/bsGe68SQsoWou7dC4A8HOd/7npCy +0cE+U58DRLB+S/Rv5Hwf5+Kx5Lia78O9zt4LMjTZ3ijtM2vE1Nc9ElirfQkty3D1 +E4qUoSek1nDFbZS1yX2doNLGCEnZZpum0/QL3MUmV+GRMOrN +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBe +MQswCQYDVQQGEwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0 +ZC4xKjAoBgNVBAsMIWVQS0kgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe +Fw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMxMjdaMF4xCzAJBgNVBAYTAlRXMSMw +IQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBL +SSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEF +AAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAH +SyZbCUNsIZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAh +ijHyl3SJCRImHJ7K2RKilTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3X +DZoTM1PRYfl61dd4s5oz9wCGzh1NlDivqOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1 +TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX12ruOzjjK9SXDrkb5wdJ +fzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0OWQqraffA +sgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uU +WH1+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLS +nT0IFaUQAS2zMnaolQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pH +dmX2Os+PYhcZewoozRrSgx4hxyy/vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJip +NiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXiZo1jDiVN1Rmy5nk3pyKdVDEC +AwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/QkqiMAwGA1UdEwQF +MAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH +ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGB +uvl2ICO1J2B01GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6Yl +PwZpVnPDimZI+ymBV3QGypzqKOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkP +JXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdVxrsStZf0X4OFunHB2WyBEXYKCrC/ +gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEPNXubrjlpC2JgQCA2 +j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+rGNm6 +5ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUB +o2M3IUxExJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS +/jQ6fbjpKdx2qcgw+BRxgMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2z +Gp1iro2C6pSe3VkQw63d4k3jMdXH7OjysP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTE +W9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmODBCEIZ43ygknQW/2xzQ+D +hNQ+IIX3Sj0rnP0qCglN6oH4EZw= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIF3zCCA8egAwIBAgIOGTMAAQACKBqaBLzyVUUwDQYJKoZIhvcNAQEFBQAwejEL +MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNV +BAsTG1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQTEnMCUGA1UEAxMeVEMgVHJ1 +c3RDZW50ZXIgVW5pdmVyc2FsIENBIElJMB4XDTA2MDMyMjE1NTgzNFoXDTMwMTIz +MTIyNTk1OVowejELMAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVy +IEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQTEnMCUG +A1UEAxMeVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIElJMIICIjANBgkqhkiG +9w0BAQEFAAOCAg8AMIICCgKCAgEAi9R3azRs5TbYalxeOO781R15Azt7g2JEgk6I +7d6D/+7MUGIFBZWZdpj2ufJf2AaRksL2LWYXH/1TA+iojWOpbuHWG4y8mLOLO9Tk +Lsp9hUkmW3m4GotAnn+7yT9jLM/RWny6KCJBElpN+Rd3/IX9wkngKhh/6aAsnPlE +/AxoOUL1JwW+jhV6YJ3wO8c85j4WvK923mq3ouGrRkXrjGV90ZfzlxElq1nroCLZ +gt2Y7X7i+qBhCkoy3iwX921E6oFHWZdXNwM53V6CItQzuPomCba8OYgvURVOm8M7 +3xOCiN1LNPIz1pDp81PcNXzAw9l8eLPNcD+NauCjgUjkKa1juPD8KGQ7mbN9/pqd +iPaZIgiRRxaJNXhdd6HPv0nh/SSUK2k2e+gc5iqQilvVOzRZQtxtz7sPQRxVzfUN +Wy4WIibvYR6X/OJTyM9bo8ep8boOhhLLE8oVx+zkNo3aXBM9ZdIOXXB03L+PemrB +Lg/Txl4PK1lszGFs/sBhTtnmT0ayWuIZFHCE+CAA7QGnl37DvRJckiMXoKUdRRcV +I5qSCLUiiI3cKyTr4LEXaNOvYb3ZhXj2jbp4yjeNY77nrB/fpUcJucglMVRGURFV +DYlcjdrSGC1z8rjVJ/VIIjfRYvd7Dcg4i6FKsPzQ8eu3hmPn4A5zf/1yUbXpfeJV +BWR4Z38CAwEAAaNjMGEwHwYDVR0jBBgwFoAUzdeQoW6jv9sw1toyJZAM5jkegGUw +DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFM3XkKFu +o7/bMNbaMiWQDOY5HoBlMA0GCSqGSIb3DQEBBQUAA4ICAQB+FojoEw42zG4qhQc4 +xlaJeuNHIWZMUAgxWlHQ/KZeFHXeTDvs8e3MfhEHSmHu6rOOOqQzxu2KQmZP8Tx7 +yaUFQZmx7Cxb7tyW0ohTS3g0uW7muw/FeqZ8Dhjfbw90TNGp8aHp2FRkzF6WeKJW +GsFzshXGVwXf2vdIJIqOf2qp+U3pPmrOYCx9LZAI9mOPFdAtnIz/8f38DBZQVhT7 +upeG7rRJA1TuG1l/MDoCgoYhrv7wFfLfToPmmcW6NfcgkIw47XXP4S73BDD7Ua2O +giRAyn0pXdXZ92Vk/KqfdLh9kl3ShCngE+qK99CrxK7vFcXCifJ7tjtJmGHzTnKR +N4xJkunI7Cqg90lufA0kxmts8jgvynAF5X/fxisrgIDV2m/LQLvYG/AkyRDIRAJ+ +LtOYqqIN8SvQ2vqOHP9U6OFKbt2o1ni1N6WsZNUUI8cOpevhCTjXwHxgpV2Yj4wC +1dxWqPNNWKkL1HxkdAEy8t8PSoqpAqKiHYR3wvHMl700GXRd4nQ+dSf3r7/ufA5t +VIimVuImrTESPB5BeW0X6hNeH/Vcn0lZo7Ivo0LD+qh+v6WfSMlgYmIK371F3uNC +tVGW/cT1Gpm4UqJEzS1hjBWPgdVdotSQPYxuQGHDWV3Y2eH2dEcieXR92sqjbzcV +NvAsGnE8EXbfXRo+VGN4a2V+Hw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIHqTCCBZGgAwIBAgIQYwaGp8U3ZaVDkKhqWMzUMjANBgkqhkiG9w0BAQUFADCB +jzELMAkGA1UEBhMCTFYxNTAzBgNVBAoTLFZBUyBMYXR2aWphcyBQYXN0cyAtIFZp +ZW4ucmVnLk5yLjQwMDAzMDUyNzkwMSMwIQYDVQQLExpTZXJ0aWZpa2FjaWphcyBw +YWthbHBvanVtaTEkMCIGA1UEAxMbVkFTIExhdHZpamFzIFBhc3RzIFNTSShSQ0Ep +MB4XDTA2MDkxMzA5MjIxMFoXDTI0MDkxMzA5Mjc1N1owgY8xCzAJBgNVBAYTAkxW +MTUwMwYDVQQKEyxWQVMgTGF0dmlqYXMgUGFzdHMgLSBWaWVuLnJlZy5Oci40MDAw +MzA1Mjc5MDEjMCEGA1UECxMaU2VydGlmaWthY2lqYXMgcGFrYWxwb2p1bWkxJDAi +BgNVBAMTG1ZBUyBMYXR2aWphcyBQYXN0cyBTU0koUkNBKTCCAiIwDQYJKoZIhvcN +AQEBBQADggIPADCCAgoCggIBAJu4+f1hVS9PpKUUtS6OuSSPrPuxVD9A/0/F5YZo +e1OT+zWCNahQLpRSoNuDPnXaFXCsCc/ugkmtNkm5tHGLtAChQgbKCApjl7YI/O60 +3Jh4GYLJ+H9kPqrJ/rGN67Bk9bzzxD46kOpOjj8bGbxqg8ORPGxV+wpSwOjhXXeF +M8VJ3+xqv79sN/6OSaIVGM6LjmseOKMwb4iBfnJWRBrEejkP9sSPltSy6wBOXN67 +5zu35iQFk2tN5pFEv+6YG8eFGxFBeyI2p74+6Ho33BjekJ2PzbLXmj/iF39bDOHv +P2Y9biTksM7DDIhslNo4JXxSOeNzFLMARWOaDEJAXgTG93JkzsluM7Pk020klTeT +fvIAXRmLH/NDc6ifRdIGqey0Qrv67gzHTz9RH9Gv0KwYf4eBIv6p3QeWbXz4TtlN +OlBp1UF+xdp02I5z5X6D4cMZgbe9v0COvi6aogyqTgIuuyrhCF0xA8msJ7Cv3NXI +FH1AnVWJIfmQzNTJYEFzq+jN2DpVOQqCmf6b9fU8HJHLwPpGVK4h/CqsXHveepdx +/WxrzUiapNuBfBg3L5B9YZS9F8lctlQWd8oJSqrpvE+UdQFaVryS0o+515feVnQB +9xZxSbH1GEaZQe5i4bMsZXVpKXJDA/ibH/o49J7sQBCOrJfVsDO+nxjcLfdBeFRK +YkTnAgMBAAGjggH9MIIB+TAOBgNVHQ8BAf8EBAMCAQYwGAYIKwYBBQUHAQMEDDAK +MAgGBgQAjkYBATAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTMw/Vm/3OsOFqW +GyGJuIFMH8teJTAQBgkrBgEEAYI3FQEEAwIBADCCAYkGA1UdIASCAYAwggF8MIIB +eAYLKwYBBAGBxFkBAQIwggFnMIIBOAYIKwYBBQUHAgIwggEqHoIBJgBTAGkAcwAg +AGkAcgAgAHMAZQByAHQAaQBmAGkAawBhAHQAcwAsACAAawBvACAAaQB6AGQAZQB2 +AGkAcwAgAFYAQQBTACAATABhAHQAdgBpAGoAYQBzACAAUABhAHMAdABzACwAIABu +AG8AZAByAG8AcwBpAG4AbwB0ACAAYQB0AGIAaQBsAHMAdABpAGIAdQAgAEUAbABl +AGsAdAByAG8AbgBpAHMAawBvACAAZABvAGsAdQBtAGUAbgB0AHUAIABsAGkAawB1 +AG0AYQBtACAAdQBuACAARQBpAHIAbwBwAGEAcwAgAFAAYQByAGwAYQBtAGUAbgB0 +AGEAIABkAGkAcgBlAGsAdABpAHYAYQBpACAAMQA5ADkAOQAvADkAMwAvAEUASzAp +BggrBgEFBQcCARYdaHR0cDovL3d3dy5lLW1lLmx2L3JlcG9zaXRvcnkwDQYJKoZI +hvcNAQEFBQADggIBAB8oSjWQIWNoCi94r6MegiaXoz8nGdJLo0J6BhNlW8EEy+t9 +fO+U8vGJ9bffUgIhadLqljTloM+XuJxVDhCFoxReLAX4tTp28/l6uN62DCdp8suU +kQsdudWOb5kvzfIZVjk6SFbwAf+Cdbay/dHU9fJjV0xNoX7MELoEae/0FPyzlx9F +7m9KKH/Rxie8x6Opa3vtghNvq94P+3HrXBEaqSzQMJ/8NjdW75XpurcTtq6fAmGt +nuxrBG82nw+Z98LJyEwouSjUIdeeVNXAzvSO5FWUe48kxjj8q3qkVnc9qEXvZJKk +0Ep+u3OL9A1Sc7g6SF5DgNOpcHdi/8coHHMeQ+YnJFtJueY2pI79xS0veqV5EnrX +IbIlbcgPosNhS+VI4le6n/KKId3bZPDaGd/OwJuAOcJ3d2MVU3KE+qSPBzeGIX1Q ++j1qN9uRDjez/c4Lynth0Jx0nH04aG3pex3W8Sq07ztgUncF5gLCX4xbvPB9t3PH +kWuyKrNjozTVq60lcUf/Gj56to2VdsPups0DCWzuRWeYz5lIdsHOinSaaFIBNCLI +7eIUC4S9bhCMsXKbvugI11fVf+q0AT1O5OLoZ+eMfunnQhHvlUbIkda+JxeAGTSY +58bfHvwhX56GPbx+8Jy9cp70R4JbcWfz+txUTKhc2FnH0AcOEzMnvPRp8Gsh +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDtTCCAp2gAwIBAgIIBhDCeat3PfIwDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UE +BhMCQ0gxEjAQBgNVBAoTCVN3aXNzU2lnbjEyMDAGA1UEAxMpU3dpc3NTaWduIENB +IChSU0EgSUsgTWF5IDYgMTk5OSAxODowMDo1OCkxHzAdBgkqhkiG9w0BCQEWEGNh +QFN3aXNzU2lnbi5jb20wHhcNMDAxMTI2MjMyNzQxWhcNMzExMTI2MjMyNzQxWjB2 +MQswCQYDVQQGEwJDSDESMBAGA1UEChMJU3dpc3NTaWduMTIwMAYDVQQDEylTd2lz +c1NpZ24gQ0EgKFJTQSBJSyBNYXkgNiAxOTk5IDE4OjAwOjU4KTEfMB0GCSqGSIb3 +DQEJARYQY2FAU3dpc3NTaWduLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBAKw5fjnmNneLQlUCQG8jQLwwfbrOZoUwNX8cbNqhxK03/xUloFVgAt+S +Te2RxNXaCAXLBPn5ZST35TLV57aLmbHCtifv3YZqaaQGvjedltIBMJihJhZ+h3LY +SKsUb+xEJ3x5ZUf8jP+Q1g57y1s8SnBFWN/ni5NkF1Y1y31VwOi9wiOf/VISL+uu +SC4i1CP1Kbz3BDs6Hht1GpRYCbJ/K0bc9oJSpWpT5PGONsGIawqMbJuyoDghsXQ1 +pbn2e8K64BSscGZVZTNooSGgNiHmACNJBYXiWVWrwXPF4l6SddmC3Rj0aKXjgECc +FkHLDQcsM5JsK2ZLryTDUsQFbxVP2ikCAwEAAaNHMEUwCwYDVR0PBAQDAgEGMAwG +A1UdEwQFMAMBAf8wHQYDVR0OBBYEFJbXcc05KtT8iLGKq1N4ae+PR34WMAkGA1Ud +IwQCMAAwDQYJKoZIhvcNAQEFBQADggEBAKMy6W8HvZdS1fBpEUzl6Lvw50bgE1Xc +HU1JypSBG9mhdcXZo5AlPB4sCvx9Dmfwhyrdsshc0TP2V3Vh6eQqnEF5qB4lVziT +Bko9mW6Ot+pPnwsy4SHpx3rw6jCYnOqfUcZjWqqqRrq/3P1waz+Mn4cLMVEg3Xaz +qYov/khvSqS0JniwjRlo2H6f/1oVUKZvP+dUhpQepfZrOqMAWZW4otp6FolyQyeU +NN6UCRNiUKl5vTijbKwUUwfER/1Vci3M1/O1QCfttQ4vRN4Buc0xqYtGL3cd5WiO +vWzyhlTzAI6VUdNkQhhHJSAyTpj6dmXDRzrryoFGa2PjgESxz7XBaSI= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBK +MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x +GTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkx +MjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3Qg +Q29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jxYDiJ +iQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa +/FHtaMbQbqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJ +jnIFHovdRIWCQtBJwB1g8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnI +HmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYVHDGA76oYa8J719rO+TMg1fW9ajMtgQT7 +sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi0XPnj3pDAgMBAAGjgZ0w +gZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQF +MAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCsw +KaAnoCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsG +AQQBgjcVAQQDAgEAMA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0L +URYD7xh8yOOvaliTFGCRsoTciE6+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXO +H0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cnCDpOGR86p1hcF895P4vkp9Mm +I50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/53CYNv6ZHdAbY +iNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc +f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB +kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug +Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho +dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw +IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG +EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD +VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu +dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6 +E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ +D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK +4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq +lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW +bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB +o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT +MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js +LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr +BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB +AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft +Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj +j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH +KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv +2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3 +mfnGV/TJVTl4uix5yaaIK/QI +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x +GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv +b3QgQ0EgMzAeFw0wNjExMjQxOTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNV +BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W +YWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDM +V0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNggDhoB +4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUr +H556VOijKTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd +8lyyBTNvijbO0BNO/79KDDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9Cabwv +vWhDFlaJKjdhkf2mrk7AyxRllDdLkgbvBNDInIjbC3uBr7E9KsRlOni27tyAsdLT +mZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwpp5ijJUMv7/FfJuGITfhe +btfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8nT8KKdjc +T5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDt +WAEXMJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZ +c6tsgLjoC2SToJyMGf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A +4iLItLRkT9a6fUg+qGkM17uGcclzuD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYD +VR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHTBgkrBgEEAb5YAAMwgcUwgZMG +CCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNvbnN0 +aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0 +aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu +dC4wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2Nw +czALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4G +A1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4ywLQoUmkRzBFMQswCQYDVQQGEwJC +TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UEAxMSUXVvVmFkaXMg +Um9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZVqyM0 +7ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSem +d1o417+shvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd ++LJ2w/w4E6oM3kJpK27zPOuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B +4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadN +t54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp8kokUvd0/bpO5qgdAm6x +DYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBCbjPsMZ57 +k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6s +zHXug/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0j +Wy10QJLZYxkNc91pvGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeT +mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK +4SVhM7JZG+Ju1zdXtg2pEto= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzET +MBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UE +AxMIQ0EgRGlzaWcwHhcNMDYwMzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQsw +CQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcg +YS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw +ggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgmGErE +Nx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnX +mjxUizkDPw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYD +XcDtab86wYqg6I7ZuUUohwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhW +S8+2rT+MitcE5eN4TPWGqvWP+j1scaMtymfraHtuM6kMgiioTGohQBUgDCZbg8Kp +FhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8wgfwwDwYDVR0TAQH/BAUw +AwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0PAQH/BAQD +AgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cu +ZGlzaWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5z +ay9jYS9jcmwvY2FfZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2sv +Y2EvY3JsL2NhX2Rpc2lnLmNybDAaBgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEw +DQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59tWDYcPQuBDRIrRhCA/ec8J9B6 +yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3mkkp7M5+cTxq +EEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/ +CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeB +EicTXxChds6KezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFN +PGO+I++MzVpQuGhU+QqZMxEA4Z7CRneC9VkGjCFMhwnN5ag= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU +MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3 +b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw +MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML +QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD +VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA +A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul +CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n +tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl +dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch +PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC ++Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O +BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E +BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl +MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk +ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB +IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X +7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz +43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY +eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl +pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA +WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFGTCCBAGgAwIBAgIEPki9xDANBgkqhkiG9w0BAQUFADAxMQswCQYDVQQGEwJE +SzEMMAoGA1UEChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTAeFw0wMzAyMTEw +ODM5MzBaFw0zNzAyMTEwOTA5MzBaMDExCzAJBgNVBAYTAkRLMQwwCgYDVQQKEwNU +REMxFDASBgNVBAMTC1REQyBPQ0VTIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEArGL2YSCyz8DGhdfjeebM7fI5kqSXLmSjhFuHnEz9pPPEXyG9VhDr +2y5h7JNp46PMvZnDBfwGuMo2HP6QjklMxFaaL1a8z3sM8W9Hpg1DTeLpHTk0zY0s +2RKY+ePhwUp8hjjEqcRhiNJerxomTdXkoCJHhNlktxmW/OwZ5LKXJk5KTMuPJItU +GBxIYXvViGjaXbXqzRowwYCDdlCqT9HU3Tjw7xb04QxQBr/q+3pJoSgrHPb8FTKj +dGqPqcNiKXEx5TukYBdedObaE+3pHx8b0bJoc8YQNHVGEBDjkAB2QMuLt0MJIf+r +TpPGWOmlgtt3xDqZsXKVSQTwtyv6e1mO3QIDAQABo4ICNzCCAjMwDwYDVR0TAQH/ +BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwgewGA1UdIASB5DCB4TCB3gYIKoFQgSkB +AQEwgdEwLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuY2VydGlmaWthdC5kay9yZXBv +c2l0b3J5MIGdBggrBgEFBQcCAjCBkDAKFgNUREMwAwIBARqBgUNlcnRpZmlrYXRl +ciBmcmEgZGVubmUgQ0EgdWRzdGVkZXMgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEu +MS4xLiBDZXJ0aWZpY2F0ZXMgZnJvbSB0aGlzIENBIGFyZSBpc3N1ZWQgdW5kZXIg +T0lEIDEuMi4yMDguMTY5LjEuMS4xLjARBglghkgBhvhCAQEEBAMCAAcwgYEGA1Ud +HwR6MHgwSKBGoESkQjBAMQswCQYDVQQGEwJESzEMMAoGA1UEChMDVERDMRQwEgYD +VQQDEwtUREMgT0NFUyBDQTENMAsGA1UEAxMEQ1JMMTAsoCqgKIYmaHR0cDovL2Ny +bC5vY2VzLmNlcnRpZmlrYXQuZGsvb2Nlcy5jcmwwKwYDVR0QBCQwIoAPMjAwMzAy +MTEwODM5MzBagQ8yMDM3MDIxMTA5MDkzMFowHwYDVR0jBBgwFoAUYLWF7FZkfhIZ +J2cdUBVLc647+RIwHQYDVR0OBBYEFGC1hexWZH4SGSdnHVAVS3OuO/kSMB0GCSqG +SIb2fQdBAAQQMA4bCFY2LjA6NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEACrom +JkbTc6gJ82sLMJn9iuFXehHTuJTXCRBuo7E4A9G28kNBKWKnctj7fAXmMXAnVBhO +inxO5dHKjHiIzxvTkIvmI/gLDjNDfZziChmPyQE+dF10yYscA+UYyAFMP8uXBV2Y +caaYb7Z8vTd/vuGTJW1v8AqtFxjhA7wHKcitJuj4YfD9IQl+mo6paH1IYnK9AOoB +mbgGglGBTvH1tJFUuSN6AJqfXY3gPGS5GhKSKseCRHI53OI8xthV9RVOyAUO28bQ +YqbsFbS1AoLbrIyigfCbmTH1ICCoiGEKB5+U/NDXG8wuF/MEJ3Zn61SD/aSQfgY9 +BKNDLdr8C2LqL19iUw== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIG0TCCBbmgAwIBAgIBezANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMCSFUx @@ -2679,6 +2948,350 @@ VCHnpgu0mfVRQdzNo0ci2ccBgcTcR08m6h/t280NmPSjnLRzMkqWmf68f8glWPhY macqaJVmlaut74nLYKkGEsaUR+ko -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- +MIICmDCCAgGgAwIBAgIBDjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJVUzEY +MBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNFQ0ExFDASBgNVBAMT +C0VDQSBSb290IENBMB4XDTA0MDYxNDEwMjAwOVoXDTQwMDYxNDEwMjAwOVowSzEL +MAkGA1UEBhMCVVMxGDAWBgNVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMD +RUNBMRQwEgYDVQQDEwtFQ0EgUm9vdCBDQTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw +gYkCgYEArkr2eXIS6oAKIpDkOlcQZdMGdncoygCEIU+ktqY3of5SVVXU7/it7kJ1 +EUzR4ii2vthQtbww9aAnpQxcEmXZk8eEyiGEPy+cCQMllBY+efOtKgjbQNDZ3lB9 +19qzUJwBl2BMxslU1XsJQw9SK10lPbQm4asa8E8e5zTUknZBWnECAwEAAaOBizCB +iDAfBgNVHSMEGDAWgBT2uAQnDlYW2blj2f2hVGVBoAhILzAdBgNVHQ4EFgQU9rgE +Jw5WFtm5Y9n9oVRlQaAISC8wDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB +Af8wJQYDVR0gBB4wHDAMBgpghkgBZQMCAQwBMAwGCmCGSAFlAwIBDAIwDQYJKoZI +hvcNAQEFBQADgYEAHh0EQY2cZ209aBb5q0wW1ER0dc4OGzsLyqjHfaQ4TEaMmUwL +AJRta/c4KVWLiwbODsvgJk+CaWmSL03gRW/ciVb/qDV7qh9Pyd1cOlanZTAnPog2 +i82yL3i2fK9DCC84uoxEQbgqK2jx9bIjFTwlAqITk9fGAm5mdT84IEwq1Gw= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEojCCA4qgAwIBAgIQRL4Mi1AAJLQR0zYlJWfJiTANBgkqhkiG9w0BAQUFADCB +rjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug +Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho +dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xNjA0BgNVBAMTLVVUTi1VU0VSRmlyc3Qt +Q2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBFbWFpbDAeFw05OTA3MDkxNzI4NTBa +Fw0xOTA3MDkxNzM2NThaMIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAV +BgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5l +dHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UE +AxMtVVROLVVTRVJGaXJzdC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWls +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsjmFpPJ9q0E7YkY3rs3B +YHW8OWX5ShpHornMSMxqmNVNNRm5pELlzkniii8efNIxB8dOtINknS4p1aJkxIW9 +hVE1eaROaJB7HHqkkqgX8pgV8pPMyaQylbsMTzC9mKALi+VuG6JG+ni8om+rWV6l +L8/K2m2qL+usobNqqrcuZzWLeeEeaYji5kbNoKXqvgvOdjp6Dpvq/NonWz1zHyLm +SGHGTPNpsaguG7bUMSAsvIKKjqQOpdeJQ/wWWq8dcdcRWdq6hw2v+vPhwvCkxWeM +1tZUOt4KpLoDd7NlyP0e03RiqhjKaJMeoYV+9Udly/hNVyh00jT/MLbu9mIwFIws +6wIDAQABo4G5MIG2MAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud +DgQWBBSJgmd9xJ0mcABLtFBIfN49rgRufTBYBgNVHR8EUTBPME2gS6BJhkdodHRw +Oi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLVVTRVJGaXJzdC1DbGllbnRBdXRoZW50 +aWNhdGlvbmFuZEVtYWlsLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH +AwQwDQYJKoZIhvcNAQEFBQADggEBALFtYV2mGn98q0rkMPxTbyUkxsrt4jFcKw7u +7mFVbwQ+zznexRtJlOTrIEy05p5QLnLZjfWqo7NK2lYcYJeA3IKirUq9iiv/Cwm0 +xtcgBEXkzYABurorbs6q15L+5K/r9CYdFip/bDCVNy8zEqx/3cfREYxRmLLQo5HQ +rfafnoOTHh1CuEava2bwm3/q4wMC5QJRwarVNZ1yQAOJujEdxRBoUp7fooXFXAim +eOZTT7Hot9MUnpOmw2TjrH5xzbyf6QMbzPvprDHBr3wVdAKZw7JHpsIyYdfHb0gk +USeh1YdV8nuPmD0Wnu51tvjQjvLzxq4oW6fw8zYX/MMF08oDSlQ= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDIjCCAougAwIBAgIQNKT/9jCvTKU8MxdCoZRmdTANBgkqhkiG9w0BAQUFADCB +xDELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ +Q2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UE +CxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhh +d3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0 +ZS5jb20wHhcNOTYwODAxMDAwMDAwWhcNMjEwMTAxMjM1OTU5WjCBxDELMAkGA1UE +BhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3du +MR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlm +aWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZl +ciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wgZ8w +DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl +/Kj0R1HahbUgdJSGHg91yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF +/rFrKbYvScg71CcEJRCXL+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982 +OsK1ZiIS1ocNAgMBAAGjEzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEF +BQADgYEAvkBpQW/G28GnvwfAReTQtUMeTJUzNelewj4o9qgNUNX/4gwP/FACjq6R +ua00io2fJ3GqGcxL6ATK1BdrEhrWxl/WzV7/iXa/2EjYWb0IiokdV81FHlK6EpqE ++hiJX+j5MDVqAWC5mYCDhQpu2vTJj15zLTFKY6B08h+LItIpPus= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDITCCAoqgAwIBAgIBADANBgkqhkiG9w0BAQQFADCByzELMAkGA1UEBhMCWkEx +FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYD +VQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBT +ZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFBlcnNvbmFsIEJhc2lj +IENBMSgwJgYJKoZIhvcNAQkBFhlwZXJzb25hbC1iYXNpY0B0aGF3dGUuY29tMB4X +DTk2MDEwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgcsxCzAJBgNVBAYTAlpBMRUw +EwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEaMBgGA1UE +ChMRVGhhd3RlIENvbnN1bHRpbmcxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2Vy +dmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQZXJzb25hbCBCYXNpYyBD +QTEoMCYGCSqGSIb3DQEJARYZcGVyc29uYWwtYmFzaWNAdGhhd3RlLmNvbTCBnzAN +BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvLyTU23AUE+CFeZIlDWmWr5vQvoPR+53 +dXLdjUmbllegeNTKP1GzaQuRdhciB5dqxFGTS+CN7zeVoQxN2jSQHReJl+A1OFdK +wPQIcOk8RHtQfmGakOMj04gRRif1CwcOu93RfyAKiLlWCy4cgNrx454p7xS9CkT7 +G1sY0b8jkyECAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQQF +AAOBgQAt4plrsD16iddZopQBHyvdEktTwq1/qqcAXJFAVyVKOKqEcLnZgA+le1z7 +c8a914phXAPjLSeoF+CEhULcXpvGt7Jtu3Sv5D/Lp7ew4F2+eIMllNLbgQ95B21P +9DkVWlIBe94y1k049hJcBlDfBVu9FEuh3ym6O0GN92NWod8isQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB +gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk +MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY +UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx +NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3 +dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy +dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB +dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6 +38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP +KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q +DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4 +qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa +JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi +PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P +BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs +jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0 +eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD +ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR +vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt +qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa +IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy +i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ +O+7ETPTsJ3xCwnR8gooJybQDJbw= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc +MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP +bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2 +MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft +ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg +Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIP +ADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC +206B89enfHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFci +KtZHgVdEglZTvYYUAQv8f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2 +JxhP7JsowtS013wMPgwr38oE18aO6lhOqKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9 +BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JNRvCAOVIyD+OEsnpD8l7e +Xz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0gBe4lL8B +PeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67 +Xnfn6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEq +Z8A9W6Wa6897GqidFEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZ +o2C7HK2JNDJiuEMhBnIMoVxtRsX6Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3 ++L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnjB453cMor9H124HhnAgMBAAGj +YzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3OpaaEg5+31IqEj +FNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE +AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmn +xPBUlgtk87FYT15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2 +LHo1YGwRgJfMqZJS5ivmae2p+DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzccc +obGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXgJXUjhx5c3LqdsKyzadsXg8n33gy8 +CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//ZoyzH1kUQ7rVyZ2OuMe +IjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgOZtMA +DjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2F +AjgQ5ANh1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUX +Om/9riW99XJZZLF0KjhfGEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPb +AZO1XB4Y3WRayhgoPmMEEf0cjQAPuDffZ4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQl +Zvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuPcX/9XhmgD0uRuMRUvAaw +RY8mkaKO/qk= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMx +IDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxs +cyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9v +dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDcxMjEzMTcwNzU0WhcNMjIxMjE0 +MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdl +bGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQD +DC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkw +ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+r +WxxTkqxtnt3CxC5FlAM1iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjU +Dk/41itMpBb570OYj7OeUt9tkTmPOL13i0Nj67eT/DBMHAGTthP796EfvyXhdDcs +HqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8bJVhHlfXBIEyg1J55oNj +z7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiBK0HmOFaf +SZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/Slwxl +AgMBAAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqG +KGh0dHA6Ly9jcmwucGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0P +AQH/BAQDAgHGMB0GA1UdDgQWBBQmlRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0j +BIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGBi6SBiDCBhTELMAkGA1UEBhMC +VVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNX +ZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg +Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEB +ALkVsUSRzCPIK0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd +/ZDJPHV3V3p9+N701NX3leZ0bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pB +A4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSljqHyita04pO2t/caaH/+Xc/77szWn +k4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+esE2fDbbFwRnzVlhE9 +iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJtylv +2G0xffX8oRAHh84vWdw+WNs= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDczCCAlugAwIBAgIQMDAwMDk3Mzc1NzM4NjAwMDANBgkqhkiG9w0BAQUFADBV +MQswCQYDVQQGEwJGUjETMBEGA1UEChMKQ2VydGlOb21pczEcMBoGA1UECxMTQUMg +UmFjaW5lIC0gUm9vdCBDQTETMBEGA1UEAxMKQ2VydGlOb21pczAeFw0wMDExMDkw +MDAwMDBaFw0xMjExMDkwMDAwMDBaMFUxCzAJBgNVBAYTAkZSMRMwEQYDVQQKEwpD +ZXJ0aU5vbWlzMRwwGgYDVQQLExNBQyBSYWNpbmUgLSBSb290IENBMRMwEQYDVQQD +EwpDZXJ0aU5vbWlzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8SWb +4mS5RXB3ENSIcfrEzCj/TRUQuT1tMCU0YUfXFSgcPdWglIzCv3kvh07QoB+8xMl+ +fQHvSSduAxnNewz0GBY9rApCPKlP6CcnJr74OSVZIiWt9wLfl4wwhNhZOiikIpZp +EdOXWqRc84P5cUlN3Lwmr1sjCWmHfTSS4cAKxfDbFLfE61etosyoFZUTQbIhb1Bf +JL5xRXAUZudQiU42n/yAoSUrN4FLUfPQNlOe1AB81pIgX8g2ojwxDjfgqSs1JmBF +uLKJ45uVLEenQBPmQCGjL3maV86IRmR3a9UGlgvKAk0NBdh8mrQyQvcUlLBIQBCm +l7wppt6maQHUNEPQSwIDAQABoz8wPTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw +AwEB/zAdBgNVHQ4EFgQU+F4ho6ijFeb4tRG7/kIEXU2OgnowDQYJKoZIhvcNAQEF +BQADggEBACe9FJayK6bXkJQrilBFMh75QPdFOks9PJuo86OMUlBDZGYFTCh9Arex +N3KYCnAEzazYIALwr7eASJJDIQMu1Q+pkx/7ACde4kP47F27M2rm+v5HnGooCLz2 +s7Fe/WUycTQqgwF5lNp03m1ce/TvovgkEZeVN5wM/7+SsZLJGDigXGeq48j2g2hn +8OckX9Ciyo0U3/1IVeigNBisiaOlsHSZOEPBZQRiZULob+NVbXVPo8nM1OyP3aHI +LQex1yYcCr9m93nOiZyKkur3Uedf1yMTBe+fflnPFKGYnVqvTGXCKVdHzQBfpILA +AuaC+5ykZhSiSMf8nmL2oPMcLO7YQw4= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBF +MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQL +ExNUcnVzdGlzIEZQUyBSb290IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTEx +MzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNVBAoTD1RydXN0aXMgTGltaXRlZDEc +MBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQRUN+ +AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihH +iTHcDnlkH5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjj +vSkCqPoc4Vu5g6hBSLwacY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA +0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zto3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlB +OrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEAAaNTMFEwDwYDVR0TAQH/ +BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAdBgNVHQ4E +FgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01 +GX2cGE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmW +zaD+vkAMXBJV+JOCyinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP4 +1BIy+Q7DsdwyhEQsb8tGD+pmQQ9P8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZE +f1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHVl/9D7S3B2l0pKoU/rGXuhg8F +jZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYliB6XzCGcKQEN +ZetX2fNXlrtIzYE= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIGUTCCBTmgAwIBAgIEPLVPQDANBgkqhkiG9w0BAQUFADBmMRIwEAYDVQQKEwli +ZVRSVVNUZWQxGzAZBgNVBAsTEmJlVFJVU1RlZCBSb290IENBczEzMDEGA1UEAxMq +YmVUUlVTVGVkIFJvb3QgQ0EgLSBFbnRydXN0IEltcGxlbWVudGF0aW9uMB4XDTAy +MDQxMTA4MjQyN1oXDTIyMDQxMTA4NTQyN1owZjESMBAGA1UEChMJYmVUUlVTVGVk +MRswGQYDVQQLExJiZVRSVVNUZWQgUm9vdCBDQXMxMzAxBgNVBAMTKmJlVFJVU1Rl +ZCBSb290IENBIC0gRW50cnVzdCBJbXBsZW1lbnRhdGlvbjCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBALr0RAOqEmq1Q+xVkrYwfTVXDNvzDSduTPdQqJtO +K2/b9a0cS12zqcH+e0TrW6MFDR/FNCswACnxeECypP869AGIF37m1CbTukzqMvtD +d5eHI8XbQ6P1KqNRXuE70mVpflUVm3rnafdE4Fe1FehmYA8NA/uCjqPoEXtsvsdj +DheT389Lrm5zdeDzqrmkwAkbhepxKYhBMvnwKg5sCfJ0a2ZsUhMfGLzUPvfYbiCe +yv78IZTuEyhL11xeDGbu6bsPwTSxfwh28z0mcMmLJR1iJAzqHHVOwBLkuhMdMCkt +VjMFu5dZfsZJT4nXLySotohAtWSSU1Yk5KKghbNekLQSM80CAwEAAaOCAwUwggMB +MIIBtwYDVR0gBIIBrjCCAaowggGmBg8rBgEEAbE+AAACCSiDkTEwggGRMIIBSQYI +KwYBBQUHAgIwggE7GoIBN1JlbGlhbmNlIG9uIG9yIHVzZSBvZiB0aGlzIENlcnRp +ZmljYXRlIGNyZWF0ZXMgYW4gYWNrbm93bGVkZ21lbnQgYW5kIGFjY2VwdGFuY2Ug +b2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0 +aW9ucyBvZiB1c2UsIHRoZSBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu +dCBhbmQgdGhlIFJlbHlpbmcgUGFydHkgQWdyZWVtZW50LCB3aGljaCBjYW4gYmUg +Zm91bmQgYXQgdGhlIGJlVFJVU1RlZCB3ZWIgc2l0ZSwgaHR0cHM6Ly93d3cuYmV0 +cnVzdGVkLmNvbS9wcm9kdWN0c19zZXJ2aWNlcy9pbmRleC5odG1sMEIGCCsGAQUF +BwIBFjZodHRwczovL3d3dy5iZXRydXN0ZWQuY29tL3Byb2R1Y3RzX3NlcnZpY2Vz +L2luZGV4Lmh0bWwwEQYJYIZIAYb4QgEBBAQDAgAHMIGJBgNVHR8EgYEwfzB9oHug +eaR3MHUxEjAQBgNVBAoTCWJlVFJVU1RlZDEbMBkGA1UECxMSYmVUUlVTVGVkIFJv +b3QgQ0FzMTMwMQYDVQQDEypiZVRSVVNUZWQgUm9vdCBDQSAtIEVudHJ1c3QgSW1w +bGVtZW50YXRpb24xDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMjAwMjA0MTEw +ODI0MjdagQ8yMDIyMDQxMTA4NTQyN1owCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaA +FH1w5a44iwY/qhwaj/nPJDCqhIQWMB0GA1UdDgQWBBR9cOWuOIsGP6ocGo/5zyQw +qoSEFjAMBgNVHRMEBTADAQH/MB0GCSqGSIb2fQdBAAQQMA4bCFY2LjA6NC4wAwIE +kDANBgkqhkiG9w0BAQUFAAOCAQEAKrgXzh8QlOu4mre5X+za95IkrNySO8cgjfKZ +5V04ocI07cUTWVwFtStPYZuR+0H8/NU8TZh2BvWBfevdkObRVlTa4y0MnxEylCIB +evZsLHRnBMylj44ss0O1lKLQfelifwa+JwGDnjr9iu6YQ0pr17WXOzq/T220Y/oz +ADQuLW2WyXvKmWO6vvT2MKAtmJbpVkQFqUSjYRDrgqFnXbxdJ3Wqiig2KjiS2d2k +XgClzMx8KSreKJCrt+G2/30lC0DYqjSjLd4H61/OCt3Kfjp9JsFiaDrmLzfzgYYh +xKlkqu9FNtEaZnz46TfW1mG+oq1I59/mdP7TbX3SJdysYlep9w== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEuzCCA6OgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJVUzET +MBEGA1UEChMKQXBwbGUgSW5jLjEmMCQGA1UECxMdQXBwbGUgQ2VydGlmaWNhdGlv +biBBdXRob3JpdHkxFjAUBgNVBAMTDUFwcGxlIFJvb3QgQ0EwHhcNMDYwNDI1MjE0 +MDM2WhcNMzUwMjA5MjE0MDM2WjBiMQswCQYDVQQGEwJVUzETMBEGA1UEChMKQXBw +bGUgSW5jLjEmMCQGA1UECxMdQXBwbGUgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkx +FjAUBgNVBAMTDUFwcGxlIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw +ggEKAoIBAQDkkakJH5HbHkdQ6wXtXnmELes2oldMVeyLGYne+Uts9QerIjAC6Bg+ ++FAJ039BqJj50cpmnCRrEdCju+QbKsMflZ56DKRHi1vUFjczy8QPTc4UadHJGXL1 +XQ7Vf1+b8iUDulWPTV0N8WQ1IxVLFVkds5T39pyez1C6wVhQZ48ItCD3y6wsIG9w +tj8BMIy3Q88PnT3zK0koGsj+zrW5DtleHNbLPbU6rfQPDgCSC7EhFi501TwN22IW +q6NxkkdTVcGvL0Gz+PvjcM3mo0xFfh9Ma1CWQYnEdGILEINBhzOKgbEwWOxaBDKM +aLOPHd5lc/9nXmW8Sdh2nzMUZaF3lMktAgMBAAGjggF6MIIBdjAOBgNVHQ8BAf8E +BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUK9BpR5R2Cf70a40uQKb3 +R01/CF4wHwYDVR0jBBgwFoAUK9BpR5R2Cf70a40uQKb3R01/CF4wggERBgNVHSAE +ggEIMIIBBDCCAQAGCSqGSIb3Y2QFATCB8jAqBggrBgEFBQcCARYeaHR0cHM6Ly93 +d3cuYXBwbGUuY29tL2FwcGxlY2EvMIHDBggrBgEFBQcCAjCBthqBs1JlbGlhbmNl +IG9uIHRoaXMgY2VydGlmaWNhdGUgYnkgYW55IHBhcnR5IGFzc3VtZXMgYWNjZXB0 +YW5jZSBvZiB0aGUgdGhlbiBhcHBsaWNhYmxlIHN0YW5kYXJkIHRlcm1zIGFuZCBj +b25kaXRpb25zIG9mIHVzZSwgY2VydGlmaWNhdGUgcG9saWN5IGFuZCBjZXJ0aWZp +Y2F0aW9uIHByYWN0aWNlIHN0YXRlbWVudHMuMA0GCSqGSIb3DQEBBQUAA4IBAQBc +NplMLXi37Yyb3PN3m/J20ncwT8EfhYOFG5k9RzfyqZtAjizUsZAS2L70c5vu0mQP +y3lPNNiiPvl4/2vIB+x9OYOLUyDTOMSxv5pPCmv/K/xZpwUJfBdAVhEedNO3iyM7 +R6PVbyTi69G3cN8PReEnyvFteO3ntRcXqNx+IjXKJdXZD9Zr1KIkIxH3oayPc4Fg +xhtbCS+SsvhESPBgOJ4V9T0mZyCKM2r3DYLP3uujL/lTaltkwGMzd/c6ByxW69oP +IQ7aunMZT7XZNn/Bh1XZp5m5MkL72NVxnn6hUrcbvZNCJBIqxw8dtk2cXmPIS4AX +UKqK1drk/NAJBzewdXUh +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEZjCCA06gAwIBAgIQRL4Mi1AAJLQR0zYt4LNfGzANBgkqhkiG9w0BAQUFADCB +lTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug +Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho +dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHTAbBgNVBAMTFFVUTi1VU0VSRmlyc3Qt +T2JqZWN0MB4XDTk5MDcwOTE4MzEyMFoXDTE5MDcwOTE4NDAzNlowgZUxCzAJBgNV +BAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxHjAc +BgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMYaHR0cDovL3d3 +dy51c2VydHJ1c3QuY29tMR0wGwYDVQQDExRVVE4tVVNFUkZpcnN0LU9iamVjdDCC +ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6qgT+jo2F4qjEAVZURnicP +HxzfOpuCaDDASmEd8S8O+r5596Uj71VRloTN2+O5bj4x2AogZ8f02b+U60cEPgLO +KqJdhwQJ9jCdGIqXsqoc/EHSoTbL+z2RuufZcDX65OeQw5ujm9M89RKZd7G3CeBo +5hy485RjiGpq/gt2yb70IuRnuasaXnfBhQfdDWy/7gbHd2pBnqcP1/vulBe3/IW+ +pKvEHDHd17bR5PDv3xaPslKT16HUiaEHLr/hARJCHhrh2JU022R5KP+6LhHC5ehb +kkj7RwvCbNqtMoNB86XlQXD9ZZBt+vpRxPm9lisZBCzTbafc8H9vg2XiaquHhnUC +AwEAAaOBrzCBrDALBgNVHQ8EBAMCAcYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E +FgQU2u1kdBScFDyr3ZmpvVsoTYs8ydgwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDov +L2NybC51c2VydHJ1c3QuY29tL1VUTi1VU0VSRmlyc3QtT2JqZWN0LmNybDApBgNV +HSUEIjAgBggrBgEFBQcDAwYIKwYBBQUHAwgGCisGAQQBgjcKAwQwDQYJKoZIhvcN +AQEFBQADggEBAAgfUrE3RHjb/c652pWWmKpVZIC1WkDdIaXFwfNfLEzIR1pp6ujw +NTX00CXzyKakh0q9G7FzCL3Uw8q2NbtZhncxzaeAFK4T7/yxSPlrJSUtUbYsbUXB +mMiKVl0+7kNOPmsnjtA6S4ULX9Ptaqd1y9Fahy85dRNacrACgZ++8A+EVCBibGnU +4U3GDZlDAQ0Slox4nb9QorFEqmrPF3rPbw/U+CRVX/A0FklmPlBGyWNxODFiuGK5 +81OtbLUrohKqGU8J2l7nk8aOFAj+8DCAGKCGhU3IfdeLA/5u1fedFqySLKAj5ZyR +Uh+U3xeUc8OzwcFxBSAAeL0TUh2oPs0AH8g= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIH9zCCB2CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARQxCzAJBgNVBAYTAkVT +MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE +ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE +ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEvMC0GA1UECxMm +SVBTIENBIENMQVNFQTMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLzAtBgNVBAMT +JklQUyBDQSBDTEFTRUEzIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZI +hvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMwHhcNMDExMjI5MDEwNzUwWhcNMjUxMjI3 +MDEwNzUwWjCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ +BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hp +bmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5G +LiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTMgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUEzIENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMw +gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAO6AAPYaZC6tasiDsYun7o/ZttvN +G7uGBiJ2MwwSbUhWYdLcgiViL5/SaTBlA0IjWLxH3GvWdV0XPOH/8lhneaDBgbHU +VqLyjRGZ/fZ98cfEXgIqmuJKtROKAP2Md4bm15T1IHUuDky/dMQ/gT6DtKM4Ninn +6Cr1jIhBqoCm42zvAgMBAAGjggRTMIIETzAdBgNVHQ4EFgQUHp9XUEe2YZM50yz8 +2l09BXW3mQIwggFGBgNVHSMEggE9MIIBOYAUHp9XUEe2YZM50yz82l09BXW3mQKh +ggEcpIIBGDCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ +BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hp +bmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5G +LiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTMgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUEzIENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOC +AQAwDAYDVR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUF +BwMBBggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYB +BAGCNwIBFQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglg +hkgBhvhCAQEEBAMCAAcwGgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1Ud +EgQTMBGBD2lwc0BtYWlsLmlwcy5lczBCBglghkgBhvhCAQ0ENRYzQ0xBU0VBMyBD +QSBDZXJ0aWZpY2F0ZSBpc3N1ZWQgYnkgaHR0cDovL3d3dy5pcHMuZXMvMCkGCWCG +SAGG+EIBAgQcFhpodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyLzA7BglghkgBhvhC +AQQELhYsaHR0cDovL3d3dy5pcHMuZXMvaXBzMjAwMi9pcHMyMDAyQ0xBU0VBMy5j +cmwwQAYJYIZIAYb4QgEDBDMWMWh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmV2 +b2NhdGlvbkNMQVNFQTMuaHRtbD8wPQYJYIZIAYb4QgEHBDAWLmh0dHA6Ly93d3cu +aXBzLmVzL2lwczIwMDIvcmVuZXdhbENMQVNFQTMuaHRtbD8wOwYJYIZIAYb4QgEI +BC4WLGh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcG9saWN5Q0xBU0VBMy5odG1s +MHUGA1UdHwRuMGwwMqAwoC6GLGh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvaXBz +MjAwMkNMQVNFQTMuY3JsMDagNKAyhjBodHRwOi8vd3d3YmFjay5pcHMuZXMvaXBz +MjAwMi9pcHMyMDAyQ0xBU0VBMy5jcmwwLwYIKwYBBQUHAQEEIzAhMB8GCCsGAQUF +BzABhhNodHRwOi8vb2NzcC5pcHMuZXMvMA0GCSqGSIb3DQEBBQUAA4GBAEo9IEca +2on0eisxeewBwMwB9dbB/MjD81ACUZBYKp/nNQlbMAqBACVHr9QPDp5gJqiVp4MI +3y2s6Q73nMify5NF8bpqxmdRSmlPa/59Cy9SKcJQrSRE7SOzSMtEQMEDlQwKeAYS +AfWRMS1Jjbs/RU4s4OjNtckUFQzjB4ObJnXv +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv b3QgQ0EgMjAeFw0wNjExMjQxODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNV @@ -2712,110 +3325,1084 @@ ohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y 8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x -GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv -b3QgQ0EgMzAeFw0wNjExMjQxOTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNV -BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W -YWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDM -V0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNggDhoB -4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUr -H556VOijKTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd -8lyyBTNvijbO0BNO/79KDDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9Cabwv -vWhDFlaJKjdhkf2mrk7AyxRllDdLkgbvBNDInIjbC3uBr7E9KsRlOni27tyAsdLT -mZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwpp5ijJUMv7/FfJuGITfhe -btfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8nT8KKdjc -T5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDt -WAEXMJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZ -c6tsgLjoC2SToJyMGf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A -4iLItLRkT9a6fUg+qGkM17uGcclzuD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYD -VR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHTBgkrBgEEAb5YAAMwgcUwgZMG -CCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNvbnN0 -aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0 -aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu -dC4wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2Nw -czALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4G -A1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4ywLQoUmkRzBFMQswCQYDVQQGEwJC -TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UEAxMSUXVvVmFkaXMg -Um9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZVqyM0 -7ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSem -d1o417+shvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd -+LJ2w/w4E6oM3kJpK27zPOuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B -4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadN -t54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp8kokUvd0/bpO5qgdAm6x -DYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBCbjPsMZ57 -k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6s -zHXug/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0j -Wy10QJLZYxkNc91pvGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeT -mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK -4SVhM7JZG+Ju1zdXtg2pEto= +MIIDPDCCAqWgAwIBAgIQEj3w59oqIkekOIngiu7JZzANBgkqhkiG9w0BAQUFADCB +0TELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ +Q2FwZSBUb3duMRowGAYDVQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYGA1UECxMf +Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEkMCIGA1UEAxMbVGhhd3Rl +IFBlcnNvbmFsIEZyZWVtYWlsIENBMSswKQYJKoZIhvcNAQkBFhxwZXJzb25hbC1m +cmVlbWFpbEB0aGF3dGUuY29tMB4XDTk2MDEwMTAwMDAwMFoXDTIxMDEwMTIzNTk1 +OVowgdExCzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNV +BAcTCUNhcGUgVG93bjEaMBgGA1UEChMRVGhhd3RlIENvbnN1bHRpbmcxKDAmBgNV +BAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNpb24xJDAiBgNVBAMTG1Ro +YXd0ZSBQZXJzb25hbCBGcmVlbWFpbCBDQTErMCkGCSqGSIb3DQEJARYccGVyc29u +YWwtZnJlZW1haWxAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC +gYEA1GnX1LCUZFtx6UfYDFG26nKRsIRefS0Nj3sS34UldSh0OkIsYyeflXtL734Z +hx2G6qPduc6WZBrCFG5ErHzmj+hND3EfQDimAKOHePb5lIZererAXnbr2RSjXW56 +fAylS1V/Bhkpf56aJtVquzgkCGqYx7Hao5iR/Xnb5VrEHLkCAwEAAaMTMBEwDwYD +VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQAemGDU5fJUYLA9GoFkR/db +o9lvwykLp9KpgUn2w22FFChFRAH0cVyVLhQPGivRqWvBX2c9FvFyIK++FsoOMF/J +y6WTLMNnVB5yIoojdmyUHVFSbJ3E4EcC18y/8IB7GG4l3GJh1qb+wR1/2bP9jVxF +EFrGZWSa6yz1A0/WSGL7Lg== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBI -MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x -FzAVBgNVBAMTDlNlY3VyZVRydXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIz -MTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENv -cnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCCASIwDQYJKoZIhvcN -AQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQXOZEz -Zum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO -0gMdA+9tDWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIao -wW8xQmxSPmjL8xk037uHGFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj -7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b01k/unK8RCSc43Oz969XL0Imnal0ugBS -8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmHursCAwEAAaOBnTCBmjAT -BgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB -/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCeg -JYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGC -NxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt3 -6Z3q059c4EVlew3KW+JwULKUBRSuSceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/ -3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHfmbx8IVQr5Fiiu1cprp6poxkm -D5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZnMUFdAvnZyPS -CPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR -3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE= +MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE +BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz +dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL +MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp +cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y +YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua +kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL +QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp +6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG +yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i +QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ +KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO +tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu +QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ +Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u +olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48 +x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBK -MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x -GTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkx -MjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3Qg -Q29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwggEiMA0GCSqG -SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jxYDiJ -iQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa -/FHtaMbQbqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJ -jnIFHovdRIWCQtBJwB1g8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnI -HmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYVHDGA76oYa8J719rO+TMg1fW9ajMtgQT7 -sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi0XPnj3pDAgMBAAGjgZ0w -gZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQF -MAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCsw -KaAnoCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsG -AQQBgjcVAQQDAgEAMA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0L -URYD7xh8yOOvaliTFGCRsoTciE6+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXO -H0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cnCDpOGR86p1hcF895P4vkp9Mm -I50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/53CYNv6ZHdAbY -iNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc -f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW +MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkEx +FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD +VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv +biBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEm +MCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wHhcNOTYwODAx +MDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT +DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3 +dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNl +cyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3 +DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD +gY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl/Kj0R1HahbUgdJSGHg91 +yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg71CcEJRCX +L+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGj +EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG +7oWDTSEwjsrZqG9JGubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6e +QNuozDJ0uW8NxuOzRAvZim+aKZuZGCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZ +qdq5snUb9kLy78fyGPmJvKP/iiMucEc= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl -MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp -U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw -NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE -ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp -ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3 -DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf -8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN -+lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0 -X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa -K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA -1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G -A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR -zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0 -YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD -bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w -DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3 -L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D -eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl -xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp -VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY -WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q= +MIIEUDCCA7mgAwIBAgIJAN4ppNGwj6yIMA0GCSqGSIb3DQEBBAUAMIHMMQswCQYD +VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j +aXNjbzEZMBcGA1UEChMQTGluZGVuIExhYiwgSW5jLjEpMCcGA1UECxMgTGluZGVu +IExhYiBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxKTAnBgNVBAMTIExpbmRlbiBMYWIg +Q2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYJKoZIhvcNAQkBFhBjYUBsaW5kZW5s +YWIuY29tMB4XDTA1MDQyMTAyNDAzMVoXDTI1MDQxNjAyNDAzMVowgcwxCzAJBgNV +BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp +c2NvMRkwFwYDVQQKExBMaW5kZW4gTGFiLCBJbmMuMSkwJwYDVQQLEyBMaW5kZW4g +TGFiIENlcnRpZmljYXRlIEF1dGhvcml0eTEpMCcGA1UEAxMgTGluZGVuIExhYiBD +ZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgkqhkiG9w0BCQEWEGNhQGxpbmRlbmxh +Yi5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKXh1MThucdTbMg9bYBO +rAm8yWns32YojB0PRfbq8rUjepEhTm3/13s0u399Uc202v4ejcGhkIDWJZd2NZMF +oKrhmRfxGHSKPCuFaXC3jh0lRECj7k8FoPkcmaPjSyodrDFDUUuv+C06oYJoI+rk +8REyal9NwgHvqCzOrZtiTXAdAgMBAAGjggE2MIIBMjAdBgNVHQ4EFgQUO1zK2e1f +1wO1fHAjq6DTJobKDrcwggEBBgNVHSMEgfkwgfaAFDtcytntX9cDtXxwI6ug0yaG +yg63oYHSpIHPMIHMMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEW +MBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQTGluZGVuIExhYiwgSW5j +LjEpMCcGA1UECxMgTGluZGVuIExhYiBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxKTAn +BgNVBAMTIExpbmRlbiBMYWIgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYJKoZI +hvcNAQkBFhBjYUBsaW5kZW5sYWIuY29tggkA3imk0bCPrIgwDAYDVR0TBAUwAwEB +/zANBgkqhkiG9w0BAQQFAAOBgQA/ZkgfvwHYqk1UIAKZS3kMCxz0HvYuEQtviwnu +xA39CIJ65Zozs28Eg1aV9/Y+Of7TnWhW+U3J3/wD/GghaAGiKK6vMn9gJBIdBX/9 +e6ef37VGyiOEFFjnUIbuk0RWty0orN76q/lI/xjCi15XSA/VSq2j4vmnwfZcPTDu +glmQ1A== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv +b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG +EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl +cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c +JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP +mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+ +wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4 +VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/ +AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB +AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW +BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun +pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC +dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf +fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm +NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx +H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe ++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEuDCCA6CgAwIBAgIBBDANBgkqhkiG9w0BAQUFADCBtDELMAkGA1UEBhMCQlIx +EzARBgNVBAoTCklDUC1CcmFzaWwxPTA7BgNVBAsTNEluc3RpdHV0byBOYWNpb25h +bCBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWFjYW8gLSBJVEkxETAPBgNVBAcTCEJy +YXNpbGlhMQswCQYDVQQIEwJERjExMC8GA1UEAxMoQXV0b3JpZGFkZSBDZXJ0aWZp +Y2Fkb3JhIFJhaXogQnJhc2lsZWlyYTAeFw0wMTExMzAxMjU4MDBaFw0xMTExMzAy +MzU5MDBaMIG0MQswCQYDVQQGEwJCUjETMBEGA1UEChMKSUNQLUJyYXNpbDE9MDsG +A1UECxM0SW5zdGl0dXRvIE5hY2lvbmFsIGRlIFRlY25vbG9naWEgZGEgSW5mb3Jt +YWNhbyAtIElUSTERMA8GA1UEBxMIQnJhc2lsaWExCzAJBgNVBAgTAkRGMTEwLwYD +VQQDEyhBdXRvcmlkYWRlIENlcnRpZmljYWRvcmEgUmFpeiBCcmFzaWxlaXJhMIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPMudwX/hvm+Uh2b/lQAcHVA +isamaLkWdkwP9/S/tOKIgRrL6Oy+ZIGlOUdd6uYtk9Ma/3pUpgcfNAj0vYm5gsyj +Qo9emsc+x6m4VWwk9iqMZSCK5EQkAq/Ut4n7KuLE1+gdftwdIgxfUsPt4CyNrY50 +QV57KM2UT8x5rrmzEjr7TICGpSUAl2gVqe6xaii+bmYR1QrmWaBSAG59LrkrjrYt +bRhFboUDe1DK+6T8s5L6k8c8okpbHpa9veMztDVC9sPJ60MWXh6anVKo1UcLcbUR +yEeNvZneVRKAAU6ouwdjDvwlsaKydFKwed0ToQ47bmUKgcm+wV3eTRk36UOnTwID +AQABo4HSMIHPME4GA1UdIARHMEUwQwYFYEwBAQAwOjA4BggrBgEFBQcCARYsaHR0 +cDovL2FjcmFpei5pY3BicmFzaWwuZ292LmJyL0RQQ2FjcmFpei5wZGYwPQYDVR0f +BDYwNDAyoDCgLoYsaHR0cDovL2FjcmFpei5pY3BicmFzaWwuZ292LmJyL0xDUmFj +cmFpei5jcmwwHQYDVR0OBBYEFIr68VeEERM1kEL6V0lUaQ2kxPA3MA8GA1UdEwEB +/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAZA5c1 +U/hgIh6OcgLAfiJgFWpvmDZWqlV30/bHFpj8iBobJSm5uDpt7TirYh1Uxe3fQaGl +YjJe+9zd+izPRbBqXPVQA34EXcwk4qpWuf1hHriWfdrx8AcqSqr6CuQFwSr75Fos +SzlwDADa70mT7wZjAmQhnZx2xJ6wfWlT9VQfS//JYeIc7Fue2JNLd00UOSMMaiK/ +t79enKNHEA2fupH3vEigf5Eh4bVAN5VohrTm6MY53x7XQZZr1ME7a55lFEnSeT0u +mlOAjR2mAbvSM5X5oSZNrmetdzyTj2flCM8CC7MLab0kkdngRIlUBGHF1/S5nmPb +K+9A46sd33oqK8n8 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJKUDEO +MAwGA1UEChMFTEdQS0kxGjAYBgNVBAsTEUFwcGxpY2F0aW9uIENBIEcyMB4XDTA2 +MDMzMTE1MDAwMFoXDTE2MDMzMTE0NTk1OVowOTELMAkGA1UEBhMCSlAxDjAMBgNV +BAoTBUxHUEtJMRowGAYDVQQLExFBcHBsaWNhdGlvbiBDQSBHMjCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBALk1xhD422jbB8RATLAdHjbcw0H2z1UVbQh/ +XMZoVeXnV/GWUebhTXgPbkAVcDtl/hHf59PWWDU74Z8C/JRSRi6znmCbAp7JgtL2 +464JT4REtmKbAFFouDqt7GTRMkvplESDtA7OIYlrsDbAmMZLnMI+W2AqCTErLatM +3rGg/VhWwoMdILzEhAmHe6iVl8YljoPgPpMN0cd9c6mo/BkAQC4iuHozQfV4/Vpx +54LZSIhc7KiFhy1tgIlnGmm+EMBaju2IfT5vLDhrN85H2KIxMN5+U2Vsi4ZTQSBs +vUilfq8AWlYSWIHR3IlZ+bXu+E2a2EQpi3mn9yKq6nxctBaIIA0CAwEAAaOBsjCB +rzAdBgNVHQ4EFgQUf7hdjsQYa8Z9zC7prs405xdd4KEwDgYDVR0PAQH/BAQDAgEG +MEwGA1UdHwRFMEMwQaA/oD2kOzA5MQswCQYDVQQGEwJKUDEOMAwGA1UEChMFTEdQ +S0kxGjAYBgNVBAsTEUFwcGxpY2F0aW9uIENBIEcyMA8GA1UdEwEB/wQFMAMBAf8w +HwYDVR0jBBgwFoAUf7hdjsQYa8Z9zC7prs405xdd4KEwDQYJKoZIhvcNAQEFBQAD +ggEBADzYczZABkhKVBn1J0g5JaVuQue2zRvLOTS3m+xPKr535MqE/B3rmyJA1fT7 +aIdy/Eddag5SSuO1XUjGIpbmM21tq/bN18skWoyoRZ4+YYJ9lNUF8Bo1X3EvLlS1 +QQXvhg1S75yYG/EsTDrR84bTjD56L4ZFjoMyJlu/U8oOUVbcmsJaMBkNp57Vqpsg +OWl4IfSXbdEOEUwu0xtasPmXeFwqj1Jl7kxCJcI3MA5tKzWUgwbor0U7BGanMLv5 +4CE7Y259RF06alPvERck/VSyWmxzViHJbC2XpEKzJ2EFIWNt6ii8TxpvQtyYq1XT +HhvAkj+bweY7F1bixJhDJe62ywA= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsx +CzAJBgNVBAYTAkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRp +ZmljYWNpw7NuIERpZ2l0YWwgLSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwa +QUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4wHhcNMDYxMTI3MjA0NjI5WhcNMzAw +NDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+U29jaWVkYWQgQ2Ft +ZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJhIFMu +QS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkq +hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeG +qentLhM0R7LQcNzJPNCNyu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzL +fDe3fezTf3MZsGqy2IiKLUV0qPezuMDU2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQ +Y5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU34ojC2I+GdV75LaeHM/J4 +Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP2yYe68yQ +54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+b +MMCm8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48j +ilSH5L887uvDdUhfHjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++Ej +YfDIJss2yKHzMI+ko6Kh3VOz3vCaMh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/zt +A/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK5lw1omdMEWux+IBkAC1vImHF +rEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1bczwmPS9KvqfJ +pxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE +AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCB +lTCBkgYEVR0gADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFy +YS5jb20vZHBjLzBaBggrBgEFBQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW50 +7WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2UgcHVlZGVuIGVuY29udHJhciBlbiBs +YSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEfAygPU3zmpFmps4p6 +xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuXEpBc +unvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/ +Jre7Ir5v/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dp +ezy4ydV/NgIlqmjCMRW3MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42 +gzmRkBDI8ck1fj+404HGIGQatlDCIaR43NAvO2STdPCWkPHv+wlaNECW8DYSwaN0 +jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wkeZBWN7PGKX6jD/EpOe9+ +XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f/RWmnkJD +W2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/ +RL5hRqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35r +MDOhYil/SrnhLecUIw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxk +BYn8eNZcLCZDqQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0 +IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz +BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y +aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG +9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIyMjM0OFoXDTE5MDYy +NTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y +azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs +YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw +Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl +cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9Y +LqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIiGQj4/xEjm84H9b9pGib+ +TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCmDuJWBQ8Y +TfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0 +LBwGlN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLW +I8sogTLDAHkY7FkXicnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPw +nXS3qT6gpf+2SQMT2iLM7XGCK5nPOrf1LXLI +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDKTCCApKgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBzzELMAkGA1UEBhMCWkEx +FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYD +VQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBT +ZXJ2aWNlcyBEaXZpc2lvbjEjMCEGA1UEAxMaVGhhd3RlIFBlcnNvbmFsIFByZW1p +dW0gQ0ExKjAoBgkqhkiG9w0BCQEWG3BlcnNvbmFsLXByZW1pdW1AdGhhd3RlLmNv +bTAeFw05NjAxMDEwMDAwMDBaFw0yMDEyMzEyMzU5NTlaMIHPMQswCQYDVQQGEwJa +QTEVMBMGA1UECBMMV2VzdGVybiBDYXBlMRIwEAYDVQQHEwlDYXBlIFRvd24xGjAY +BgNVBAoTEVRoYXd0ZSBDb25zdWx0aW5nMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9u +IFNlcnZpY2VzIERpdmlzaW9uMSMwIQYDVQQDExpUaGF3dGUgUGVyc29uYWwgUHJl +bWl1bSBDQTEqMCgGCSqGSIb3DQEJARYbcGVyc29uYWwtcHJlbWl1bUB0aGF3dGUu +Y29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJZtn4B0TPuYwu8KHvE0Vs +Bd/eJxZRNkERbGw77f4QfRKe5ZtCmv5gMcNmt3M6SK5O0DI3lIi1DbbZ8/JE2dWI +Et12TfIa/G8jHnrx2JhFTgcQ7xZC0EN1bUre4qrJMf8fAHB8Zs8QJQi6+u4A6UYD +ZicRFTuqW/KY3TZCstqIdQIDAQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqG +SIb3DQEBBAUAA4GBAGk2ifc0KjNyL2071CKyuG+axTZmDhs8obF1Wub9NdP4qPIH +b4Vnjt4rueIXsDqg8A6iAJrf8xQVbrvIhVqYgPn/vnQdPfP+MCXRNzRn+qVxeTBh +KXLA4CxM+1bkOqhv5TJZUtt1KFBZDPgLGeSs2a+WjS9Q2wfD6h+rM+D1KzGJ +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb +MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow +GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj +YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL +MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE +BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM +GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua +BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe +3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4 +YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR +rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm +ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU +oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF +MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v +QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t +b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF +AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q +GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz +Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2 +G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi +l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3 +smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICPDCCAaUCED9pHoGc8JpK83P/uUii5N0wDQYJKoZIhvcNAQEFBQAwXzELMAkG +A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz +cyAxIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2 +MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV +BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAxIFB1YmxpYyBQcmlt +YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN +ADCBiQKBgQDlGb9to1ZhLZlIcfZn3rmN67eehoAKkQ76OCWvRoiC5XOooJskXQ0f +zGVuDLDQVoQYh5oGmxChc9+0WDlrbsH2FdWoqD+qEgaNMax/sDTXjzRniAnNFBHi +TkVWaR94AoDa3EeRKbs2yWNcxeDXLYd7obcysHswuiovMaruo2fa2wIDAQABMA0G +CSqGSIb3DQEBBQUAA4GBAFgVKTk8d6PaXCUDfGD67gmZPCcQcMgMCeazh88K4hiW +NWLMv5sneYlfycQJ9M61Hd8qveXbhpxoJeUwfLaJFf5n0a3hUKw8fGJLj7qE1xIV +Gx/KXQ/BUpQqEZnae88MNhPVNdwQGVnqlMEAv3WP2fr9dgTbYruQagPZRjXZ+Hxb +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJD +TjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2 +MDcwOTE0WhcNMjcwNDE2MDcwOTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMF +Q05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwggEiMA0GCSqGSIb3DQEBAQUAA4IB +DwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzDo+/hn7E7SIX1mlwh +IhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tizVHa6 +dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZO +V/kbZKKTVrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrC +GHn2emU1z5DrvTOTn1OrczvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gN +v7Sg2Ca+I19zN38m5pIEo3/PIKe38zrKy5nLAgMBAAGjczBxMBEGCWCGSAGG+EIB +AQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscCwQ7vptU7ETAPBgNVHRMB +Af8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991SlgrHAsEO +76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnK +OOK5Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvH +ugDnuL8BV8F3RTIMO/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7Hgvi +yJA/qIYM/PmLXoXLT1tLYhFHxUV8BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fL +buXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2G8kS1sHNzYDzAgE8yGnLRUhj +2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5mmxE= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE +BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz +dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL +MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp +cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP +Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr +ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL +MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1 +yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr +VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/ +nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ +KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG +XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj +vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt +Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g +N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC +nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT +MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i +YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG +EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg +R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9 +9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq +fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv +iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU +1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+ +bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW +MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA +ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l +uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn +Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS +tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF +PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un +hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV +5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEc +MBoGA1UEChMTSmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRp +b25DQTAeFw0wNzEyMTIxNTAwMDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYT +AkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zlcm5tZW50MRYwFAYDVQQLEw1BcHBs +aWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp23gdE6H +j6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4fl+K +f5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55 +IrmTwcrNwVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cw +FO5cjFW6WY2H/CPek9AEjP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDiht +QWEjdnjDuGWk81quzMKq2edY3rZ+nYVunyoKb58DKTCXKB28t89UKU5RMfkntigm +/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRUWssmP3HMlEYNllPqa0jQ +k/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNVBAYTAkpQ +MRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOC +seODvOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD +ggEBADlqRHZ3ODrso2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJ +hyzjVOGjprIIC8CFqMjSnHH2HZ9g/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+ +eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYDio+nEhEMy/0/ecGc/WLuo89U +DNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmWdupwX3kSa+Sj +B1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL +rosot4LKGAfmt1t06SAZf7IbiVQ= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEW +MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFs +IENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQG +EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3Qg +R2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvPE1A +PRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/NTL8 +Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hL +TytCOb1kLUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL +5mkWRxHCJ1kDs6ZgwiFAVvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7 +S4wMcoKK+xfNAGw6EzywhIdLFnopsk/bHdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe +2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE +FHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNHK266ZUap +EBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6td +EPx7srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv +/NgdRN3ggX+d6YvhZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywN +A0ZF66D0f0hExghAzN4bcLUprbqLOzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0 +abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkCx1YAzUm5s2x7UwQa4qjJqhIF +I8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqFH4z1Ir+rzoPz +4iIprn2DQKi6bA== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIE9zCCA9+gAwIBAgIEPL/xoTANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJQ +TDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2Vu +dHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MSAwHgYDVQQDExdDQyBTaWduZXQgLSBQ +Q0EgS2xhc2EgMjAeFw0wMjA0MTkxMDI5NTNaFw0xNzA0MTgxMjUzMDdaMHUxCzAJ +BgNVBAYTAlBMMR8wHQYDVQQKExZUUCBJbnRlcm5ldCBTcC4geiBvLm8uMSQwIgYD +VQQLExtDZW50cnVtIENlcnR5ZmlrYWNqaSBTaWduZXQxHzAdBgNVBAMTFkNDIFNp +Z25ldCAtIENBIEtsYXNhIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQCqgLJuQqY4yavbSgHg8CyfKTx4BokNSDOVz4eD9vptUr11Kqd06ED1hlH7Sg0g +oBFAfntNU/QTKwSBaNuime7C4sSEdgsKrPoAhGb4Mq8y7Ty7RqZz7mkzNMqzL2L2 +U4yQ2QjvpH8MH0IBqOWEcpSkpwnrCDImRoTfd+YlZWKi2JceQixUUYIQ45Ox8+x8 +hHbvvZdgqtcvo8PW27qoHkp/7hMuJ44kDAGrmxffBXl/OBRZp0uO1CSLcMcVJzyr +2phKhy406MYdWrtNPEluGs0GFDzd0nrIctiWAO4cmct4S72S9Q6e//0GO9f3/Ca5 +Kb2I1xYLj/xE+HgjHX9aD2MhAgMBAAGjggGMMIIBiDAPBgNVHRMBAf8EBTADAQH/ +MA4GA1UdDwEB/wQEAwIBBjCB4wYDVR0gBIHbMIHYMIHVBg0rBgEEAb4/AhQKAQEA +MIHDMHUGCCsGAQUFBwICMGkaZ0NlcnR5ZmlrYXQgd3lzdGF3aW9ueSB6Z29kbmll +IHogZG9rdW1lbnRlbTogIlBvbGl0eWthIENlcnR5ZmlrYWNqaSBQQ0EyIC0gQ2Vy +dHlmaWthdHkgVXJ6ZWRvdyBLbGFzeSAyIi4wSgYIKwYBBQUHAgEWPmh0dHA6Ly93 +d3cuc2lnbmV0LnBsL3JlcG96eXRvcml1bS9kb2t1bWVudHkva2xhc2EyL3BjX3Bj +YTIudHh0MD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6Ly93d3cuc2lnbmV0LnBsL3Jl +cG96eXRvcml1bS9jcmwvcGNhMi5jcmwwHwYDVR0jBBgwFoAUwGxGyl2CfpYHRonE +82AVXO08kMIwHQYDVR0OBBYEFLtFBlILy4HNKVSzvHxBTM0HDowlMA0GCSqGSIb3 +DQEBBQUAA4IBAQBWTsCbqXrXhBBev5v5cIuc6gJM8ww7oR0uMQRZoFSqvQUPWBYM +2/TLI/f8UM9hSShUVj3zEsSj/vFHagUVmzuVXo5u0WK8iaqATSyEVBhADHrPG6wY +cLKJlagge/ILA0m+SieyP2sjYD9MUB9KZIEyBKv0429UuDTw6P7pslxMWJBSNyQx +aLIs0SRKsqZZWkc7ZYAj2apSkBMX2Is1oHA+PwkF6jQMwCao/+CndXPUzfCF6caa +9WwW31W26MlXCvSmJgfiTPwGvm4PkPmOnmWZ3CczzhHl4q7ztHFzshJH3sZWDnrW +wBFjzz5ePr3WHV1wA7EY6oT4zBx+2gT9XBTB +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIC+TCCAmKgAwIBAgIENvEbGTANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJF +UzENMAsGA1UEChMERk5NVDEYMBYGA1UECxMPRk5NVCBDbGFzZSAyIENBMB4XDTk5 +MDMxODE0NTYxOVoXDTE5MDMxODE1MjYxOVowNjELMAkGA1UEBhMCRVMxDTALBgNV +BAoTBEZOTVQxGDAWBgNVBAsTD0ZOTVQgQ2xhc2UgMiBDQTCBnTANBgkqhkiG9w0B +AQEFAAOBiwAwgYcCgYEAmD+tGTaTPT7+dkIU/TVv8fqtInpY40bQXcZa+WItjzFe +/rQw/lB0rNadHeBixkndFBJ9cQusBsE/1waH4JCJ1uXjA7LyJ7GfM8iqazZKo8Q/ +eUGdiUYvKz5j1DhWkaodsQ1CdU3zh07jD03MtGy/YhOH6tCbjrbi/xn0lAnVlmEC +AQOjggEUMIIBEDARBglghkgBhvhCAQEEBAMCAAcwWAYDVR0fBFEwTzBNoEugSaRH +MEUxCzAJBgNVBAYTAkVTMQ0wCwYDVQQKEwRGTk1UMRgwFgYDVQQLEw9GTk1UIENs +YXNlIDIgQ0ExDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMTk5OTAzMTgxNDU2 +MTlagQ8yMDE5MDMxODE0NTYxOVowCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaAFECa +dkSXdAfErBTLHo1POkV8MNdhMB0GA1UdDgQWBBRAmnZEl3QHxKwUyx6NTzpFfDDX +YTAMBgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqG +SIb3DQEBBQUAA4GBAGFMoHxZY1tm+O5lE85DgEe5sjXJyITHa3NgReSdN531jiW5 ++aqqyuP4Q5wvoIkFsUUylCoeA41dpt7PV5Xa3yZgX8vflR64zgjY+IrJT6lodZPj +LwVMZGACokIeb4ZoZVUO2ENv8pExPqNHPCgFr0W2nSJMJntLfVsV+RlG3whd +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO +TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh +dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oX +DTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl +ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv +b3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ5291 +qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8Sp +uOUfiUtnvWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPU +Z5uW6M7XxgpT0GtJlvOjCwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvE +pMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiile7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp +5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCROME4HYYEhLoaJXhena/M +UGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpICT0ugpTN +GmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy +5V6548r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv +6q012iDTiIJh8BIitrzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEK +eN5KzlW/HdXZt1bv8Hb/C3m1r737qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6 +B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMBAAGjgZcwgZQwDwYDVR0TAQH/ +BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcCARYxaHR0cDov +L3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV +HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqG +SIb3DQEBCwUAA4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLyS +CZa59sCrI2AGeYwRTlHSeYAz+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen +5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwjf/ST7ZwaUb7dRUG/kSS0H4zpX897 +IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaNkqbG9AclVMwWVxJK +gnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfkCpYL ++63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxL +vJxxcypFURmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkm +bEgeqmiSBeGCc1qb3AdbCG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvk +N1trSt8sV4pAWja63XVECDdCcAz+3F4hoKOKwJCcaNpQ5kUQR3i2TtJlycM33+FC +Y7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoVIPVVYpbtbZNQvOSqeK3Z +ywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm66+KAQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDcDCCAligAwIBAgIBBTANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQGEwJVUzEY +MBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxDDAKBgNVBAsT +A1BLSTEWMBQGA1UEAxMNRG9EIFJvb3QgQ0EgMjAeFw0wNDEyMTMxNTAwMTBaFw0y +OTEyMDUxNTAwMTBaMFsxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVy +bm1lbnQxDDAKBgNVBAsTA0RvRDEMMAoGA1UECxMDUEtJMRYwFAYDVQQDEw1Eb0Qg +Um9vdCBDQSAyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwCzB9o07 +rP8/PNZxvrh0IgfscEEV/KtA4weqwcPYn/7aTDq/P8jYKHtLNgHArEUlw9IOCo+F +GGQQPRoTcCpvjtfcjZOzQQ84Ic2tq8I9KgXTVxE3Dc2MUfmT48xGSSGOFLTNyxQ+ +OM1yMe6rEvJl6jQuVl3/7mN1y226kTT8nvP0LRy+UMRC31mI/2qz+qhsPctWcXEF +lrufgOWARVlnQbDrw61gpIB1BhecDvRD4JkOG/t/9bPMsoGCsf0ywbi+QaRktWA6 +WlEwjM7eQSwZR1xJEGS5dKmHQa99brrBuKG/ZTE6BGf5tbuOkooAY7ix5ow4X4P/ +UNU7ol1rshDMYwIDAQABoz8wPTAdBgNVHQ4EFgQUSXS7DF66ev4CVO97oMaVxgmA +cJYwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD +ggEBAJiRjT+JyLv1wGlzKTs1rLqzCHY9cAmS6YREIQF9FHYb7lFsHY0VNy17MWn0 +mkS4r0bMNPojywMnGdKDIXUr5+AbmSbchECV6KjSzPZYXGbvP0qXEIIdugqi3VsG +K52nZE7rLgE1pLQ/E61V5NVzqGmbEfGY8jEeb0DU+HifjpGgb3AEkGaqBivO4XqS +tX3h4NGW56E6LcyxnR8FRO2HmdNNGnA5wQQM5X7Z8a/XIA7xInolpHOZzD+kByeW +qKKV7YK5FtOeC4fCwfKI9WLfaN/HvGlR7bFc3FRUKQ8JOZqsA8HbDE2ubwp6Fknx +v5HSOJTT9pUst2zJQraNypCNhdk= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDczCCAlugAwIBAgIBBDANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJLUjEN +MAsGA1UECgwES0lTQTEuMCwGA1UECwwlS29yZWEgQ2VydGlmaWNhdGlvbiBBdXRo +b3JpdHkgQ2VudHJhbDEWMBQGA1UEAwwNS0lTQSBSb290Q0EgMTAeFw0wNTA4MjQw +ODA1NDZaFw0yNTA4MjQwODA1NDZaMGQxCzAJBgNVBAYTAktSMQ0wCwYDVQQKDARL +SVNBMS4wLAYDVQQLDCVLb3JlYSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBDZW50 +cmFsMRYwFAYDVQQDDA1LSVNBIFJvb3RDQSAxMIIBIDANBgkqhkiG9w0BAQEFAAOC +AQ0AMIIBCAKCAQEAvATk+hM58DSWIGtsaLv623f/J/es7C/n/fB/bW+MKs0lCVsk +9KFo/CjsySXirO3eyDOE9bClCTqnsUdIxcxPjHmc+QZXfd3uOPbPFLKc6tPAXXdi +8EcNuRpAU1xkcK8IWsD3z3X5bI1kKB4g/rcbGdNaZoNy4rCbvdMlFQ0yb2Q3lIVG +yHK+d9VuHygvx2nt54OJM1jT3qC/QOhDUO7cTWu8peqmyGGO9cNkrwYV3CmLP3WM +vHFE2/yttRcdbYmDz8Yzvb9Fov4Kn6MRXw+5H5wawkbMnChmn3AmPC7fqoD+jMUE +CSVPzZNHPDfqAmeS/vwiJFys0izgXAEzisEZ2wIBA6MyMDAwHQYDVR0OBBYEFL+2 +J9gDWnZlTGEBQVYx5Yt7OtnMMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEF +BQADggEBABOvUQveimpb5poKyLGQSk6hAp3MiNKrZr097LuxQpVqslxa/6FjZJap +aBV/JV6K+KRzwYCKhQoOUugy50X4TmWAkZl0Q+VFnUkq8JSV3enhMNITbslOsXfl +BM+tWh6UCVrXPAgcrnrpFDLBRa3SJkhyrKhB2vAhhzle3/xk/2F0KpzZm4tfwjeT +2KM3LzuTa7IbB6d/CVDv0zq+IWuKkDsnSlFOa56ch534eJAx7REnxqhZvvwYC/uO +fi5C4e3nCSG9uRPFVmf0JqZCQ5BEVLRxm3bkGhKsGigA35vB1fjbXKP4krG9tNT5 +UNkAAk/bg9ART6RCVmE6fhMy04Qfybo= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMx +EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT +HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVs +ZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5 +MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNVBAYTAlVTMRAwDgYD +VQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFy +ZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2Vy +dmljZXMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20p +OsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm2 +8xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4PahHQUw2eeBGg6345AWh1K +Ts9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLPLJGmpufe +hRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk +6mFBrMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAw +DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+q +AdcwKziIorhtSpzyEZGDMA0GCSqGSIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMI +bw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPPE95Dz+I0swSdHynVv/heyNXB +ve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTyxQGjhdByPq1z +qwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd +iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn +0q23KXB56jzaYyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCN +sSi6 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ +RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD +VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX +DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y +ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy +VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr +mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr +IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK +mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu +XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy +dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye +jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1 +BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3 +DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92 +9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx +jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0 +Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz +ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS +R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCB +ijELMAkGA1UEBhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHly +aWdodCAoYykgMjAwNTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl +ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQSBDQTAeFw0w +NTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYDVQQGEwJDSDEQMA4G +A1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIwIAYD +VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBX +SVNlS2V5IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAy0+zAJs9Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxR +VVuuk+g3/ytr6dTqvirdqFEr12bDYVxgAsj1znJ7O7jyTmUIms2kahnBAbtzptf2 +w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbDd50kc3vkDIzh2TbhmYsF +mQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ/yxViJGg +4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t9 +4B3RLoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYw +DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQw +EAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOx +SPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vImMMkQyh2I+3QZH4VFvbBsUfk2 +ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4+vg1YFkCExh8 +vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa +hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZi +Fj4A4xylNoEYokxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ +/L7fCg0= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEzzCCA7egAwIBAgIEO6ocGTANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJQ +TDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2Vu +dHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MRswGQYDVQQDExJDQyBTaWduZXQgLSBS +b290Q0EwHhcNMDEwOTIwMTY0MjE5WhcNMjYwOTIxMTU0MjE5WjBxMQswCQYDVQQG +EwJQTDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMb +Q2VudHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MRswGQYDVQQDExJDQyBTaWduZXQg +LSBSb290Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrr2vydnNp +ELfGW3KsARiDhJvwDtUe4AbWev+OfMc3+vA29nX8ZmIwno3gmItjo5DbUCCRiCMq +5c9epcGu+kg4a3BJChVXREl8gVh0ST15rr3RKrSc4VgsvQzl0ZUraeQLl8JoRT5P +LsUj3qwF78jUCQVckiiLVcnGfZtFCm+DCJXliQBDMB9XFAUEiO/DtEBs0B7wJGx7 +lgJeJpQUcGiaOPjcJDYOk7rNAYmmD2gWeSlepufO8luUYG/YDxTC4mqhRqfa4MnV +O5dqy+ICj2UvUpHbZDB0KfGRibgBYeQP1kuqgIzJN4UqknVAJb0aMBSPl+9k2fAU +dchx1njlbdcbAgMBAAGjggFtMIIBaTAPBgNVHRMBAf8EBTADAQH/MIIBBAYDVR0g +BIH8MIH5MIH2Bg0rBgEEAb4/AgEKAQEAMIHkMIGaBggrBgEFBQcCAjCBjRqBikNl +cnR5ZmlrYXQgd3lzdGF3aW9ueSB6Z29kbmllIHogZG9rdW1lbnRlbTogIlBvbGl0 +eWthIENlcnR5ZmlrYWNqaSBkbGEgUm9vdENBIi4gQ2VydHlmaWthdCB3eXN0YXdp +b255IHByemV6IFJvb3RDQSB3IGhpZXJhcmNoaWkgQ0MgU2lnbmV0LjBFBggrBgEF +BQcCARY5aHR0cDovL3d3dy5zaWduZXQucGwvcmVwb3p5dG9yaXVtL2Rva3VtZW50 +eS9wY19yb290Y2EudHh0MB0GA1UdDgQWBBTAm8UjDQLhpk5Iax8A6eOaFBuxrzAf +BgNVHSMEGDAWgBTAm8UjDQLhpk5Iax8A6eOaFBuxrzAOBgNVHQ8BAf8EBAMCAQYw +DQYJKoZIhvcNAQEFBQADggEBAGnY5QmYqnnO9OqFOWZxxb25UHRnaRF6IV9aaGit +5BZufZj2Tq3v8L3SgE34GOoIcdRMMG5JEpEU4mN/Ef3oY6Eo+7HfqaPHI4KFmbDS +PiK5s+wmf+bQSm0Yq5/h4ZOdcAESlLQeLSt1CQk2JoKQJ6pyAf6xJBgWEIlm4RXE +4J3324PUiOp83kW6MDvaa1xY976WyInr4rwoLgxVl11LZeKWha0RJJxJgw/NyWpK +G7LWCm1fglF8JH51vZNndGYq1iKtfnrIOvLZq6bzaCiZm1EurD8HE6P7pmABKK6o +3C2OXlNfNIgwkDN/cDqk5TYsTkrpfriJPdxXBH8hQOkW89g= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDAjCCAmsCEDKIjprS9esTR/h/xCA3JfgwDQYJKoZIhvcNAQEFBQAwgcExCzAJ +BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh +c3MgNCBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy +MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp +emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X +DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw +FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgNCBQdWJsaWMg +UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo +YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5 +MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB +AQUAA4GNADCBiQKBgQC68OTP+cSuhVS5B1f5j8V/aBH4xBewRNzjMHPVKmIquNDM +HO0oW369atyzkSTKQWI8/AIBvxwWMZQFl3Zuoq29YRdsTjCG8FE3KlDHqGKB3FtK +qsGgtG7rL+VXxbErQHDbWk2hjh+9Ax/YA9SPTJlxvOKCzFjomDqG04Y48wApHwID +AQABMA0GCSqGSIb3DQEBBQUAA4GBAIWMEsGnuVAVess+rLhDityq3RS6iYF+ATwj +cSGIL4LcY/oCRaxFWdcqWERbt5+BO5JoPeI3JPV7bI92NZYJqFmduc4jq3TWg/0y +cyfYaT5DdPauxYma51N86Xv2S/PBZYPejYqcPIiNOVn8qj8ijaHBZlCBckztImRP +T8qAkbYp +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkG +A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz +cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2 +MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV +BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt +YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN +ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE +BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is +I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G +CSqGSIb3DQEBBQUAA4GBABByUqkFFBkyCEHwxWsKzH4PIRnN5GfcX6kb5sroc50i +2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWXbj9T/UWZYB2oK0z5XqcJ +2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/D/xwzoiQ +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIH/zCCB2igAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARQxCzAJBgNVBAYTAkVT +MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE +ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE +ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEvMC0GA1UECxMm +SVBTIENBIENMQVNFQTEgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLzAtBgNVBAMT +JklQUyBDQSBDTEFTRUExIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZI +hvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMwHhcNMDExMjMxMTEyMTQxWhcNMjUxMjI5 +MTEyMTQxWjCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ +BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hp +bmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5G +LiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTEgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUExIENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMw +gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8g89BgSKoCxBXZ5C+NnlURLSnM +UWZoAGXaFFWf6q7f69uN1nXaUfTEzPstvTUfE7fpZmF8lEDz+2AvjBg086hVnra0 +b0APA0VnanJyW2ZIlkKFGMCB4WJqh7JB7i45jITVXthPV2vsjlKM97Pnnhimz8Fb +r+RZcsz69vRptMqxAgMBAAGjggRbMIIEVzAdBgNVHQ4EFgQUL8zsbGe+T/iqPIiN +EvvHnUxb9F4wggFGBgNVHSMEggE9MIIBOYAUL8zsbGe+T/iqPIiNEvvHnUxb9F6h +ggEcpIIBGDCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ +BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hp +bmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5G +LiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTEgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUExIENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOC +AQAwDAYDVR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUF +BwMBBggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYB +BAGCNwIBFQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglg +hkgBhvhCAQEEBAMCAAcwGgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1Ud +EgQTMBGBD2lwc0BtYWlsLmlwcy5lczBDBglghkgBhvhCAQ0ENhY0Q0xBU0VBMSBD +QSBDZXJ0aWZpY2F0ZSBpc3N1ZWQgYnkgaHR0cHM6Ly93d3cuaXBzLmVzLzAqBglg +hkgBhvhCAQIEHRYbaHR0cHM6Ly93d3cuaXBzLmVzL2lwczIwMDIvMDwGCWCGSAGG ++EIBBAQvFi1odHRwczovL3d3dy5pcHMuZXMvaXBzMjAwMi9pcHMyMDAyQ0xBU0VB +MS5jcmwwQQYJYIZIAYb4QgEDBDQWMmh0dHBzOi8vd3d3Lmlwcy5lcy9pcHMyMDAy +L3Jldm9jYXRpb25DTEFTRUExLmh0bWw/MD4GCWCGSAGG+EIBBwQxFi9odHRwczov +L3d3dy5pcHMuZXMvaXBzMjAwMi9yZW5ld2FsQ0xBU0VBMS5odG1sPzA8BglghkgB +hvhCAQgELxYtaHR0cHM6Ly93d3cuaXBzLmVzL2lwczIwMDIvcG9saWN5Q0xBU0VB +MS5odG1sMHcGA1UdHwRwMG4wM6AxoC+GLWh0dHBzOi8vd3d3Lmlwcy5lcy9pcHMy +MDAyL2lwczIwMDJDTEFTRUExLmNybDA3oDWgM4YxaHR0cHM6Ly93d3diYWNrLmlw +cy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRUExLmNybDAvBggrBgEFBQcBAQQjMCEw +HwYIKwYBBQUHMAGGE2h0dHA6Ly9vY3NwLmlwcy5lcy8wDQYJKoZIhvcNAQEFBQAD +gYEAGY2khC4v4mlenqRcy8Mn8mcWca88t4CY9LCJMqlIt7i559BNkMMB66tXsNp9 +N2QhnTordKOjkdgZJmCb7DUdMJEQQT0Y5W7JA6WvHatAFu8feRJ4ImaTjI0Xz3Dd +Jbz6O++igCw0l4EY5gayn2BFpAm+7ZpEcdpR/OCOH80lNDo= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEKzCCAxOgAwIBAgIEOsylTDANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJE +SzEVMBMGA1UEChMMVERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQg +Um9vdCBDQTAeFw0wMTA0MDUxNjMzMTdaFw0yMTA0MDUxNzAzMTdaMEMxCzAJBgNV +BAYTAkRLMRUwEwYDVQQKEwxUREMgSW50ZXJuZXQxHTAbBgNVBAsTFFREQyBJbnRl +cm5ldCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxLhA +vJHVYx/XmaCLDEAedLdInUaMArLgJF/wGROnN4NrXceO+YQwzho7+vvOi20jxsNu +Zp+Jpd/gQlBn+h9sHvTQBda/ytZO5GhgbEaqHF1j4QeGDmUApy6mcca8uYGoOn0a +0vnRrEvLznWv3Hv6gXPU/Lq9QYjUdLP5Xjg6PEOo0pVOd20TDJ2PeAG3WiAfAzc1 +4izbSysseLlJ28TQx5yc5IogCSEWVmb/Bexb4/DPqyQkXsN/cHoSxNK1EKC2IeGN +eGlVRGn1ypYcNIUXJXfi9i8nmHj9eQY6otZaQ8H/7AQ77hPv01ha/5Lr7K7a8jcD +R0G2l8ktCkEiu7vmpwIDAQABo4IBJTCCASEwEQYJYIZIAYb4QgEBBAQDAgAHMGUG +A1UdHwReMFwwWqBYoFakVDBSMQswCQYDVQQGEwJESzEVMBMGA1UEChMMVERDIElu +dGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTENMAsGA1UEAxME +Q1JMMTArBgNVHRAEJDAigA8yMDAxMDQwNTE2MzMxN1qBDzIwMjEwNDA1MTcwMzE3 +WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUbGQBx/2FbazI2p5QCIUItTxWqFAw +HQYDVR0OBBYEFGxkAcf9hW2syNqeUAiFCLU8VqhQMAwGA1UdEwQFMAMBAf8wHQYJ +KoZIhvZ9B0EABBAwDhsIVjUuMDo0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4IBAQBO +Q8zR3R0QGwZ/t6T609lN+yOfI1Rb5osvBCiLtSdtiaHsmGnc540mgwV5dOy0uaOX +wTUA/RXaOYE6lTGQ3pfphqiZdwzlWqCE/xIWrG64jcN7ksKsLtB9KOy282A4aW8+ +2ARVPp7MVdK6/rtHBNcK2RYKNCn1WBPVT8+PVkuzHu7TmHnaCB4Mb7j4Fifvwm89 +9qNLPg7kbWzbO0ESm70NRyN/PErQr8Cv9u8btRXE64PECV90i9kR+8JWsTz4cMo0 +jUNAE4z9mQNUecYu6oah9jrUCbz0vGbMPVjQV0kK7iXiQe4T+Zs4NNEA9X7nlB38 +aQNiuJkFBT1reBK9sG9l +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQsw +CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl +cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu +LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT +aWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp +dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD +VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT +aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ +bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu +IENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg +LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK3LpRFpxlmr8Y+1 +GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaStBO3IFsJ ++mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0Gbd +U6LM8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLm +NxdLMEYH5IBtptiWLugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XY +ufTsgsbSPZUd5cBPhMnZo0QoBmrXRazwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/ +ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAj/ola09b5KROJ1WrIhVZPMq1 +CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXttmhwwjIDLk5Mq +g6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm +fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c +2NU8Qh0XwRJdRTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/ +bLvSHgCwIe34QWKCudiyxLtGUPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEU +MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3 +b3JrMSMwIQYDVQQDExpBZGRUcnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1 +MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcxCzAJBgNVBAYTAlNFMRQwEgYDVQQK +EwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIzAh +BgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwq +xBb/4Oxx64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G +87B4pfYOQnrjfxvM0PC3KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i +2O+tCBGaKZnhqkRFmhJePp1tUvznoD1oL/BLcHwTOK28FSXx1s6rosAx1i+f4P8U +WfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GRwVY18BTcZTYJbqukB8c1 +0cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HUMIHRMB0G +A1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0T +AQH/BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6Fr +pGkwZzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQL +ExRBZGRUcnVzdCBUVFAgTmV0d29yazEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlm +aWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBABmrder4i2VhlRO6aQTv +hsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxGGuoYQ992zPlm +hpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X +dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3 +P6CxB9bpT9zeRXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9Y +iQBCYz95OdBEsIJuQRno3eDBiFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5no +xqE= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEc +MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBT +ZWN1cmUgR2xvYmFsIGVCdXNpbmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIw +MDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0VxdWlmYXggU2Vj +dXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEdsb2JhbCBlQnVzaW5l +c3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRVPEnC +UdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc +58O/gGzNqfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/ +o5brhTMhHD4ePmBudpxnhcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAH +MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUvqigdHJQa0S3ySPY+6j/s1dr +aGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hsMA0GCSqGSIb3DQEBBAUA +A4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okENI7SS+RkA +Z70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv +8qIYNMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDEL +MAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMp +IDIwMDcgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAi +BgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMjAeFw0wNzExMDUwMDAw +MDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh +d3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBGb3Ig +YXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9v +dCBDQSAtIEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/ +BebfowJPDQfGAFG6DAJSLSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6 +papu+7qzcMBniKI11KOasf2twu8x+qi58/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8E +BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmtgAMADna3+FGO6Lts6K +DPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUNG4k8VIZ3 +KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41ox +XZ3Krr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFUjCCBDqgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJLUjEN +MAsGA1UEChMES0lTQTEuMCwGA1UECxMlS29yZWEgQ2VydGlmaWNhdGlvbiBBdXRo +b3JpdHkgQ2VudHJhbDEWMBQGA1UEAxMNS0lTQSBSb290Q0EgMzAeFw0wNDExMTkw +NjM5NTFaFw0xNDExMTkwNjM5NTFaMGQxCzAJBgNVBAYTAktSMQ0wCwYDVQQKEwRL +SVNBMS4wLAYDVQQLEyVLb3JlYSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBDZW50 +cmFsMRYwFAYDVQQDEw1LSVNBIFJvb3RDQSAzMIIBIDANBgkqhkiG9w0BAQEFAAOC +AQ0AMIIBCAKCAQEA3rrtF2Wu0b1KPazbgHLMWOHn4ZPazDB6z+8Lri2nQ6u/p0LP +CFYIpEcdffqG79gwlyY0YTyADvjU65/8IjAboW0+40zSVU4WQDfC9gdu2we1pYyW +geKbXH6UYcjOhDyx+gDmctMJhXfp3F4hT7TkTvTiF6tQrxz/oTlYdVsSspa5jfBw +YkhbVigqpYeRNrkeJPW5unu2UlFbF1pgBWycwubGjD756t08jP+J3kNwrB248XXN +OMpTDUdoasY8GMq94bS+DvTQ49IT+rBRERHUQavo9DmO4TSETwuTqmo4/OXGeEeu +dhf6oYA3BgAVCP1rI476cg2V1ktisWjC3TSbXQIBA6OCAg8wggILMB8GA1UdIwQY +MBaAFI+B8NqmzXQ8vmb0FWtGpP4GKMyqMB0GA1UdDgQWBBSPgfDaps10PL5m9BVr +RqT+BijMqjAOBgNVHQ8BAf8EBAMCAQYwggEuBgNVHSAEggElMIIBITCCAR0GBFUd +IAAwggETMDAGCCsGAQUFBwIBFiRodHRwOi8vd3d3LnJvb3RjYS5vci5rci9yY2Ev +Y3BzLmh0bWwwgd4GCCsGAQUFBwICMIHRHoHOx3QAIMd4yZ3BHLKUACCs9cd4x3jJ +ncEcx4WyyLLkACgAVABoAGkAcwAgAGMAZQByAHQAaQBmAGkAYwBhAHQAZQAgAGkA +cwAgAGEAYwBjAHIAZQBkAGkAdABlAGQAIAB1AG4AZABlAHIAIABFAGwAZQBjAHQA +cgBvAG4AaQBjACAAUwBpAGcAbgBhAHQAdQByAGUAIABBAGMAdAAgAG8AZgAgAHQA +aABlACAAUgBlAHAAdQBiAGwAaQBjACAAbwBmACAASwBvAHIAZQBhACkwMwYDVR0R +BCwwKqQoMCYxJDAiBgNVBAMMG+2VnOq1reygleuztOuztO2YuOynhO2dpeybkDAz +BgNVHRIELDAqpCgwJjEkMCIGA1UEAwwb7ZWc6rWt7KCV67O067O07Zi47KeE7Z2l +7JuQMA8GA1UdEwEB/wQFMAMBAf8wDAYDVR0kBAUwA4ABADANBgkqhkiG9w0BAQUF +AAOCAQEAz9b3Dv2wjG4FFY6oXCuyWtEeV6ZeGKqCEQj8mbdbp+PI0qLT+SQ09+Pk +rolUR9NpScmAwRHr4inH9gaLX7riXs+rw87P7pIl3J85Hg4D9N6QW6FwmVzHc07J +pHVJeyWhn4KSjU3sYcUMMqfHODiAVToqgx2cZHm5Dac1Smjvj/8F2LpOVmHY+Epw +mAiWk9hgxzrsX58dKzVPSBShmrtv7tIDhlPxEMcHVGJeNo7iHCsdF03m9VrvirqC +6HfZKBF+N4dKlArJQOk1pTr7ZD7yXxZ683bXzu4/RB1Fql8RqlMcOh9SUWJUD6OQ +Nc9Nb7rHviwJ8TX4Absk3TC8SA/u2Q== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDoTCCAomgAwIBAgIQKTZHquOKrIZKI1byyrdhrzANBgkqhkiG9w0BAQUFADBO +MQswCQYDVQQGEwJ1czEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQ0wCwYDVQQL +EwRGQkNBMRYwFAYDVQQDEw1Db21tb24gUG9saWN5MB4XDTA3MTAxNTE1NTgwMFoX +DTI3MTAxNTE2MDgwMFowTjELMAkGA1UEBhMCdXMxGDAWBgNVBAoTD1UuUy4gR292 +ZXJubWVudDENMAsGA1UECxMERkJDQTEWMBQGA1UEAxMNQ29tbW9uIFBvbGljeTCC +ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJeNvTMn5K1b+3i9L0dHbsd4 +6ZOcpN7JHP0vGzk4rEcXwH53KQA7Ax9oD81Npe53uCxiazH2+nIJfTApBnznfKM9 +hBiKHa4skqgf6F5PjY7rPxr4nApnnbBnTfAu0DDew5SwoM8uCjR/VAnTNr2kSVdS +c+md/uRIeUYbW40y5KVIZPMiDZKdCBW/YDyD90ciJSKtKXG3d+8XyaK2lF7IMJCk +FEhcVlcLQUwF1CpMP64Sm1kRdXAHImktLNMxzJJ+zM2kfpRHqpwJCPZLr1LoakCR +xVW9QLHIbVeGlRfmH3O+Ry4+i0wXubklHKVSFzYIWcBCvgortFZRPBtVyYyQd+sC +AwEAAaN7MHkwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O +BBYEFC9Yl9ipBZilVh/72at17wI8NjTHMBIGCSsGAQQBgjcVAQQFAgMBAAEwIwYJ +KwYBBAGCNxUCBBYEFHa3YJbdFFYprHWF03BjwbxHhhyLMA0GCSqGSIb3DQEBBQUA +A4IBAQBgrvNIFkBypgiIybxHLCRLXaCRc+1leJDwZ5B6pb8KrbYq+Zln34PFdx80 +CTj5fp5B4Ehg/uKqXYeI6oj9XEWyyWrafaStsU+/HA2fHprA1RRzOCuKeEBuMPdi +4c2Z/FFpZ2wR3bgQo2jeJqVW/TZsN5hs++58PGxrcD/3SDcJjwtCga1GRrgLgwb0 +Gzigf0/NC++DiYeXHIowZ9z9VKEDfgHLhUyxCynDvux84T8PCVI8L6eaSP436REG +WOE2QYrEtr+O3c5Ks7wawM36GpnScZv6z7zyxFSjiDV2zBssRm8MtNHDYXaSdBHq +S4CNHIkRi+xb/xfJSPzn4AYR4oRe +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvzE/MD0GA1UEAww2VMOc +UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx +c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV4wXAYDVQQKDFVUw5xS +S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg +SGl6bWV0bGVyaSBBLsWeLiAoYykgQXJhbMSxayAyMDA3MB4XDTA3MTIyNTE4Mzcx +OVoXDTE3MTIyMjE4MzcxOVowgb8xPzA9BgNVBAMMNlTDnFJLVFJVU1QgRWxla3Ry +b25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTELMAkGA1UEBhMC +VFIxDzANBgNVBAcMBkFua2FyYTFeMFwGA1UECgxVVMOcUktUUlVTVCBCaWxnaSDE +sGxldGnFn2ltIHZlIEJpbGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7F +ni4gKGMpIEFyYWzEsWsgMjAwNzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAKu3PgqMyKVYFeaK7yc9SrToJdPNM8Ig3BnuiD9NYvDdE3ePYakqtdTyuTFY +KTsvP2qcb3N2Je40IIDu6rfwxArNK4aUyeNgsURSsloptJGXg9i3phQvKUmi8wUG ++7RP2qFsmmaf8EMJyupyj+sA1zU511YXRxcw9L6/P8JorzZAwan0qafoEGsIiveG +HtyaKhUG9qPw9ODHFNRRf8+0222vR5YXm3dx2KdxnSQM9pQ/hTEST7ruToK4uT6P +IzdezKKqdfcYbwnTrqdUKDT74eA7YH2gvnmJhsifLfkKS8RQouf9eRbHegsYz85M +733WB2+Y8a+xwXrXgTW4qhe04MsCAwEAAaNCMEAwHQYDVR0OBBYEFCnFkKslrxHk +Yb+j/4hhkeYO/pyBMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G +CSqGSIb3DQEBBQUAA4IBAQAQDdr4Ouwo0RSVgrESLFF6QSU2TJ/sPx+EnWVUXKgW +AkD6bho3hO9ynYYKVZ1WKKxmLNA6VpM0ByWtCLCPyA8JWcqdmBzlVPi5RX9ql2+I +aE1KBiY3iAIOtsbWcpnOa3faYjGkVh+uX4132l32iPwa2Z61gfAyuOOI0JzzaqC5 +mxRZNTZPz/OOXl0XrRWV2N2y1RVuAE6zS89mlOTgzbUF2mNXi+WzqtvALhyQRNsa +XRik7r4EW5nVcV9VZWRi1aKbBFmGyGJ353yCRWo9F7/snXUMrqNvWtMvmDb08PUZ +qxFdyKbjKlhqQgnDvZImZjINXQhVdP+MmNAKpoRq0Tl9 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCB +gTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G +A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNV +BAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEyMDEwMDAw +MDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3Jl +YXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01P +RE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3 +UcEbVASY06m/weaKXTuH+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI +2GqGd0S7WWaXUF601CxwRM/aN5VCaTwwxHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8 +Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV4EajcNxo2f8ESIl33rXp ++2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA1KGzqSX+ +DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5O +nKVIrLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW +/zAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6g +PKA6hjhodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9u +QXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOCAQEAPpiem/Yb6dc5t3iuHXIY +SdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CPOGEIqB6BCsAv +IC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/ +RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4 +zJVSk/BwJVmcIGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5dd +BA6+C4OmF4O5MBKgxTMVBbkN+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IB +ZQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIIQTCCB6qgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCAR4xCzAJBgNVBAYTAkVT +MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE +ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE +ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjE0MDIGA1UECxMr +SVBTIENBIFRpbWVzdGFtcGluZyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTE0MDIG +A1UEAxMrSVBTIENBIFRpbWVzdGFtcGluZyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0 +eTEeMBwGCSqGSIb3DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTAxMTIzMTExMjY0 +M1oXDTI1MTIyOTExMjY0M1owggEeMQswCQYDVQQGEwJFUzESMBAGA1UECBMJQmFy +Y2Vsb25hMRIwEAYDVQQHEwlCYXJjZWxvbmExLjAsBgNVBAoTJUlQUyBJbnRlcm5l +dCBwdWJsaXNoaW5nIFNlcnZpY2VzIHMubC4xKzApBgNVBAoUImlwc0BtYWlsLmlw +cy5lcyBDLkkuRi4gIEItNjA5Mjk0NTIxNDAyBgNVBAsTK0lQUyBDQSBUaW1lc3Rh +bXBpbmcgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxNDAyBgNVBAMTK0lQUyBDQSBU +aW1lc3RhbXBpbmcgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxHjAcBgkqhkiG9w0B +CQEWD2lwc0BtYWlsLmlwcy5lczCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA +0umTdn+FPP2gAb0RL0ZCDyt/BZvGa/VRcayaUh8flSfMkO+WP45RNv0WAM43pSGU +Rmvt5P+hfuqf0aKbOPMTxLmYumVFQ/nXvRWdlC4AYN6YGrk8yfXh/NbEJN/n48iE +GRK0HFyz9eIWYSdg8vAt5PDzrPigeYSdReL2AfBE5ZECAwEAAaOCBIkwggSFMB0G +A1UdDgQWBBSR2UK8nKnK0Bw3E1JXFqANHikdPjCCAVAGA1UdIwSCAUcwggFDgBSR +2UK8nKnK0Bw3E1JXFqANHikdPqGCASakggEiMIIBHjELMAkGA1UEBhMCRVMxEjAQ +BgNVBAgTCUJhcmNlbG9uYTESMBAGA1UEBxMJQmFyY2Vsb25hMS4wLAYDVQQKEyVJ +UFMgSW50ZXJuZXQgcHVibGlzaGluZyBTZXJ2aWNlcyBzLmwuMSswKQYDVQQKFCJp +cHNAbWFpbC5pcHMuZXMgQy5JLkYuICBCLTYwOTI5NDUyMTQwMgYDVQQLEytJUFMg +Q0EgVGltZXN0YW1waW5nIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MTQwMgYDVQQD +EytJUFMgQ0EgVGltZXN0YW1waW5nIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4w +HAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOCAQAwDAYDVR0TBAUwAwEB/zAM +BgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYB +BQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIBFQYKKwYBBAGCNwIB +FgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhCAQEEBAMCAAcwGgYD +VR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGBD2lwc0BtYWlsLmlw +cy5lczBIBglghkgBhvhCAQ0EOxY5VGltZXN0YW1waW5nIENBIENlcnRpZmljYXRl +IGlzc3VlZCBieSBodHRwczovL3d3dy5pcHMuZXMvMCoGCWCGSAGG+EIBAgQdFhto +dHRwczovL3d3dy5pcHMuZXMvaXBzMjAwMi8wQQYJYIZIAYb4QgEEBDQWMmh0dHBz +Oi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJUaW1lc3RhbXBpbmcuY3JsMEYG +CWCGSAGG+EIBAwQ5FjdodHRwczovL3d3dy5pcHMuZXMvaXBzMjAwMi9yZXZvY2F0 +aW9uVGltZXN0YW1waW5nLmh0bWw/MEMGCWCGSAGG+EIBBwQ2FjRodHRwczovL3d3 +dy5pcHMuZXMvaXBzMjAwMi9yZW5ld2FsVGltZXN0YW1waW5nLmh0bWw/MEEGCWCG +SAGG+EIBCAQ0FjJodHRwczovL3d3dy5pcHMuZXMvaXBzMjAwMi9wb2xpY3lUaW1l +c3RhbXBpbmcuaHRtbDCBgQYDVR0fBHoweDA4oDagNIYyaHR0cHM6Ly93d3cuaXBz +LmVzL2lwczIwMDIvaXBzMjAwMlRpbWVzdGFtcGluZy5jcmwwPKA6oDiGNmh0dHBz +Oi8vd3d3YmFjay5pcHMuZXMvaXBzMjAwMi9pcHMyMDAyVGltZXN0YW1waW5nLmNy +bDAvBggrBgEFBQcBAQQjMCEwHwYIKwYBBQUHMAGGE2h0dHA6Ly9vY3NwLmlwcy5l +cy8wDQYJKoZIhvcNAQEFBQADgYEAxKMCdGABCUwYXU900W1zDCfTSDC1TxFVGRnH +I4soqfp4D34sJ/adkgD2GMgkAMVf+C1MY/yQFV4nmOal9K7SNrG1JR8OeDoRjpM4 +rtO9qYbuHD3TW47/y/aZSZxP4ccocGpPOkvqfrnndKRKY0WUk/7Qg5aqpIXni2Gg +olkTZbQ= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID9zCCAt+gAwIBAgIESJ8AATANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC +Q04xMjAwBgNVBAoMKUNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24g +Q2VudGVyMUcwRQYDVQQDDD5DaGluYSBJbnRlcm5ldCBOZXR3b3JrIEluZm9ybWF0 +aW9uIENlbnRlciBFViBDZXJ0aWZpY2F0ZXMgUm9vdDAeFw0xMDA4MzEwNzExMjVa +Fw0zMDA4MzEwNzExMjVaMIGKMQswCQYDVQQGEwJDTjEyMDAGA1UECgwpQ2hpbmEg +SW50ZXJuZXQgTmV0d29yayBJbmZvcm1hdGlvbiBDZW50ZXIxRzBFBgNVBAMMPkNo +aW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyIEVWIENlcnRp +ZmljYXRlcyBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm35z +7r07eKpkQ0H1UN+U8i6yjUqORlTSIRLIOTJCBumD1Z9S7eVnAztUwYyZmczpwA// +DdmEEbK40ctb3B75aDFk4Zv6dOtouSCV98YPjUesWgbdYavi7NifFy2cyjw1l1Vx +zUOFsUcW9SxTgHbP0wBkvUCZ3czY28Sf1hNfQYOL+Q2HklY0bBoQCxfVWhyXWIQ8 +hBouXJE0bhlffxdpxWXvayHG1VA6v2G5BY3vbzQ6sm8UY78WO5upKv23KzhmBsUs +4qpnHkWnjQRmQvaPK++IIGmPMowUc9orhpFjIpryp9vOiYurXccUwVswah+xt54u +gQEC7c+WXmPbqOY4twIDAQABo2MwYTAfBgNVHSMEGDAWgBR8cks5x8DbYqVPm6oY +NJKiyoOCWTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E +FgQUfHJLOcfA22KlT5uqGDSSosqDglkwDQYJKoZIhvcNAQEFBQADggEBACrDx0M3 +j92tpLIM7twUbY8opJhJywyA6vPtI2Z1fcXTIWd50XPFtQO3WKwMVC/GVhMPMdoG +52U7HW8228gd+f2ABsqjPWYWqJ1MFn3AlUa1UeTiH9fqBk1jjZaM7+czV0I664zB +echNdn3e9rG3geCg+aF4RhcaVpjwTj2rHO3sOdwHSPdj/gauwqRcalsyiMXHM4Ws +ZkJHwlgkmeHlPuV1LI5D1l08eB6olYIpUNHRFrrvwb562bTYzB5MRuF3sTGrvSrI +zo9uoV1/A3U05K2JRVRevq4opbs/eHnrc7MKDf2+yfdWrPa37S+bISnHOLaVxATy +wy39FCqQmbkHzJ8= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc +MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP +bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2 +MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft +ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg +Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lk +hsmj76CGv2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym +1BW32J/X3HGrfpq/m44zDyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsW +OqMFf6Dch9Wc/HKpoH145LcxVR5lu9RhsCFg7RAycsWSJR74kEoYeEfffjA3PlAb +2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP8c9GsEsPPt2IYriMqQko +O3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0TAQH/BAUw +AwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAU +AK3Zo/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB +BQUAA4IBAQB8itEfGDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkF +Zu90821fnZmv9ov761KyBZiibyrFVL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAb +LjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft3OJvx8Fi8eNy1gTIdGcL+oir +oQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43gKd8hdIaC2y+C +MMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds +sPmuujz9dLQR6FgNgLzTqIA6me11zEZ7 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0 +IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz +BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y +aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG +9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMjIzM1oXDTE5MDYy +NjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y +azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs +YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw +Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl +cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjmFGWHOjVsQaBalfD +cnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td3zZxFJmP3MKS8edgkpfs +2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89HBFx1cQqY +JJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliE +Zwgs3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJ +n0WuPIqpsHEzXcjFV9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/A +PhmcGcwTTYJBtYze4D1gCCAPRX5ron+jjBXu +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEZDCCA0ygAwIBAgIQRL4Mi1AAJLQR0zYwS8AzdzANBgkqhkiG9w0BAQUFADCB +ozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug +Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho +dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VSRmlyc3Qt +TmV0d29yayBBcHBsaWNhdGlvbnMwHhcNOTkwNzA5MTg0ODM5WhcNMTkwNzA5MTg1 +NzQ5WjCBozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0 +IExha2UgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYD +VQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VS +Rmlyc3QtTmV0d29yayBBcHBsaWNhdGlvbnMwggEiMA0GCSqGSIb3DQEBAQUAA4IB +DwAwggEKAoIBAQCz+5Gh5DZVhawGNFugmliy+LUPBXeDrjKxdpJo7CNKyXY/45y2 +N3kDuatpjQclthln5LAbGHNhSuh+zdMvZOOmfAz6F4CjDUeJT1FxL+78P/m4FoCH +iZMlIJpDgmkkdihZNaEdwH+DBmQWICzTSaSFtMBhf1EI+GgVkYDLpdXuOzr0hARe +YFmnjDRy7rh4xdE7EkpvfmUnuaRVxblvQ6TFHSyZwFKkeEwVs0CYCGtDxgGwenv1 +axwiP8vv/6jQOkt2FZ7S0cYu49tXGzKiuG/ohqY/cKvlcJKrRB5AUPuco2LkbG6g +yN7igEL66S/ozjIEj3yNtxyjNTwV3Z7DrpelAgMBAAGjgZEwgY4wCwYDVR0PBAQD +AgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFPqGydvguul49Uuo1hXf8NPh +ahQ8ME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9V +VE4tVVNFUkZpcnN0LU5ldHdvcmtBcHBsaWNhdGlvbnMuY3JsMA0GCSqGSIb3DQEB +BQUAA4IBAQCk8yXM0dSRgyLQzDKrm5ZONJFUICU0YV8qAhXhi6r/fWRRzwr/vH3Y +IWp4yy9Rb/hCHTO967V7lMPDqaAt39EpHx3+jz+7qEUqf9FuVSTiuwL7MT++6Lzs +QCv4AdRWOOTKRIK1YSAhZ2X28AvnNPilwpyjXEAfhZOVBt5P1CeptqX8Fs1zMT+4 +ZSfP1FMa8Kxun08FDAOBp4QpxFq9ZFdyrTvPNximmMatBrTcCKME1SmklpoSZ0qM +YEWd8SOasACcaLWYUNPvji6SZbFIPiG+FTAqDbUMo2s/rn9X9R+WfN9v3YIwLGUb +QErNaLly7HF27FSOH4UMAWr6pjisH8SE +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEW +MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVy +c2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYD +VQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1 +c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC +AQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81 +WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUG +FF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdq +XbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxL +se4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwb +KNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8Fd +IgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73 +y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRt +hAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgoc +QIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4 +Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNV +HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNV +HSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJ +KoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z +dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQ +L1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgr +Fg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSo +ag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaY +T1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbz +GDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m +1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJV +OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH +6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwX +QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFwTCCA6mgAwIBAgIITrIAZwwDXU8wDQYJKoZIhvcNAQEFBQAwSTELMAkGA1UE +BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEjMCEGA1UEAxMaU3dpc3NTaWdu +IFBsYXRpbnVtIENBIC0gRzIwHhcNMDYxMDI1MDgzNjAwWhcNMzYxMDI1MDgzNjAw +WjBJMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMSMwIQYDVQQD +ExpTd2lzc1NpZ24gUGxhdGludW0gQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQAD +ggIPADCCAgoCggIBAMrfogLi2vj8Bxax3mCq3pZcZB/HL37PZ/pEQtZ2Y5Wu669y +IIpFR4ZieIbWIDkm9K6j/SPnpZy1IiEZtzeTIsBQnIJ71NUERFzLtMKfkr4k2Htn +IuJpX+UFeNSH2XFwMyVTtIc7KZAoNppVRDBopIOXfw0enHb/FZ1glwCNioUD7IC+ +6ixuEFGSzH7VozPY1kneWCqv9hbrS3uQMpe5up1Y8fhXSQQeol0GcN1x2/ndi5ob +jM89o03Oy3z2u5yg+gnOI2Ky6Q0f4nIoj5+saCB9bzuohTEJfwvH6GXp43gOCWcw +izSC+13gzJ2BbWLuCB4ELE6b7P6pT1/9aXjvCR+htL/68++QHkwFix7qepF6w9fl ++zC8bBsQWJj3Gl/QKTIDE0ZNYWqFTFJ0LwYfexHihJfGmfNtf9dng34TaNhxKFrY +zt3oEBSa/m0jh26OWnA81Y0JAKeqvLAxN23IhBQeW71FYyBrS3SMvds6DsHPWhaP +pZjydomyExI7C3d3rLvlPClKknLKYRorXkzig3R3+jVIeoVNjZpTxN94ypeRSCtF +KwH3HBqi7Ri6Cr2D+m+8jVeTO9TUps4e8aCxzqv9KyiaTxvXw3LbpMS/XUz13XuW +ae5ogObnmLo2t/5u7Su9IPhlGdpVCX4l3P5hYnL5fhgC72O00Puv5TtjjGePAgMB +AAGjgawwgakwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O +BBYEFFCvzAeHFUdvOMW0ZdHelarp35zMMB8GA1UdIwQYMBaAFFCvzAeHFUdvOMW0 +ZdHelarp35zMMEYGA1UdIAQ/MD0wOwYJYIV0AVkBAQEBMC4wLAYIKwYBBQUHAgEW +IGh0dHA6Ly9yZXBvc2l0b3J5LnN3aXNzc2lnbi5jb20vMA0GCSqGSIb3DQEBBQUA +A4ICAQAIhab1Fgz8RBrBY+D5VUYI/HAcQiiWjrfFwUF1TglxeeVtlspLpYhg0DB0 +uMoI3LQwnkAHFmtllXcBrqS3NQuB2nEVqXQXOHtYyvkv+8Bldo1bAbl93oI9ZLi+ +FHSjClTTLJUYFzX1UWs/j6KWYTl4a0vlpqD4U99REJNi54Av4tHgvI42Rncz7Lj7 +jposiU0xEQ8mngS7twSNC/K5/FqdOxa3L8iYq/6KUFkuozv8KV2LwUvJ4ooTHbG/ +u0IdUt1O2BReEMYxB+9xJ/cbOQncguqLs5WGXv312l0xpuAxtpTmREl0xRbl9x8D +YSjFyMsSoEJL+WuICI20MhjzdZ/EfwBPBZWcoxcCw7NTm6ogOSkrZvqdr16zktK1 +puEa+S1BaYEUtLS17Yk9zvupnTVCRLEcFHOBzyoBNZox1S2PbYTfgE1X4z/FhHXa +icYwu+uPyyIIoK6q8QNsOktNCaUOcsZWayFCTiMlFGiudgp8DAdwZPmaL/YFOSbG +DI8Zf0NebvRbFS/bYV3mZy8/CJT5YLSYMdp08YSTcU1f+2BY0fvEwW2JorsgH51x +kcsymxM9Pn2SUjWskpSi0xjCfMfqr3YFFt1nJ8J+HAciIfNAChs0B0QTwoRqjt8Z +Wr9/6x3iGjjRXK9HkmuAtTClyY3YqzGBH9/CZjfTk6mFhnll0g== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW @@ -2862,100 +4449,73 @@ um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIFFjCCBH+gAwIBAgIBADANBgkqhkiG9w0BAQQFADCBsDELMAkGA1UEBhMCSUwx -DzANBgNVBAgTBklzcmFlbDEOMAwGA1UEBxMFRWlsYXQxFjAUBgNVBAoTDVN0YXJ0 -Q29tIEx0ZC4xGjAYBgNVBAsTEUNBIEF1dGhvcml0eSBEZXAuMSkwJwYDVQQDEyBG -cmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYS -YWRtaW5Ac3RhcnRjb20ub3JnMB4XDTA1MDMxNzE3Mzc0OFoXDTM1MDMxMDE3Mzc0 -OFowgbAxCzAJBgNVBAYTAklMMQ8wDQYDVQQIEwZJc3JhZWwxDjAMBgNVBAcTBUVp -bGF0MRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMRowGAYDVQQLExFDQSBBdXRob3Jp -dHkgRGVwLjEpMCcGA1UEAxMgRnJlZSBTU0wgQ2VydGlmaWNhdGlvbiBBdXRob3Jp -dHkxITAfBgkqhkiG9w0BCQEWEmFkbWluQHN0YXJ0Y29tLm9yZzCBnzANBgkqhkiG -9w0BAQEFAAOBjQAwgYkCgYEA7YRgACOeyEpRKSfeOqE5tWmrCbIvNP1h3D3TsM+x -18LEwrHkllbEvqoUDufMOlDIOmKdw6OsWXuO7lUaHEe+o5c5s7XvIywI6Nivcy+5 -yYPo7QAPyHWlLzRMGOh2iCNJitu27Wjaw7ViKUylS7eYtAkUEKD4/mJ2IhULpNYI -LzUCAwEAAaOCAjwwggI4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgHmMB0G -A1UdDgQWBBQcicOWzL3+MtUNjIExtpidjShkjTCB3QYDVR0jBIHVMIHSgBQcicOW -zL3+MtUNjIExtpidjShkjaGBtqSBszCBsDELMAkGA1UEBhMCSUwxDzANBgNVBAgT -BklzcmFlbDEOMAwGA1UEBxMFRWlsYXQxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4x -GjAYBgNVBAsTEUNBIEF1dGhvcml0eSBEZXAuMSkwJwYDVQQDEyBGcmVlIFNTTCBD -ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSYWRtaW5Ac3Rh -cnRjb20ub3JnggEAMB0GA1UdEQQWMBSBEmFkbWluQHN0YXJ0Y29tLm9yZzAdBgNV -HRIEFjAUgRJhZG1pbkBzdGFydGNvbS5vcmcwEQYJYIZIAYb4QgEBBAQDAgAHMC8G -CWCGSAGG+EIBDQQiFiBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAy -BglghkgBhvhCAQQEJRYjaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL2NhLWNybC5j -cmwwKAYJYIZIAYb4QgECBBsWGWh0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy8wOQYJ -YIZIAYb4QgEIBCwWKmh0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9pbmRleC5waHA/ -YXBwPTExMTANBgkqhkiG9w0BAQQFAAOBgQBscSXhnjSRIe/bbL0BCFaPiNhBOlP1 -ct8nV0t2hPdopP7rPwl+KLhX6h/BquL/lp9JmeaylXOWxkjHXo0Hclb4g4+fd68p -00UOpO6wNnQt8M2YI3s3S9r+UZjEHjQ8iP2ZO1CnwYszx8JSFhKVU2Ui77qLzmLb -cCOxgN8aIDjnfg== +MIIH9zCCB2CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARQxCzAJBgNVBAYTAkVT +MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE +ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE +ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEvMC0GA1UECxMm +SVBTIENBIENMQVNFQTEgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLzAtBgNVBAMT +JklQUyBDQSBDTEFTRUExIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MR4wHAYJKoZI +hvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMwHhcNMDExMjI5MDEwNTMyWhcNMjUxMjI3 +MDEwNTMyWjCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ +BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hp +bmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5G +LiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTEgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUExIENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXMw +gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALsw19zQVL01Tp/FTILq0VA8R5j8 +m2mdd81u4D/u6zJfX5/S0HnllXNEITLgCtud186Nq1KLK3jgm1t99P1tCeWu4Wwd +ByOgF9H5fahGRpEiqLJpxq339fWUoTCUvQDMRH/uxJ7JweaPCjbB/SQ9AaD1e+J8 +eGZDi09Z8pvZ+kmzAgMBAAGjggRTMIIETzAdBgNVHQ4EFgQUZyaW56G/2LUDnf47 +3P7yiuYV3TAwggFGBgNVHSMEggE9MIIBOYAUZyaW56G/2LUDnf473P7yiuYV3TCh +ggEcpIIBGDCCARQxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQ +BgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UEChMlSVBTIEludGVybmV0IHB1Ymxpc2hp +bmcgU2VydmljZXMgcy5sLjErMCkGA1UEChQiaXBzQG1haWwuaXBzLmVzIEMuSS5G +LiAgQi02MDkyOTQ1MjEvMC0GA1UECxMmSVBTIENBIENMQVNFQTEgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkxLzAtBgNVBAMTJklQUyBDQSBDTEFTRUExIENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOC +AQAwDAYDVR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUF +BwMBBggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYB +BAGCNwIBFQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglg +hkgBhvhCAQEEBAMCAAcwGgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1Ud +EgQTMBGBD2lwc0BtYWlsLmlwcy5lczBCBglghkgBhvhCAQ0ENRYzQ0xBU0VBMSBD +QSBDZXJ0aWZpY2F0ZSBpc3N1ZWQgYnkgaHR0cDovL3d3dy5pcHMuZXMvMCkGCWCG +SAGG+EIBAgQcFhpodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyLzA7BglghkgBhvhC +AQQELhYsaHR0cDovL3d3dy5pcHMuZXMvaXBzMjAwMi9pcHMyMDAyQ0xBU0VBMS5j +cmwwQAYJYIZIAYb4QgEDBDMWMWh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcmV2 +b2NhdGlvbkNMQVNFQTEuaHRtbD8wPQYJYIZIAYb4QgEHBDAWLmh0dHA6Ly93d3cu +aXBzLmVzL2lwczIwMDIvcmVuZXdhbENMQVNFQTEuaHRtbD8wOwYJYIZIAYb4QgEI +BC4WLGh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvcG9saWN5Q0xBU0VBMS5odG1s +MHUGA1UdHwRuMGwwMqAwoC6GLGh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvaXBz +MjAwMkNMQVNFQTEuY3JsMDagNKAyhjBodHRwOi8vd3d3YmFjay5pcHMuZXMvaXBz +MjAwMi9pcHMyMDAyQ0xBU0VBMS5jcmwwLwYIKwYBBQUHAQEEIzAhMB8GCCsGAQUF +BzABhhNodHRwOi8vb2NzcC5pcHMuZXMvMA0GCSqGSIb3DQEBBQUAA4GBAH66iqyA +AIQVCtWYUQxkxZwCWINmyq0eB81+atqAB98DNEock8RLWCA1NnHtogo1EqWmZaeF +aQoO42Hu6r4okzPV7Oi+xNtff6j5YzHIa5biKcJboOeXNp13XjFr/tOn2yrb25aL +H2betgPAK7N41lUH5Y85UN4HI3LmvSAUS7SG -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV -BAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2ln -biBHb2xkIENBIC0gRzIwHhcNMDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBF -MQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMR8wHQYDVQQDExZT -d2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC -CgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUqt2/8 -76LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+ -bbqBHH5CjCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c -6bM8K8vzARO/Ws/BtQpgvd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqE -emA8atufK+ze3gE/bk3lUIbLtK/tREDFylqM2tIrfKjuvqblCqoOpd8FUrdVxyJd -MmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvRAiTysybUa9oEVeXBCsdt -MDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuendjIj3o02y -MszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69y -FGkOpeUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPi -aG59je883WX0XaxR7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxM -gI93e2CaHt+28kgeDrpOVG2Y4OGiGqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCB -qTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWyV7 -lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn -8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov -L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe6 -45R88a7A3hfm5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczO -UYrHUDFu4Up+GC9pWbY9ZIEr44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5 -O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC -bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv -GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a -77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC -hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3 -92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp -Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w -ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt -Qc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFwTCCA6mgAwIBAgIITrIAZwwDXU8wDQYJKoZIhvcNAQEFBQAwSTELMAkGA1UE -BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEjMCEGA1UEAxMaU3dpc3NTaWdu -IFBsYXRpbnVtIENBIC0gRzIwHhcNMDYxMDI1MDgzNjAwWhcNMzYxMDI1MDgzNjAw -WjBJMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMSMwIQYDVQQD -ExpTd2lzc1NpZ24gUGxhdGludW0gQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQAD -ggIPADCCAgoCggIBAMrfogLi2vj8Bxax3mCq3pZcZB/HL37PZ/pEQtZ2Y5Wu669y -IIpFR4ZieIbWIDkm9K6j/SPnpZy1IiEZtzeTIsBQnIJ71NUERFzLtMKfkr4k2Htn -IuJpX+UFeNSH2XFwMyVTtIc7KZAoNppVRDBopIOXfw0enHb/FZ1glwCNioUD7IC+ -6ixuEFGSzH7VozPY1kneWCqv9hbrS3uQMpe5up1Y8fhXSQQeol0GcN1x2/ndi5ob -jM89o03Oy3z2u5yg+gnOI2Ky6Q0f4nIoj5+saCB9bzuohTEJfwvH6GXp43gOCWcw -izSC+13gzJ2BbWLuCB4ELE6b7P6pT1/9aXjvCR+htL/68++QHkwFix7qepF6w9fl -+zC8bBsQWJj3Gl/QKTIDE0ZNYWqFTFJ0LwYfexHihJfGmfNtf9dng34TaNhxKFrY -zt3oEBSa/m0jh26OWnA81Y0JAKeqvLAxN23IhBQeW71FYyBrS3SMvds6DsHPWhaP -pZjydomyExI7C3d3rLvlPClKknLKYRorXkzig3R3+jVIeoVNjZpTxN94ypeRSCtF -KwH3HBqi7Ri6Cr2D+m+8jVeTO9TUps4e8aCxzqv9KyiaTxvXw3LbpMS/XUz13XuW -ae5ogObnmLo2t/5u7Su9IPhlGdpVCX4l3P5hYnL5fhgC72O00Puv5TtjjGePAgMB -AAGjgawwgakwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O -BBYEFFCvzAeHFUdvOMW0ZdHelarp35zMMB8GA1UdIwQYMBaAFFCvzAeHFUdvOMW0 -ZdHelarp35zMMEYGA1UdIAQ/MD0wOwYJYIV0AVkBAQEBMC4wLAYIKwYBBQUHAgEW -IGh0dHA6Ly9yZXBvc2l0b3J5LnN3aXNzc2lnbi5jb20vMA0GCSqGSIb3DQEBBQUA -A4ICAQAIhab1Fgz8RBrBY+D5VUYI/HAcQiiWjrfFwUF1TglxeeVtlspLpYhg0DB0 -uMoI3LQwnkAHFmtllXcBrqS3NQuB2nEVqXQXOHtYyvkv+8Bldo1bAbl93oI9ZLi+ -FHSjClTTLJUYFzX1UWs/j6KWYTl4a0vlpqD4U99REJNi54Av4tHgvI42Rncz7Lj7 -jposiU0xEQ8mngS7twSNC/K5/FqdOxa3L8iYq/6KUFkuozv8KV2LwUvJ4ooTHbG/ -u0IdUt1O2BReEMYxB+9xJ/cbOQncguqLs5WGXv312l0xpuAxtpTmREl0xRbl9x8D -YSjFyMsSoEJL+WuICI20MhjzdZ/EfwBPBZWcoxcCw7NTm6ogOSkrZvqdr16zktK1 -puEa+S1BaYEUtLS17Yk9zvupnTVCRLEcFHOBzyoBNZox1S2PbYTfgE1X4z/FhHXa -icYwu+uPyyIIoK6q8QNsOktNCaUOcsZWayFCTiMlFGiudgp8DAdwZPmaL/YFOSbG -DI8Zf0NebvRbFS/bYV3mZy8/CJT5YLSYMdp08YSTcU1f+2BY0fvEwW2JorsgH51x -kcsymxM9Pn2SUjWskpSi0xjCfMfqr3YFFt1nJ8J+HAciIfNAChs0B0QTwoRqjt8Z -Wr9/6x3iGjjRXK9HkmuAtTClyY3YqzGBH9/CZjfTk6mFhnll0g== +MIIEGjCCAwKgAwIBAgIDAYagMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYDVQQGEwJG +STEQMA4GA1UECBMHRmlubGFuZDEhMB8GA1UEChMYVmFlc3RvcmVraXN0ZXJpa2Vz +a3VzIENBMSkwJwYDVQQLEyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBTZXJ2aWNl +czEZMBcGA1UECxMQVmFybWVubmVwYWx2ZWx1dDEZMBcGA1UEAxMQVlJLIEdvdi4g +Um9vdCBDQTAeFw0wMjEyMTgxMzUzMDBaFw0yMzEyMTgxMzUxMDhaMIGjMQswCQYD +VQQGEwJGSTEQMA4GA1UECBMHRmlubGFuZDEhMB8GA1UEChMYVmFlc3RvcmVraXN0 +ZXJpa2Vza3VzIENBMSkwJwYDVQQLEyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBT +ZXJ2aWNlczEZMBcGA1UECxMQVmFybWVubmVwYWx2ZWx1dDEZMBcGA1UEAxMQVlJL +IEdvdi4gUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALCF +FdrIAzfQo0Y3bBseljDCWoUSZyPyu5/nioFgJ/gTqTy894aqqvTzJSm0/nWuHoGG +igWyHWWyOOi0zCia+xc28ZPVec7Bg4shT8MNrUHfeJ1I4x9CRPw8bSEga60ihCRC +jxdNwlAfZM0tOSJWiP2yY51U2kJpwMhP1xjiPshphJQ9LIDGfM6911Mf64i5psu7 +hVfvV3ZdDIvTXhJBnyHAOfQmbQj6OLOhd7HuFtjQaNq0mKWgZUZKa41+qk1guPjI +DfxxPu45h4G02fhukO4/DmHXHSto5i7hQkQmeCxY8n0Wf2HASSQqiYe2XS8pGfim +545SnkFLWg6quMJmQlMCAwEAAaNVMFMwDwYDVR0TAQH/BAUwAwEB/zARBglghkgB +hvhCAQEEBAMCAAcwDgYDVR0PAQH/BAQDAgHGMB0GA1UdDgQWBBTb6eGb0tEkC/yr +46Bn6q6cS3f0sDANBgkqhkiG9w0BAQUFAAOCAQEArX1ID1QRnljurw2bEi8hpM2b +uoRH5sklVSPj3xhYKizbXvfNVPVRJHtiZ+GxH0mvNNDrsczZog1Sf0JLiGCXzyVy +t08pLWKfT6HAVVdWDsRol5EfnGTCKTIB6dTI2riBmCguGMcs/OubUpbf9MiQGS0j +8/G7cdqehSO9Gu8u5Hp5t8OdhkktY7ktdM9lDzJmid87Ie4pbzlj2RXBbvbfgD5Q +eBmK3QOjFKU3p7UsfLYRh+cF8ry23tT/l4EohP7+bEaFEEGfTXWMB9SZZ291im/k +UJL2mdUQuMSpe/cXjUu/15WfCdxEDx4yw8DP03kN5Mc7h/CQNIghYkmSBAQfvA== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UE @@ -3025,53 +4585,24 @@ zirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMWNY6E0F/6 MBr1mmz0DlP5OlvRHA== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOc -UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx -c8SxMQswCQYDVQQGDAJUUjEPMA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykg -MjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8 -dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMxMDI3MTdaFw0xNTAz -MjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2Vy -dGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYD -VQQHDAZBTktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kg -xLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEu -xZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7 -XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GXyGl8hMW0kWxsE2qkVa2k -heiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8iSi9BB35J -YbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5C -urKZ8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1 -JuTm5Rh8i27fbMx4W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51 -b0dewQIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV -9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46sWrv7/hg0Uw2ZkUd82YCdAR7 -kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxEq8Sn5RTOPEFh -fEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy -B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdA -aLX/7KfS0zgYnNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKS -RGQDJereW26fyfJOrN3H ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOc -UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx -c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xS -S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg -SGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcNMDUxMTA3MTAwNzU3 -WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVrdHJv -bmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJU -UjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSw -bGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWe -LiAoYykgS2FzxLFtIDIwMDUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB -AQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqeLCDe2JAOCtFp0if7qnef -J1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKIx+XlZEdh -R3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJ -Qv2gQrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGX -JHpsmxcPbe9TmJEr5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1p -zpwACPI2/z7woQ8arBT9pmAPAgMBAAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58S -Fq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8GA1UdEwEB/wQFMAMBAf8wDQYJ -KoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/nttRbj2hWyfIvwq -ECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4 -Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFz -gw2lGh1uEpJ+hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotH -uFEJjOp9zYhys2AzsfAKRO8P9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LS -y3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5UrbnBEI= +MIIDQzCCAiugAwIBAgIQX/h7KCtU3I1CoxW1aMmt/zANBgkqhkiG9w0BAQUFADA1 +MRYwFAYDVQQKEw1DaXNjbyBTeXN0ZW1zMRswGQYDVQQDExJDaXNjbyBSb290IENB +IDIwNDgwHhcNMDQwNTE0MjAxNzEyWhcNMjkwNTE0MjAyNTQyWjA1MRYwFAYDVQQK +Ew1DaXNjbyBTeXN0ZW1zMRswGQYDVQQDExJDaXNjbyBSb290IENBIDIwNDgwggEg +MA0GCSqGSIb3DQEBAQUAA4IBDQAwggEIAoIBAQCwmrmrp68Kd6ficba0ZmKUeIhH +xmJVhEAyv8CrLqUccda8bnuoqrpu0hWISEWdovyD0My5jOAmaHBKeN8hF570YQXJ +FcjPFto1YYmUQ6iEqDGYeJu5Tm8sUxJszR2tKyS7McQr/4NEb7Y9JHcJ6r8qqB9q +VvYgDxFUl4F1pyXOWWqCZe+36ufijXWLbvLdT6ZeYpzPEApk0E5tzivMW/VgpSdH +jWn0f84bcN5wGyDWbs2mAag8EtKpP6BrXruOIIt6keO1aO6g58QBdKhTCytKmg9l +Eg6CTY5j/e/rmxrbU6YTYK/CfdfHbBcl1HP7R2RQgYCUTOG/rksc35LtLgXfAgED +o1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUJ/PI +FR5umgIJFq0roIlgX9p7L6owEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQEF +BQADggEBAJ2dhISjQal8dwy3U8pORFBi71R803UXHOjgxkhLtv5MOhmBVrBW7hmW +Yqpao2TB9k5UM8Z3/sUcuuVdJcr18JOagxEu5sv4dEX+5wW4q+ffy0vhN4TauYuX +cB7w4ovXsNgOnbFp1iqRe6lJT37mjpXYgyc81WhJDtSd9i7rp77rMKSsH0T8lasz +Bvt9YAretIpjsJyp8qS5UwGH0GikJ3+r/+n6yUA4iGe0OcaEb1fJU9u6ju7AQ7L4 +CYNu/2bPPu8Xs1gYJQk0XuPL1hS27PKSb3TkL4Eq1ZKR4OCXPDJoBYVL0fdX4lId +kxpUnwVwwEpxYB5DC2Ae/qPOgRnhCzU= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/ @@ -3106,80 +4637,188 @@ LMDDav7v3Aun+kbfYNucpllQdSNpc5Oy+fwC00fmcc4QAu4njIT/rEUNE1yDMuAl pYYsfPQS -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB -yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL -ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp -U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW -ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0 -aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL -MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW -ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln -biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp -U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y -aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1 -nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex -t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz -SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG -BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+ -rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/ -NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E -BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH -BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy -aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv -MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE -p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y -5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK -WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ -4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N -hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq +MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC +VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0 +Lm5ldC9DUFMgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMW +KGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsGA1UEAxMkRW50cnVzdCBSb290IENl +cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0MloXDTI2MTEyNzIw +NTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMTkw +NwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSBy +ZWZlcmVuY2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNV +BAMTJEVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJ +KoZIhvcNAQEBBQADggEPADCCAQoCggEBALaVtkNC+sZtKm9I35RMOVcF7sN5EUFo +Nu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYszA9u3g3s+IIRe7bJWKKf4 +4LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOwwCj0Yzfv9 +KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGI +rb68j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi +94DkZfs0Nw4pgHBNrziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOB +sDCBrTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAi +gA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1MzQyWjAfBgNVHSMEGDAWgBRo +kORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DHhmak8fdLQ/uE +vW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA +A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9t +O1KzKtvn1ISMY/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6Zua +AGAT/3B+XxFNSRuzFVJ7yVTav52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP +9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTSW3iDVuycNsMm4hH2Z0kdkquM++v/ +eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m +0vdXcDazv/wor3ElhVsT/h5/WrQ8 -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIID5TCCAs2gAwIBAgIEOeSXnjANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC -VVMxFDASBgNVBAoTC1dlbGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBD -ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEvMC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9v -dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDAxMDExMTY0MTI4WhcNMjEwMTE0 -MTY0MTI4WjCBgjELMAkGA1UEBhMCVVMxFDASBgNVBAoTC1dlbGxzIEZhcmdvMSww -KgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEvMC0G -A1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVqDM7Jvk0/82bfuUER84A4n13 -5zHCLielTWi5MbqNQ1mXx3Oqfz1cQJ4F5aHiidlMuD+b+Qy0yGIZLEWukR5zcUHE -SxP9cMIlrCL1dQu3U+SlK93OvRw6esP3E48mVJwWa2uv+9iWsWCaSOAlIiR5NM4O -JgALTqv9i86C1y8IcGjBqAr5dE8Hq6T54oN+J3N0Prj5OEL8pahbSCOz6+MlsoCu -ltQKnMJ4msZoGK43YjdeUXWoWGPAUe5AeH6orxqg4bB4nVCMe+ez/I4jsNtlAHCE -AQgAFG5Uhpq6zPk3EPbg3oQtnaSFN9OH4xXQwReQfhkhahKpdv0SAulPIV4XAgMB -AAGjYTBfMA8GA1UdEwEB/wQFMAMBAf8wTAYDVR0gBEUwQzBBBgtghkgBhvt7hwcB -CzAyMDAGCCsGAQUFBwIBFiRodHRwOi8vd3d3LndlbGxzZmFyZ28uY29tL2NlcnRw -b2xpY3kwDQYJKoZIhvcNAQEFBQADggEBANIn3ZwKdyu7IvICtUpKkfnRLb7kuxpo -7w6kAOnu5+/u9vnldKTC2FJYxHT7zmu1Oyl5GFrvm+0fazbuSCUlFLZWohDo7qd/ -0D+j0MNdJu4HzMPBJCGHHt8qElNvQRbn7a6U+oxy+hNH8Dx+rn0ROhPs7fpvcmR7 -nX1/Jv16+yWt6j4pf0zjAFcysLPp7VMX2YuyFA4w6OXVE8Zkr8QA1dhYJPz1j+zx -x32l2w8n0cbyQIjmH/ZhqPRCyLk306m+LFZ4wnKbWV01QIroTmMatukgalHizqSQ -33ZwmVxwQ023tqcZZE6St8WRPH9IFmV7Fv3L/PvZ1dZPIWU7Sn9Ho/s= +MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBY +MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMo +R2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEx +MjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQK +Ew1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQcmltYXJ5IENlcnRp +ZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9 +AWbK7hWNb6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjA +ZIVcFU2Ix7e64HXprQU9nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE0 +7e9GceBrAqg1cmuXm2bgyxx5X9gaBGgeRwLmnWDiNpcB3841kt++Z8dtd1k7j53W +kBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGttm/81w7a4DSwDRp35+MI +mO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G +A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJ +KoZIhvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ1 +6CePbJC/kRYkRj5KTs4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl +4b7UVXGYNTq+k+qurUKykG/g/CFNNWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6K +oKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHaFloxt/m0cYASSJlyc1pZU8Fj +UjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG1riR/aYNKxoU +AT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB -gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk -MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY -UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx -NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3 -dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy -dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB -dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6 -38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP -KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q -DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4 -qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa -JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi -PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P -BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs -jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0 -eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD -ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR -vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt -qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa -IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy -i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ -O+7ETPTsJ3xCwnR8gooJybQDJbw= +MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC +TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0 +aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0 +aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz +MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw +IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR +dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp +li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D +rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ +WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug +F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU +xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC +Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv +dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw +ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl +IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh +c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy +ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh +Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI +KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T +KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq +y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p +dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD +VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL +MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk +fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8 +7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R +cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y +mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW +xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK +SnQ2+Q== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEVzCCAz+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCRVMx +IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1 +dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2 +MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w +HhcNMDExMDI0MjIwMDAwWhcNMTMxMDI0MjIwMDAwWjCBnTELMAkGA1UEBhMCRVMx +IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1 +dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2 +MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w +ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnIwNvbyOlXnjOlSztlB5u +Cp4Bx+ow0Syd3Tfom5h5VtP8c9/Qit5Vj1H5WuretXDE7aTt/6MNbg9kUDGvASdY +rv5sp0ovFy3Tc9UTHI9ZpTQsHVQERc1ouKDAA6XPhUJHlShbz++AbOCQl4oBPB3z +hxAwJkh91/zpnZFx/0GaqUC1N5wpIE8fUuOgfRNtVLcK3ulqTgesrBlf3H5idPay +BQC6haD9HThuy1q7hryUZzM1gywfI834yJFxzJeL764P3CkDG8A563DtwW4O2GcL +iam8NeTvtjS0pbbELaW+0MOUJEjb35bTALVmGotmBQ/dPz/LP6pemkr4tErvlTcb +AgMBAAGjgZ8wgZwwKgYDVR0RBCMwIYYfaHR0cDovL3d3dy5maXJtYXByb2Zlc2lv +bmFsLmNvbTASBgNVHRMBAf8ECDAGAQH/AgEBMCsGA1UdEAQkMCKADzIwMDExMDI0 +MjIwMDAwWoEPMjAxMzEwMjQyMjAwMDBaMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E +FgQUMwugZtHq2s7eYpMEKFK1FH84aLcwDQYJKoZIhvcNAQEFBQADggEBAEdz/o0n +VPD11HecJ3lXV7cVVuzH2Fi3AQL0M+2TUIiefEaxvT8Ub/GzR0iLjJcG1+p+o1wq +u00vR+L4OQbJnC4xGgN49Lw4xiKLMzHwFgQEffl25EvXwOaD7FnMP97/T2u3Z36m +hoEyIwOdyPdfwUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzfl +ZKG+TQyTmAyX9odtsz/ny4Cm7YjHX1BiAuiZdBbQ5rQ58SfLyEDW44YQqSMSkuBp +QWOnryULwMWSyx6Yo1q6xTMPoJcB3X/ge9YGVM+h4k0460tQtcsm9MracEpqoeJ5 +quGnM/b9Sh/22WA= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEb +MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow +GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0 +aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEwMDAwMDBaFw0yODEyMzEyMzU5NTla +MH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO +BgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUwIwYD +VQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWW +fnJSoBVC21ndZHoa0Lh73TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMt +TGo87IvDktJTdyR0nAducPy9C1t2ul/y/9c3S0pgePfw+spwtOpZqqPOSC+pw7IL +fhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6juljatEPmsbS9Is6FARW +1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsSivnkBbA7 +kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0G +A1UdDgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYD +VR0TAQH/BAUwAwEB/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21v +ZG9jYS5jb20vVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRo +dHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMu +Y3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8NtwuleGFTQQuS9/ +HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32 +pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxIS +jBc/lDb+XbDABHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+ +xqFx7D+gIIxmOom0jtTYsU0lR+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/Atyjcn +dBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O9y5Xt5hwXsjEeLBi +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEGjCCAwICEQCLW3VWhFSFCwDPrzhIzrGkMA0GCSqGSIb3DQEBBQUAMIHKMQsw +CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl +cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu +LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT +aWduIENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp +dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD +VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT +aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ +bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu +IENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg +LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN2E1Lm0+afY8wR4 +nN493GwTFtl63SRRZsDHJlkNrAYIwpTRMx/wgzUfbhvI3qpuFU5UJ+/EbRrsC+MO +8ESlV8dAWB6jRx9x7GD2bZTIGDnt/kIYVt/kTEkQeE4BdjVjEjbdZrwBBDajVWjV +ojYJrKshJlQGrT/KFOCsyq0GHZXi+J3x4GD/wn91K0zM2v6HmSHquv4+VNfSWXjb +PG7PoBMAGrgnoeS+Z5bKoMWznN3JdZ7rMJpfo83ZrngZPyPpXNspva1VyBtUjGP2 +6KbqxzcSXKMpHgLZ2x87tNcPVkeBFQRKr4Mn0cVYiMHd9qqnoxjaaKptEVHhv2Vr +n5Z20T0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAq2aN17O6x5q25lXQBfGfMY1a +qtmqRiYPce2lrVNWYgFHKkTp/j90CxObufRNG7LRX7K20ohcs5/Ny9Sn2WCVhDr4 +wTcdYcrnsMXlkdpUpqwxga6X3s0IrLjAl4B/bnKk52kTlWUfxJM8/XmPBNQ+T+r3 +ns7NZ3xPZQL/kYVUc8f/NveGLezQXk//EZ9yBta4GvFMDSZl4kSAHsef493oCtrs +pSCAaWihT37ha88HQfqDjrw43bAuEbFrskLMmrz5SCJ5ShkPshw+IHTZasO+8ih4 +E1Z5T21Q6huwtVexN2ZYI/PcD98Kh8TvhgXVOBRgmaNL3gaWcSzy27YfpO8/7g== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjEL +MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV +BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0 +Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYwMTEyMTQzODQzWhcNMjUxMjMxMjI1 +OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i +SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UEAxMc +VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jf +tMjWQ+nEdVl//OEd+DFwIxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKg +uNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2J +XjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQXa7pIXSSTYtZgo+U4+lK +8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7uSNQZu+99 +5OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1Ud +EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3 +kUrL84J6E1wIqzCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy +dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6 +Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz +JTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290 +Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u +TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iS +GNn3Bzn1LL4GdXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprt +ZjluS5TmVfwLG4t3wVMTZonZKNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8 +au0WOB9/WIFaGusyiC2y8zl3gK9etmF1KdsjTYjKUCjLhdLTEKJZbtOTVAB6okaV +hgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kPJOzHdiEoZa5X6AeI +dUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfkvQ== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB @@ -3207,6 +4846,477 @@ LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7 jVaMaA== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- +MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP +MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx +MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV +BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o +Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt +5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s +3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej +vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu +8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw +DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG +MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil +zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/ +3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD +FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6 +Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2 +ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEU +MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3 +b3JrMSAwHgYDVQQDExdBZGRUcnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAx +MDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtB +ZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIDAeBgNV +BAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOC +AQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV +6tsfSlbunyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nX +GCwwfQ56HmIexkvA/X1id9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnP +dzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSGAa2Il+tmzV7R/9x98oTaunet3IAIx6eH +1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAwHM+A+WD+eeSI8t0A65RF +62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0GA1UdDgQW +BBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUw +AwEB/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDEL +MAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRU +cnVzdCBUVFAgTmV0d29yazEgMB4GA1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJv +b3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4JNojVhaTdt02KLmuG7jD8WS6 +IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL+YPoRNWyQSW/ +iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao +GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh +4SINhwBk/ox9Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQm +XiLsks3/QppEIW1cxeMiHV9HEufOX1362KqxMy3ZdvJOOjMMK7MtkAY= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIH6jCCB1OgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARIxCzAJBgNVBAYTAkVT +MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE +ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE +ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEuMCwGA1UECxMl +SVBTIENBIENMQVNFMyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMl +SVBTIENBIENMQVNFMyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEeMBwGCSqGSIb3 +DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTAxMTIyOTAxMDE0NFoXDTI1MTIyNzAx +MDE0NFowggESMQswCQYDVQQGEwJFUzESMBAGA1UECBMJQmFyY2Vsb25hMRIwEAYD +VQQHEwlCYXJjZWxvbmExLjAsBgNVBAoTJUlQUyBJbnRlcm5ldCBwdWJsaXNoaW5n +IFNlcnZpY2VzIHMubC4xKzApBgNVBAoUImlwc0BtYWlsLmlwcy5lcyBDLkkuRi4g +IEItNjA5Mjk0NTIxLjAsBgNVBAsTJUlQUyBDQSBDTEFTRTMgQ2VydGlmaWNhdGlv +biBBdXRob3JpdHkxLjAsBgNVBAMTJUlQUyBDQSBDTEFTRTMgQ2VydGlmaWNhdGlv +biBBdXRob3JpdHkxHjAcBgkqhkiG9w0BCQEWD2lwc0BtYWlsLmlwcy5lczCBnzAN +BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqxf+DrDGaBtT8FK+n/ra+osTBLsBjzLZ +H49NzjaY2uQARIwo2BNEKqRrThckQpzTiKRBgtYj+4vJhuW5qYIF3PHeH+AMmVWY +8jjsbJ0gA8DvqqPGZARRLXgNo9KoOtYkTOmWehisEyMiG3zoMRGzXwmqMHBxRiVr +SXGAK5UBsh8CAwEAAaOCBEowggRGMB0GA1UdDgQWBBS4k/8uy9wsjqLnev42USGj +mFsMNDCCAUQGA1UdIwSCATswggE3gBS4k/8uy9wsjqLnev42USGjmFsMNKGCARqk +ggEWMIIBEjELMAkGA1UEBhMCRVMxEjAQBgNVBAgTCUJhcmNlbG9uYTESMBAGA1UE +BxMJQmFyY2Vsb25hMS4wLAYDVQQKEyVJUFMgSW50ZXJuZXQgcHVibGlzaGluZyBT +ZXJ2aWNlcyBzLmwuMSswKQYDVQQKFCJpcHNAbWFpbC5pcHMuZXMgQy5JLkYuICBC +LTYwOTI5NDUyMS4wLAYDVQQLEyVJUFMgQ0EgQ0xBU0UzIENlcnRpZmljYXRpb24g +QXV0aG9yaXR5MS4wLAYDVQQDEyVJUFMgQ0EgQ0xBU0UzIENlcnRpZmljYXRpb24g +QXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOCAQAwDAYD +VR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMBBggr +BgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIB +FQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhC +AQEEBAMCAAcwGgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGB +D2lwc0BtYWlsLmlwcy5lczBBBglghkgBhvhCAQ0ENBYyQ0xBU0UzIENBIENlcnRp +ZmljYXRlIGlzc3VlZCBieSBodHRwOi8vd3d3Lmlwcy5lcy8wKQYJYIZIAYb4QgEC +BBwWGmh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvMDoGCWCGSAGG+EIBBAQtFito +dHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRTMuY3JsMD8GCWCG +SAGG+EIBAwQyFjBodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL3Jldm9jYXRpb25D +TEFTRTMuaHRtbD8wPAYJYIZIAYb4QgEHBC8WLWh0dHA6Ly93d3cuaXBzLmVzL2lw +czIwMDIvcmVuZXdhbENMQVNFMy5odG1sPzA6BglghkgBhvhCAQgELRYraHR0cDov +L3d3dy5pcHMuZXMvaXBzMjAwMi9wb2xpY3lDTEFTRTMuaHRtbDBzBgNVHR8EbDBq +MDGgL6AthitodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRTMu +Y3JsMDWgM6Axhi9odHRwOi8vd3d3YmFjay5pcHMuZXMvaXBzMjAwMi9pcHMyMDAy +Q0xBU0UzLmNybDAvBggrBgEFBQcBAQQjMCEwHwYIKwYBBQUHMAGGE2h0dHA6Ly9v +Y3NwLmlwcy5lcy8wDQYJKoZIhvcNAQEFBQADgYEAF2VcmZVDAyevJuXr0LMXI/dD +qsfwfewPxqmurpYPdikc4gYtfibFPPqhwYHOU7BC0ZdXGhd+pFFhxu7pXu8Fuuu9 +D6eSb9ijBmgpjnn1/7/5p6/ksc7C0YBCJwUENPjDfxZ4IwwHJPJGR607VNCv1TGy +r33I6unUVtkOE7LFRVA= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzES +MBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFU +V0NBIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMz +WhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJVEFJV0FO +LUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlm +aWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFE +AcK0HMMxQhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HH +K3XLfJ+utdGdIzdjp9xCoi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeX +RfwZVzsrb+RH9JlF/h3x+JejiB03HFyP4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/z +rX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1ry+UPizgN7gr8/g+YnzAx +3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV +HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkq +hkiG9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeC +MErJk/9q56YAf4lCmtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdls +XebQ79NqZp4VKIV66IIArB6nCWlWQtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62D +lhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVYT0bf+215WfKEIlKuD8z7fDvn +aspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocnyYh0igzyXxfkZ +YiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDODCCAqGgAwIBAgIQQAWyU6AaRkNQCYGPEhB27DANBgkqhkiG9w0BAQUFADCB +zzELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ +Q2FwZSBUb3duMRowGAYDVQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYGA1UECxMf +Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEjMCEGA1UEAxMaVGhhd3Rl +IFBlcnNvbmFsIFByZW1pdW0gQ0ExKjAoBgkqhkiG9w0BCQEWG3BlcnNvbmFsLXBy +ZW1pdW1AdGhhd3RlLmNvbTAeFw05NjAxMDEwMDAwMDBaFw0yMTAxMDEyMzU5NTla +MIHPMQswCQYDVQQGEwJaQTEVMBMGA1UECBMMV2VzdGVybiBDYXBlMRIwEAYDVQQH +EwlDYXBlIFRvd24xGjAYBgNVBAoTEVRoYXd0ZSBDb25zdWx0aW5nMSgwJgYDVQQL +Ex9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMSMwIQYDVQQDExpUaGF3 +dGUgUGVyc29uYWwgUHJlbWl1bSBDQTEqMCgGCSqGSIb3DQEJARYbcGVyc29uYWwt +cHJlbWl1bUB0aGF3dGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJ +Ztn4B0TPuYwu8KHvE0VsBd/eJxZRNkERbGw77f4QfRKe5ZtCmv5gMcNmt3M6SK5O +0DI3lIi1DbbZ8/JE2dWIEt12TfIa/G8jHnrx2JhFTgcQ7xZC0EN1bUre4qrJMf8f +AHB8Zs8QJQi6+u4A6UYDZicRFTuqW/KY3TZCstqIdQIDAQABoxMwETAPBgNVHRMB +Af8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBALpkCujztDHJJ2+idqAtNnHHhsAI +wk7t2pokGYf8WiOcck0I361cwzskgR1Xj7YSpSID7xK90S1elo8mJk9LG3w7oFIa +pag3hsRHKsrdQfho9cITQSma8AyozaH8FSMC23or1GJRQkfEox/00sVNVBDr2vDM +p083DL08yxDjGugV +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIH6jCCB1OgAwIBAgIBADANBgkqhkiG9w0BAQUFADCCARIxCzAJBgNVBAYTAkVT +MRIwEAYDVQQIEwlCYXJjZWxvbmExEjAQBgNVBAcTCUJhcmNlbG9uYTEuMCwGA1UE +ChMlSVBTIEludGVybmV0IHB1Ymxpc2hpbmcgU2VydmljZXMgcy5sLjErMCkGA1UE +ChQiaXBzQG1haWwuaXBzLmVzIEMuSS5GLiAgQi02MDkyOTQ1MjEuMCwGA1UECxMl +SVBTIENBIENMQVNFMSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMl +SVBTIENBIENMQVNFMSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEeMBwGCSqGSIb3 +DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTAxMTIyOTAwNTkzOFoXDTI1MTIyNzAw +NTkzOFowggESMQswCQYDVQQGEwJFUzESMBAGA1UECBMJQmFyY2Vsb25hMRIwEAYD +VQQHEwlCYXJjZWxvbmExLjAsBgNVBAoTJUlQUyBJbnRlcm5ldCBwdWJsaXNoaW5n +IFNlcnZpY2VzIHMubC4xKzApBgNVBAoUImlwc0BtYWlsLmlwcy5lcyBDLkkuRi4g +IEItNjA5Mjk0NTIxLjAsBgNVBAsTJUlQUyBDQSBDTEFTRTEgQ2VydGlmaWNhdGlv +biBBdXRob3JpdHkxLjAsBgNVBAMTJUlQUyBDQSBDTEFTRTEgQ2VydGlmaWNhdGlv +biBBdXRob3JpdHkxHjAcBgkqhkiG9w0BCQEWD2lwc0BtYWlsLmlwcy5lczCBnzAN +BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4FEnpwvdr9G5Q1uCN0VWcu+atsIS7ywS +zHb5BlmvXSHU0lq4oNTzav3KaY1mSPd05u42veiWkXWmcSjK5yISMmmwPh5r9FBS +YmL9Yzt9fuzuOOpi9GyocY3h6YvJP8a1zZRCb92CRTzo3wno7wpVqVZHYUxJZHMQ +KD/Kvwn/xi8CAwEAAaOCBEowggRGMB0GA1UdDgQWBBTrsxl588GlHKzcuh9morKb +adB4CDCCAUQGA1UdIwSCATswggE3gBTrsxl588GlHKzcuh9morKbadB4CKGCARqk +ggEWMIIBEjELMAkGA1UEBhMCRVMxEjAQBgNVBAgTCUJhcmNlbG9uYTESMBAGA1UE +BxMJQmFyY2Vsb25hMS4wLAYDVQQKEyVJUFMgSW50ZXJuZXQgcHVibGlzaGluZyBT +ZXJ2aWNlcyBzLmwuMSswKQYDVQQKFCJpcHNAbWFpbC5pcHMuZXMgQy5JLkYuICBC +LTYwOTI5NDUyMS4wLAYDVQQLEyVJUFMgQ0EgQ0xBU0UxIENlcnRpZmljYXRpb24g +QXV0aG9yaXR5MS4wLAYDVQQDEyVJUFMgQ0EgQ0xBU0UxIENlcnRpZmljYXRpb24g +QXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9pcHNAbWFpbC5pcHMuZXOCAQAwDAYD +VR0TBAUwAwEB/zAMBgNVHQ8EBQMDB/+AMGsGA1UdJQRkMGIGCCsGAQUFBwMBBggr +BgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYKKwYBBAGCNwIB +FQYKKwYBBAGCNwIBFgYKKwYBBAGCNwoDAQYKKwYBBAGCNwoDBDARBglghkgBhvhC +AQEEBAMCAAcwGgYDVR0RBBMwEYEPaXBzQG1haWwuaXBzLmVzMBoGA1UdEgQTMBGB +D2lwc0BtYWlsLmlwcy5lczBBBglghkgBhvhCAQ0ENBYyQ0xBU0UxIENBIENlcnRp +ZmljYXRlIGlzc3VlZCBieSBodHRwOi8vd3d3Lmlwcy5lcy8wKQYJYIZIAYb4QgEC +BBwWGmh0dHA6Ly93d3cuaXBzLmVzL2lwczIwMDIvMDoGCWCGSAGG+EIBBAQtFito +dHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRTEuY3JsMD8GCWCG +SAGG+EIBAwQyFjBodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL3Jldm9jYXRpb25D +TEFTRTEuaHRtbD8wPAYJYIZIAYb4QgEHBC8WLWh0dHA6Ly93d3cuaXBzLmVzL2lw +czIwMDIvcmVuZXdhbENMQVNFMS5odG1sPzA6BglghkgBhvhCAQgELRYraHR0cDov +L3d3dy5pcHMuZXMvaXBzMjAwMi9wb2xpY3lDTEFTRTEuaHRtbDBzBgNVHR8EbDBq +MDGgL6AthitodHRwOi8vd3d3Lmlwcy5lcy9pcHMyMDAyL2lwczIwMDJDTEFTRTEu +Y3JsMDWgM6Axhi9odHRwOi8vd3d3YmFjay5pcHMuZXMvaXBzMjAwMi9pcHMyMDAy +Q0xBU0UxLmNybDAvBggrBgEFBQcBAQQjMCEwHwYIKwYBBQUHMAGGE2h0dHA6Ly9v +Y3NwLmlwcy5lcy8wDQYJKoZIhvcNAQEFBQADgYEAK9Dr/drIyllq2tPMMi7JVBuK +Yn4VLenZMdMu9Ccj/1urxUq2ckCuU3T0vAW0xtnIyXf7t/k0f3gA+Nak5FI/LEpj +V4F1Wo7ojPsCwJTGKbqz3Bzosq/SLmJbGqmODszFV0VRFOlOHIilkfSj945RyKm+ +hjM+5i9Ibq9UkE6tsSU= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw +CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl +cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu +LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT +aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp +dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD +VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT +aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ +bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu +IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg +LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b +N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t +KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu +kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm +CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ +Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu +imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te +2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe +DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC +/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p +F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt +TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFVTCCBD2gAwIBAgIEO/OB0DANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJj +aDEOMAwGA1UEChMFYWRtaW4xETAPBgNVBAsTCFNlcnZpY2VzMSIwIAYDVQQLExlD +ZXJ0aWZpY2F0aW9uIEF1dGhvcml0aWVzMRYwFAYDVQQDEw1BZG1pbi1Sb290LUNB +MB4XDTAxMTExNTA4NTEwN1oXDTIxMTExMDA3NTEwN1owbDELMAkGA1UEBhMCY2gx +DjAMBgNVBAoTBWFkbWluMREwDwYDVQQLEwhTZXJ2aWNlczEiMCAGA1UECxMZQ2Vy +dGlmaWNhdGlvbiBBdXRob3JpdGllczEWMBQGA1UEAxMNQWRtaW4tUm9vdC1DQTCC +ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMvgr0QUIv5qF0nyXZ3PXAJi +C4C5Wr+oVTN7oxIkXkxvO0GJToM9n7OVJjSmzBL0zJ2HXj0MDRcvhSY+KiZZc6Go +vDvr5Ua481l7ILFeQAFtumeza+vvxeL5Nd0Maga2miiacLNAKXbAcUYRa0Ov5VZB +++YcOYNNt/aisWbJqA2y8He+NsEgJzK5zNdayvYXQTZN+7tVgWOck16Da3+4FXdy +fH1NCWtZlebtMKtERtkVAaVbiWW24CjZKAiVfggjsiLo3yVMPGj3budLx5D9hEEm +vlyDOtcjebca+AcZglppWMX/iHIrx7740y0zd6cWEqiLIcZCrnpkr/KzwO135GkC +AwEAAaOCAf0wggH5MA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIASBkTCBjjCBiwYI +YIV0AREDAQAwfzArBggrBgEFBQcCAjAfGh1UaGlzIGlzIHRoZSBBZG1pbi1Sb290 +LUNBIENQUzBQBggrBgEFBQcCARZEaHR0cDovL3d3dy5pbmZvcm1hdGlrLmFkbWlu +LmNoL1BLSS9saW5rcy9DUFNfMl8xNl83NTZfMV8xN18zXzFfMC5wZGYwfwYDVR0f +BHgwdjB0oHKgcKRuMGwxFjAUBgNVBAMTDUFkbWluLVJvb3QtQ0ExIjAgBgNVBAsT +GUNlcnRpZmljYXRpb24gQXV0aG9yaXRpZXMxETAPBgNVBAsTCFNlcnZpY2VzMQ4w +DAYDVQQKEwVhZG1pbjELMAkGA1UEBhMCY2gwHQYDVR0OBBYEFIKf+iNzIPGXi7JM +Tb5CxX9mzWToMIGZBgNVHSMEgZEwgY6AFIKf+iNzIPGXi7JMTb5CxX9mzWTooXCk +bjBsMQswCQYDVQQGEwJjaDEOMAwGA1UEChMFYWRtaW4xETAPBgNVBAsTCFNlcnZp +Y2VzMSIwIAYDVQQLExlDZXJ0aWZpY2F0aW9uIEF1dGhvcml0aWVzMRYwFAYDVQQD +Ew1BZG1pbi1Sb290LUNBggQ784HQMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0B +AQUFAAOCAQEAeE96XCYRpy6umkPKXDWCRn7INo96ZrWpMggcDORuofHIwdTkgOeM +vWOxDN/yuT7CC3FAaUajbPRbDw0hRMcqKz0aC8CgwcyIyhw/rFK29mfNTG3EviP9 +QSsEbnelFnjpm1wjz4EaBiFjatwpUbI6+Zv3XbEt9QQXBn+c6DeFLe4xvC4B+MTr +a440xTk59pSYux8OHhEvqIwHCkiijGqZhTS3KmGFeBopaR+dJVBRBMoXwzk4B3Hn +0Zib1dEYFZa84vPJZyvxCbLOnPRDJgH6V2uQqbG+6DXVaf/wORVOvF/wzzv0viM/ +RWbEtJZdvo8N3sdtCULzifnxP/V0T9+4ZQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDOzCCAiOgAwIBAgIRANAeRlAAACmMAAAAAgAAAAIwDQYJKoZIhvcNAQEFBQAw +PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD +Ew5EU1QgUm9vdCBDQSBYNDAeFw0wMDA5MTMwNjIyNTBaFw0yMDA5MTMwNjIyNTBa +MD8xJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjEXMBUGA1UE +AxMORFNUIFJvb3QgQ0EgWDQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQCthX3OFEYY8gSeIYur0O4ypOT68HnDrjLfIutL5PZHRwQGjzCPb9PFo/ihboJ8 +RvfGhBAqpQCo47zwYEhpWm1jB+L/OE/dBBiyn98krfU2NiBKSom2J58RBeAwHGEy +cO+lewyjVvbDDLUy4CheY059vfMjPAftCRXjqSZIolQb9FdPcAoa90mFwB7rKniE +J7vppdrUScSS0+eBrHSUPLdvwyn4RGp+lSwbWYcbg5EpSpE0GRJdchic0YDjvIoC +YHpe7Rkj93PYRTQyU4bhC88ck8tMqbvRYqMRqR+vobbkrj5LLCOQCHV5WEoxWh+0 +E2SpIFe7RkV++MmpIAc0h1tZAgMBAAGjMjAwMA8GA1UdEwEB/wQFMAMBAf8wHQYD +VR0OBBYEFPCD6nPIP1ubWzdf9UyPWvf0hki9MA0GCSqGSIb3DQEBBQUAA4IBAQCE +G85wl5eEWd7adH6XW/ikGN5salvpq/Fix6yVTzE6CrhlP5LBdkf6kx1bSPL18M45 +g0rw2zA/MWOhJ3+S6U+BE0zPGCuu8YQaZibR7snm3HiHUaZNMu5c8D0x0bcMxDjY +AVVcHCoNiL53Q4PLW27nbY6wwG0ffFKmgV3blxrYWfuUDgGpyPwHwkfVFvz9qjaV +mf12VJffL6W8omBPtgteb6UaT/k1oJ7YI0ldGf+ngpVbRhD+LC3cUtT6GO/BEPZu +8YTV/hbiDH5v3khVqMIeKT6o8IuXGG7F6a6vKwP1F1FwTXf4UC/ivhme7vdUH7B/ +Vv4AEbT8dNfEeFxrkDbh +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDAzCCAmwCEQC5L2DMiJ+hekYJuFtwbIqvMA0GCSqGSIb3DQEBBQUAMIHBMQsw +CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0Ns +YXNzIDIgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH +MjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9y +aXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazAe +Fw05ODA1MTgwMDAwMDBaFw0yODA4MDEyMzU5NTlaMIHBMQswCQYDVQQGEwJVUzEX +MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGlj +IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMx +KGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s +eTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazCBnzANBgkqhkiG9w0B +AQEFAAOBjQAwgYkCgYEAp4gBIXQs5xoD8JjhlzwPIQjxnNuX6Zr8wgQGE75fUsjM +HiwSViy4AWkszJkfrbCWrnkE8hM5wXuYuggs6MKEEyyqaekJ9MepAqRCwiNPStjw +DqL7MWzJ5m+ZJwf15vRMeJ5t60aG+rmGyVTyssSv1EYcWskVMP8NbPUtDm3Of3cC +AwEAATANBgkqhkiG9w0BAQUFAAOBgQByLvl/0fFx+8Se9sVeUYpAmLho+Jscg9ji +nb3/7aHmZuovCfTK1+qlK5X2JGCGTUQug6XELaDTrnhpb3LabK4I8GOSN+a7xDAX +rXfMSTWqz9iP0b63GJZHc2pUIjRkLbYWm1lbtFFZOrMLFPQS32eg9K0yZF6xRnIn +jBJ7xUS0rg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFGjCCBAKgAwIBAgIEPL7eEDANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJQ +TDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMbQ2Vu +dHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MRswGQYDVQQDExJDQyBTaWduZXQgLSBS +b290Q0EwHhcNMDIwNDE4MTQ1NDA4WhcNMjYwOTIxMTU0MjE5WjB2MQswCQYDVQQG +EwJQTDEfMB0GA1UEChMWVFAgSW50ZXJuZXQgU3AuIHogby5vLjEkMCIGA1UECxMb +Q2VudHJ1bSBDZXJ0eWZpa2FjamkgU2lnbmV0MSAwHgYDVQQDExdDQyBTaWduZXQg +LSBQQ0EgS2xhc2EgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM7B +rBlbN5maM5eg0BOTqoZ+9NBDvU8Lm5rTdrMswFTCathzpVVLK/JD4K3+4oCZ9SRA +spEXE4gvwb08ASY6w5s+HpRkeJw8YzMFR5kDZD5adgnCAy4vDfIXYZgppXPaTQ8w +nfUZ7BZ7Zfa7QBemUIcJIzJBB0UqgtxWCeol9IekpBRVmuuSA6QG0Jkm+pGDJ05y +j2eQG8jTcBENM7sVA8rGRMyFA4skSZ+D0OG6FS2xC1i9JyN0ag1yII/LPx8HK5J4 +W9MaPRNjAEeaa2qI9EpchwrOxnyVbQfSedCG1VRJfAsE/9tT9CMUPZ3xW20QjQcS +ZJqVcmGW9gVsXKQOVLsCAwEAAaOCAbMwggGvMA8GA1UdEwEB/wQFMAMBAf8wDgYD +VR0PAQH/BAQDAgEGMIIBBAYDVR0gBIH8MIH5MIH2Bg0rBgEEAb4/AgEKAQEBMIHk +MIGaBggrBgEFBQcCAjCBjRqBikNlcnR5ZmlrYXQgd3lzdGF3aW9ueSB6Z29kbmll +IHogZG9rdW1lbnRlbTogIlBvbGl0eWthIENlcnR5ZmlrYWNqaSBkbGEgUm9vdENB +Ii4gQ2VydHlmaWthdCB3eXN0YXdpb255IHByemV6IFJvb3RDQSB3IGhpZXJhcmNo +aWkgQ0MgU2lnbmV0LjBFBggrBgEFBQcCARY5aHR0cDovL3d3dy5zaWduZXQucGwv +cmVwb3p5dG9yaXVtL2Rva3VtZW50eS9wY19yb290Y2EudHh0MEQGA1UdHwQ9MDsw +OaA3oDWGM2h0dHA6Ly93d3cuc2lnbmV0LnBsL3JlcG96eXRvcml1bS9yb290Y2Ev +cm9vdGNhLmNybDAfBgNVHSMEGDAWgBTAm8UjDQLhpk5Iax8A6eOaFBuxrzAdBgNV +HQ4EFgQUwGxGyl2CfpYHRonE82AVXO08kMIwDQYJKoZIhvcNAQEFBQADggEBABp1 +TAUsa+BeVWg4cjowc8yTJ5XN3GvN96GObMkxUGY7U9kVrLI71xBgoNVyzXTiMNDB +vjh7vdPWjpl5SDiRpnnKiOFXA43HvNWzUaOkTu1mxjJsZsanot1Xt6j0ZDC+03Fj +LHdYMyM9kSWp6afb4980EPYZCcSzgM5TOGfJmNii5Tq468VFKrX+52Aou1G22Ohu ++EEOlOrG7ylKv1hHUJJCjwN0ZVEIn1nDbrU9FeGCz8J9ihVUvnENEBbBkU37PWqW +uHitKQDVtcwTwJJdR8cmKq3NmkwAm9fPacidQLpaw0WkuGrS+fEDhu1Nhy9xELP6 +NA9GRTCNxm/dXlcwnmY= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIElTCCA/6gAwIBAgIEOJsRPDANBgkqhkiG9w0BAQQFADCBujEUMBIGA1UEChML +RW50cnVzdC5uZXQxPzA9BgNVBAsUNnd3dy5lbnRydXN0Lm5ldC9TU0xfQ1BTIGlu +Y29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMcKGMpIDIwMDAg +RW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5uZXQgU2VjdXJl +IFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMDAyMDQxNzIwMDBa +Fw0yMDAyMDQxNzUwMDBaMIG6MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDE/MD0GA1UE +CxQ2d3d3LmVudHJ1c3QubmV0L1NTTF9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p +dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMjAwMCBFbnRydXN0Lm5ldCBMaW1pdGVk +MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp +b24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHwV9OcfHO +8GCGD9JYf9Mzly0XonUwtZZkJi9ow0SrqHXmAGc0V55lxyKbc+bT3QgON1WqJUaB +bL3+qPZ1V1eMkGxKwz6LS0MKyRFWmponIpnPVZ5h2QLifLZ8OAfc439PmrkDQYC2 +dWcTC5/oVzbIXQA23mYU2m52H083jIITiQIDAQABo4IBpDCCAaAwEQYJYIZIAYb4 +QgEBBAQDAgAHMIHjBgNVHR8EgdswgdgwgdWggdKggc+kgcwwgckxFDASBgNVBAoT +C0VudHJ1c3QubmV0MT8wPQYDVQQLFDZ3d3cuZW50cnVzdC5uZXQvU1NMX0NQUyBp +bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAyMDAw +IEVudHJ1c3QubmV0IExpbWl0ZWQxOjA4BgNVBAMTMUVudHJ1c3QubmV0IFNlY3Vy +ZSBTZXJ2ZXIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxDTALBgNVBAMTBENSTDEw +KwYDVR0QBCQwIoAPMjAwMDAyMDQxNzIwMDBagQ8yMDIwMDIwNDE3NTAwMFowCwYD +VR0PBAQDAgEGMB8GA1UdIwQYMBaAFMtswGvjuz7L/CKc/vuLkpyw8m4iMB0GA1Ud +DgQWBBTLbMBr47s+y/winP77i5KcsPJuIjAMBgNVHRMEBTADAQH/MB0GCSqGSIb2 +fQdBAAQQMA4bCFY1LjA6NC4wAwIEkDANBgkqhkiG9w0BAQQFAAOBgQBi24GRzsia +d0Iv7L0no1MPUBvqTpLwqa+poLpIYcvvyQbvH9X07t9WLebKahlzqlO+krNQAraF +JnJj2HVQYnUUt7NQGj/KEQALhUVpbbalrlHhStyCP2yMNLJ3a9kC9n8O6mUE8c1U +yrrJzOCE98g+EZfTYAkYvAX/bIkz8OwVDw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEn +MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL +ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENo +YW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYxNDE4WhcNMzcwOTMwMTYxNDE4WjB9 +MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgy +NzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4G +A1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUA +A4IBDQAwggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0 +Mi+ITaFgCPS3CU6gSS9J1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/s +QJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8Oby4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpV +eAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl6DJWk0aJqCWKZQbua795 +B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c8lCrEqWh +z0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0T +AQH/BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1i +ZXJzaWduLm9yZy9jaGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4w +TcbOX60Qq+UDpfqpFDAOBgNVHQ8BAf8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAH +MCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBjaGFtYmVyc2lnbi5vcmcwKgYD +VR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9yZzBbBgNVHSAE +VDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh +bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0B +AQUFAAOCAQEAPDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUM +bKGKfKX0j//U2K0X1S0E0T9YgOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXi +ryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJPJ7oKXqJ1/6v/2j1pReQvayZzKWG +VwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4IBHNfTIzSJRUTN3c +ecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREest2d/ +AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIE7TCCBFagAwIBAgIEOAOR7jANBgkqhkiG9w0BAQQFADCByTELMAkGA1UEBhMC +VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MUgwRgYDVQQLFD93d3cuZW50cnVzdC5u +ZXQvQ2xpZW50X0NBX0luZm8vQ1BTIGluY29ycC4gYnkgcmVmLiBsaW1pdHMgbGlh +Yi4xJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV +BAMTKkVudHJ1c3QubmV0IENsaWVudCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe +Fw05OTEwMTIxOTI0MzBaFw0xOTEwMTIxOTU0MzBaMIHJMQswCQYDVQQGEwJVUzEU +MBIGA1UEChMLRW50cnVzdC5uZXQxSDBGBgNVBAsUP3d3dy5lbnRydXN0Lm5ldC9D +bGllbnRfQ0FfSW5mby9DUFMgaW5jb3JwLiBieSByZWYuIGxpbWl0cyBsaWFiLjEl +MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMq +RW50cnVzdC5uZXQgQ2xpZW50IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0G +CSqGSIb3DQEBAQUAA4GLADCBhwKBgQDIOpleMRffrCdvkHvkGf9FozTC28GoT/Bo +6oT9n3V5z8GKUZSvx1cDR2SerYIbWtp/N3hHuzeYEpbOxhN979IMMFGpOZ5V+Pux +5zDeg7K6PvHViTs7hbqqdCz+PzFur5GVbgbUB01LLFZHGARS2g4Qk79jkJvh34zm +AqTmT173iwIBA6OCAeAwggHcMBEGCWCGSAGG+EIBAQQEAwIABzCCASIGA1UdHwSC +ARkwggEVMIHkoIHhoIHepIHbMIHYMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50 +cnVzdC5uZXQxSDBGBgNVBAsUP3d3dy5lbnRydXN0Lm5ldC9DbGllbnRfQ0FfSW5m +by9DUFMgaW5jb3JwLiBieSByZWYuIGxpbWl0cyBsaWFiLjElMCMGA1UECxMcKGMp +IDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5uZXQg +Q2xpZW50IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCyg +KqAohiZodHRwOi8vd3d3LmVudHJ1c3QubmV0L0NSTC9DbGllbnQxLmNybDArBgNV +HRAEJDAigA8xOTk5MTAxMjE5MjQzMFqBDzIwMTkxMDEyMTkyNDMwWjALBgNVHQ8E +BAMCAQYwHwYDVR0jBBgwFoAUxPucKXuXzUyW/O5bs8qZdIuV6kwwHQYDVR0OBBYE +FMT7nCl7l81MlvzuW7PKmXSLlepMMAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EA +BAwwChsEVjQuMAMCBJAwDQYJKoZIhvcNAQEEBQADgYEAP66K8ddmAwWePvrqHEa7 +pFuPeJoSSJn59DXeDDYHAmsQOokUgZwxpnyyQbJq5wcBoUv5nyU7lsqZwz6hURzz +wy5E97BnRqqS5TvaHBkUODDV4qIxJS7x7EU47fgGWANzYrAQMY9Av2TgXD7FTx/a +EkP/TOYGJqibGapEPHayXOw= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEGTCCAwECEGFwy0mMX5hFKeewptlQW3owDQYJKoZIhvcNAQEFBQAwgcoxCzAJ +BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVy +aVNpZ24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24s +IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNp +Z24gQ2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0 +eSAtIEczMB4XDTk5MTAwMTAwMDAwMFoXDTM2MDcxNjIzNTk1OVowgcoxCzAJBgNV +BAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNp +Z24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIElu +Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNpZ24g +Q2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt +IEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArwoNwtUs22e5LeWU +J92lvuCwTY+zYVY81nzD9M0+hsuiiOLh2KRpxbXiv8GmR1BeRjmL1Za6tW8UvxDO +JxOeBUebMXoT2B/Z0wI3i60sR/COgQanDTAM6/c8DyAd3HJG7qUCyFvDyVZpTMUY +wZF7C9UTAJu878NIPkZgIIUq1ZC2zYugzDLdt/1AVbJQHFauzI13TccgTacxdu9o +koqQHgiBVrKtaaNS0MscxCM9H5n+TOgWY47GCI72MfbS+uV23bUckqNJzc0BzWjN +qWm6o+sdDZykIKbBoMXRRkwXbdKsZj+WjOCE1Db/IlnF+RFgqF8EffIa9iVCYQ/E +Srg+iQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA0JhU8wI1NQ0kdvekhktdmnLfe +xbjQ5F1fdiLAJvmEOjr5jLX77GDx6M4EsMjdpwOPMPOY36TmpDHf0xwLRtxyID+u +7gU8pDM/CzmscHhzS5kr3zDCVLCoO1Wh/hYozUK9dG6A2ydEp85EXdQbkJgNHkKU +sQAsBNB0owIFImNjzYO1+8FtYmtpdf1dcEG59b98377BMnMiIYtYgXsVkXq642RI +sH/7NiXaldDxJBQX3RiAa0YjOVT1jmIJBB2UkKab5iXiQkWquJCtvgiPqQtCGJTP +cjnhsUPgKM+351psE2tJs//jGHyJizNdrDPXp/naOlXJWBD5qu9ats9LS98q +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID5TCCAs2gAwIBAgIEOeSXnjANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC +VVMxFDASBgNVBAoTC1dlbGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBD +ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEvMC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9v +dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDAxMDExMTY0MTI4WhcNMjEwMTE0 +MTY0MTI4WjCBgjELMAkGA1UEBhMCVVMxFDASBgNVBAoTC1dlbGxzIEZhcmdvMSww +KgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEvMC0G +A1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVqDM7Jvk0/82bfuUER84A4n13 +5zHCLielTWi5MbqNQ1mXx3Oqfz1cQJ4F5aHiidlMuD+b+Qy0yGIZLEWukR5zcUHE +SxP9cMIlrCL1dQu3U+SlK93OvRw6esP3E48mVJwWa2uv+9iWsWCaSOAlIiR5NM4O +JgALTqv9i86C1y8IcGjBqAr5dE8Hq6T54oN+J3N0Prj5OEL8pahbSCOz6+MlsoCu +ltQKnMJ4msZoGK43YjdeUXWoWGPAUe5AeH6orxqg4bB4nVCMe+ez/I4jsNtlAHCE +AQgAFG5Uhpq6zPk3EPbg3oQtnaSFN9OH4xXQwReQfhkhahKpdv0SAulPIV4XAgMB +AAGjYTBfMA8GA1UdEwEB/wQFMAMBAf8wTAYDVR0gBEUwQzBBBgtghkgBhvt7hwcB +CzAyMDAGCCsGAQUFBwIBFiRodHRwOi8vd3d3LndlbGxzZmFyZ28uY29tL2NlcnRw +b2xpY3kwDQYJKoZIhvcNAQEFBQADggEBANIn3ZwKdyu7IvICtUpKkfnRLb7kuxpo +7w6kAOnu5+/u9vnldKTC2FJYxHT7zmu1Oyl5GFrvm+0fazbuSCUlFLZWohDo7qd/ +0D+j0MNdJu4HzMPBJCGHHt8qElNvQRbn7a6U+oxy+hNH8Dx+rn0ROhPs7fpvcmR7 +nX1/Jv16+yWt6j4pf0zjAFcysLPp7VMX2YuyFA4w6OXVE8Zkr8QA1dhYJPz1j+zx +x32l2w8n0cbyQIjmH/ZhqPRCyLk306m+LFZ4wnKbWV01QIroTmMatukgalHizqSQ +33ZwmVxwQ023tqcZZE6St8WRPH9IFmV7Fv3L/PvZ1dZPIWU7Sn9Ho/s= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDtjCCAp6gAwIBAgIOBcAAAQACQdAGCk3OdRAwDQYJKoZIhvcNAQEFBQAwdjEL +MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV +BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDQgQ0ExJTAjBgNVBAMTHFRDIFRydXN0 +Q2VudGVyIENsYXNzIDQgQ0EgSUkwHhcNMDYwMzIzMTQxMDIzWhcNMjUxMjMxMjI1 +OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i +SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgNCBDQTElMCMGA1UEAxMc +VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgNCBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBALXNTJytrlG7fEjFDSmGehSt2VA9CXIgDRS2Y8b+WJ7gIV7z +jyIZ3E6RIM1viCmis8GsKnK6i1S4QF/yqvhDhsIwXMynXX/GCEnkDjkvjhjWkd0j +FnmA22xIHbzB3ygQY9GB493fL3l1oht48pQB5hBiecugfQLANIJ7x8CtHUzXapZ2 +W78mhEj9h/aECqqSB5lIPGG8ToVYx5ct/YFKocabEvVCUNFkPologiJw3fX64yhC +L04y87OjNopq1mJcrPoBbbTgci6VaLTxkwzGioLSHVPqfOA/QrcSWrjN2qUGZ8uh +d32llvCSHmcOHUJG5vnt+0dTf1cERh9GX8eu4I8CAwEAAaNCMEAwDwYDVR0TAQH/ +BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFB/quz4lGwa9pd1iBX7G +TFq/6A9DMA0GCSqGSIb3DQEBBQUAA4IBAQBYpCubTPfkpJKknGWYGWIi/HIy6QRd +xMRwLVpG3kxHiiW5ot3u6hKvSI3vK2fbO8w0mCr3CEf/Iq978fTr4jgCMxh1KBue +dmWsiANy8jhHHYz1nwqIUxAUu4DlDLNdjRfuHhkcho0UZ3iMksseIUn3f9MYv5x5 ++F0IebWqak2SNmy8eesOPXmK2PajVnBd3ttPedJ60pVchidlvqDTB4FAVd0Qy+BL +iILAkH0457+W4Ze6mqtCD9Of2J4VMxHL94J59bXAQVaS4d9VA61Iz9PyLrHHLVZM +ZHQqMc7cdalUR6SnQnIJ5+ECpkeyBM1CE+FhDOB4OiIgohxgQoaH96Xm +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd +MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg +Q2xhc3MgMyBDQSAxMB4XDTA1MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzEL +MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD +VQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKxifZg +isRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//z +NIqeKNc0n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI ++MkcVyzwPX6UvCWThOiaAJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2R +hzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+ +mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNCMEAwDwYDVR0TAQH/BAUw +AwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0PAQH/BAQD +AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFP +Bdy7pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27s +EzNxZy5p+qksP2bAEllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2 +mSlf56oBzKwzqBwKu5HEA6BvtjT5htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yC +e/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQjel/wroQk5PMr+4okoyeYZdow +dXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- MIIIDjCCBfagAwIBAgIJAOiOtsn4KhQoMA0GCSqGSIb3DQEBBQUAMIG8MQswCQYD VQQGEwJVUzEQMA4GA1UECBMHSW5kaWFuYTEVMBMGA1UEBxMMSW5kaWFuYXBvbGlz MSgwJgYDVQQKEx9Tb2Z0d2FyZSBpbiB0aGUgUHVibGljIEludGVyZXN0MRMwEQYD @@ -3253,85 +5363,211 @@ yaXG67Ljxay2oHA1u8hRadDytaIybrw/oDc5fHE2pgXfDBLkFqfF1stjo5VwP+YE o2A= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEc -MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2Vj -IFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENB -IDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5MjM1OTAwWjBxMQswCQYDVQQGEwJE -RTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxl -U2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290 -IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEU -ha88EOQ5bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhC -QN/Po7qCWWqSG6wcmtoIKyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1Mjwr -rFDa1sPeg5TKqAyZMg4ISFZbavva4VhYAUlfckE8FQYBjl2tqriTtM2e66foai1S -NNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aKSe5TBY8ZTNXeWHmb0moc -QqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTVjlsB9WoH -txa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAP -BgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC -AQEAlGRZrTlk5ynrE/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756Abrsp -tJh6sTtU6zkXR34ajgv8HzFZMQSyzhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpa -IzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8rZ7/gFnkm0W09juwzTkZmDLl -6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4Gdyd1Lx+4ivn+ -xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU -Cm26OWMohpLzGITY+9HPBVZkVw== +MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290 +IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB +IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA +Y2FjZXJ0Lm9yZzAeFw0wMzAzMzAxMjI5NDlaFw0zMzAzMjkxMjI5NDlaMHkxEDAO +BgNVBAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEi +MCAGA1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJ +ARYSc3VwcG9ydEBjYWNlcnQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC +CgKCAgEAziLA4kZ97DYoB1CW8qAzQIxL8TtmPzHlawI229Z89vGIj053NgVBlfkJ +8BLPRoZzYLdufujAWGSuzbCtRRcMY/pnCujW0r8+55jE8Ez64AO7NV1sId6eINm6 +zWYyN3L69wj1x81YyY7nDl7qPv4coRQKFWyGhFtkZip6qUtTefWIonvuLwphK42y +fk1WpRPs6tqSnqxEQR5YYGUFZvjARL3LlPdCfgv3ZWiYUQXw8wWRBB0bF4LsyFe7 +w2t6iPGwcswlWyCR7BYCEo8y6RcYSNDHBS4CMEK4JZwFaz+qOqfrU0j36NK2B5jc +G8Y0f3/JHIJ6BVgrCFvzOKKrF11myZjXnhCLotLddJr3cQxyYN/Nb5gznZY0dj4k +epKwDpUeb+agRThHqtdB7Uq3EvbXG4OKDy7YCbZZ16oE/9KTfWgu3YtLq1i6L43q +laegw1SJpfvbi1EinbLDvhG+LJGGi5Z4rSDTii8aP8bQUWWHIbEZAWV/RRyH9XzQ +QUxPKZgh/TMfdQwEUfoZd9vUFBzugcMd9Zi3aQaRIt0AUMyBMawSB3s42mhb5ivU +fslfrejrckzzAeVLIL+aplfKkQABi6F1ITe1Yw1nPkZPcCBnzsXWWdsC4PDSy826 +YreQQejdIOQpvGQpQsgi3Hia/0PsmBsJUUtaWsJx8cTLc6nloQsCAwEAAaOCAc4w +ggHKMB0GA1UdDgQWBBQWtTIb1Mfz4OaO873SsDrusjkY0TCBowYDVR0jBIGbMIGY +gBQWtTIb1Mfz4OaO873SsDrusjkY0aF9pHsweTEQMA4GA1UEChMHUm9vdCBDQTEe +MBwGA1UECxMVaHR0cDovL3d3dy5jYWNlcnQub3JnMSIwIAYDVQQDExlDQSBDZXJ0 +IFNpZ25pbmcgQXV0aG9yaXR5MSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGNhY2Vy +dC5vcmeCAQAwDwYDVR0TAQH/BAUwAwEB/zAyBgNVHR8EKzApMCegJaAjhiFodHRw +czovL3d3dy5jYWNlcnQub3JnL3Jldm9rZS5jcmwwMAYJYIZIAYb4QgEEBCMWIWh0 +dHBzOi8vd3d3LmNhY2VydC5vcmcvcmV2b2tlLmNybDA0BglghkgBhvhCAQgEJxYl +aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMDBWBglghkgBhvhC +AQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNlcnRpZmljYXRlIGZvciBGUkVFIGhlYWQg +b3ZlciB0byBodHRwOi8vd3d3LmNhY2VydC5vcmcwDQYJKoZIhvcNAQEEBQADggIB +ACjH7pyCArpcgBLKNQodgW+JapnM8mgPf6fhjViVPr3yBsOQWqy1YPaZQwGjiHCc +nWKdpIevZ1gNMDY75q1I08t0AoZxPuIrA2jxNGJARjtT6ij0rPtmlVOKTV39O9lg +18p5aTuxZZKmxoGCXJzN600BiqXfEVWqFcofN8CCmHBh22p8lqOOLlQ+TyGpkO/c +gr/c6EWtTZBzCDyUZbAEmXZ/4rzCahWqlwQ3JNgelE5tDlG+1sSPypZt90Pf6DBl +Jzt7u0NDY8RD97LsaMzhGY4i+5jhe1o+ATc7iwiwovOVThrLm82asduycPAtStvY +sONvRUgzEv/+PDIqVPfE94rwiCPCR/5kenHA0R6mY7AHfqQv0wGP3J8rtsYIqQ+T +SCX8Ev2fQtzzxD72V7DX3WnRBnc0CkvSyqD/HMaMyRa+xMwyN2hzXwj7UfdJUzYF +CpUCTPJ5GhD22Dp1nPMd8aINcGeGG7MW9S/lpOt5hvk9C8JzC6WZrG/8Z7jlLwum +GCSNe9FINSkYQKyTYOGWhlC0elnYjyELn8+CkcY7v2vcB5G5l1YjqrZslMZIBjzk +zk6q5PYvCdxTby78dOs6Y5nCpqyJvKeyRKANihDjbPIky/qbn3BHLt4Ui9SyIAmW +omTxJBzcoTWcFbLUvFUufQb1nA5V9FrWk9p2rSVzTMVD -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIGJDCCBY2gAwIBAgIEQoaroDANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC -VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u -ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc -KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u -ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjA3 -MTQxNzEwMjhaFw0xNDA3MTQxNzQwMjhaMFwxCzAJBgNVBAYTAlVTMRUwEwYDVQQK -EwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGzAZBgNV -BAMTEkRpZ2lDZXJ0IEdsb2JhbCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBAMQ8vMy66mLmnkIjr7SyEa5ijdmh04/MFHIZ7Zn2/d5du1nAsMKvaplS -lVcLNf/hhvqvosPBBWUnIHYvClQlfOor3ZVBV5sPO89H6AEGjMVESPwHLvNygzBR -lJ5pOoOph5AU2V7EoniPwT7UGWEOGufcGpUgQb5vF9q4HEHumLD61x01PxanBCgT -XT0FdZouhp4ssBeHIFhX7+HqVWC4LHAhrCljDBD8YLz51Rw3ZNW0+x6rJjlGiKTL -zTBnwCZ55cpo+SLX5dKxu0hMmwuYW0KS5dLtDkcw+t0nVmNqpQHHjq/wTjsbVRVE -1T5NVx7hkeq4oI/OOmNflom6CD7+RLsCAwEAAaOCAwUwggMBMBIGA1UdEwEB/wQI -MAYBAf8CAQAwggEyBgNVHSAEggEpMIIBJTCCASEGCSqGSIb2fQdLAjCCARIwJgYI -KwYBBQUHAgEWGmh0dHA6Ly93d3cuZW50cnVzdC5uZXQvY3BzMIHnBggrBgEFBQcC -AjCB2hqB10ZvciB1c2Ugc29sZWx5IHdpdGggU1NMIGFuZCBTL01JTUUgY2VydGlm -aWNhdGVzIGlzc3VlZCBieSBEaWdpY2VydCwgSW5jLiB0byBhdXRob3JpemVkIHN1 -YnNjcmliZXJzLg0KRE9FUyBOT1QgcmVwcmVzZW50IGFueSBlbmRvcnNlbWVudCBi -eSBFbnRydXN0IEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMgYXMgdG8gdGhlIGlkZW50 -aXR5IG9mIGFueSBjZXJ0aWZpY2F0ZSBob2xkZXIuMDEGA1UdJQQqMCgGCCsGAQUF -BwMBBggrBgEFBQcDAgYIKwYBBQUHAwQGCCsGAQUFBwMJMIIBGAYDVR0fBIIBDzCC -AQswKKAmoCSGImh0dHA6Ly9jcmwuZW50cnVzdC5uZXQvc2VydmVyMS5jcmwwgd6g -gduggdikgdUwgdIxCzAJBgNVBAYTAlVTMRQwEgYDVQQKEwtFbnRydXN0Lm5ldDE7 -MDkGA1UECxMyd3d3LmVudHJ1c3QubmV0L0NQUyBpbmNvcnAuIGJ5IHJlZi4gKGxp -bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0 -ZWQxOjA4BgNVBAMTMUVudHJ1c3QubmV0IFNlY3VyZSBTZXJ2ZXIgQ2VydGlmaWNh -dGlvbiBBdXRob3JpdHkxDTALBgNVBAMTBENSTDEwCwYDVR0PBAQDAgEGMB8GA1Ud -IwQYMBaAFPAXYhNVPbP/CgBr+1CEl/PtYtAaMB0GA1UdDgQWBBSnxxOgegE8ne+C -SIJI1XNRthJWKjAZBgkqhkiG9n0HQQAEDDAKGwRWNy4xAwIAgTANBgkqhkiG9w0B -AQUFAAOBgQBK8bPOaGnjWKNh7bYWyJOxGDA+4HLfTz3iTeG4/D/ByeNFqV2pwdqj -5TbXjtYPrTavbLxE5ppGlKYRoNBS59pVsPYchftjUnu2mY8f4stHZKLrCGXmUdsc -S21/U58eDTGT1DBdHm4BBydgXbvT9ONsHSAPdSozEKe3idepFxQyAw== +MIID5jCCAs6gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMCVVMx +HTAbBgNVBAoTFEFPTCBUaW1lIFdhcm5lciBJbmMuMRwwGgYDVQQLExNBbWVyaWNh +IE9ubGluZSBJbmMuMTcwNQYDVQQDEy5BT0wgVGltZSBXYXJuZXIgUm9vdCBDZXJ0 +aWZpY2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyOTA2MDAwMFoXDTM3MTEyMDE1 +MDMwMFowgYMxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRBT0wgVGltZSBXYXJuZXIg +SW5jLjEcMBoGA1UECxMTQW1lcmljYSBPbmxpbmUgSW5jLjE3MDUGA1UEAxMuQU9M +IFRpbWUgV2FybmVyIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIw +DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnej8Mlo2k06AX3dLm/WpcZuS+U +0pPlLYnKhHw/EEMbjIt8hFj4JHxIzyr9wBXZGH6EGhfT257XyuTZ16pYUYfw8ItI +TuLCxFlpMGK2MKKMCxGZYTVtfu/FsRkGIBKOQuHfD5YQUqjPnF+VFNivO3ULMSAf +RC+iYkGzuxgh28pxPIzstrkNn+9R7017EvILDOGsQI93f7DKeHEMXRZxcKLXwjqF +zQ6axOAAsNUl6twr5JQtOJyJQVdkKGUZHLZEtMgxa44Be3ZZJX8VHIQIfHNlIAqh +BC4aMqiaILGcLCFZ5/vP7nAtCMpjPiybkxlqpMKX/7eGV4iFbJ4VFitNLLMCAwEA +AaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUoTYwFsuGkABFgFOxj8jY +PXy+XxIwHwYDVR0jBBgwFoAUoTYwFsuGkABFgFOxj8jYPXy+XxIwDgYDVR0PAQH/ +BAQDAgGGMA0GCSqGSIb3DQEBBQUAA4IBAQCKIBilvrMvtKaEAEAwKfq0FHNMeUWn +9nDg6H5kHgqVfGphwu9OH77/yZkfB2FK4V1Mza3u0FIy2VkyvNp5ctZ7CegCgTXT +Ct8RHcl5oIBN/lrXVtbtDyqvpxh1MwzqwWEFT2qaifKNuZ8u77BfWgDrvq2g+EQF +Z7zLBO+eZMXpyD8Fv8YvBxzDNnGGyjhmSs3WuEvGbKeXO/oTLW4jYYehY0KswsuX +n2Fozy1MBJ3XJU8KDk2QixhWqJNIV9xvrr2eZ1d3iVCzvhGbRWeDhhmH05i9CBoW +H1iCC+GWaQVLjuyDUTEH1dSf/1l7qG6Fz9NLqUmwX7A5KGgOc90lmt4S -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEUDCCA7mgAwIBAgIJAN4ppNGwj6yIMA0GCSqGSIb3DQEBBAUAMIHMMQswCQYD -VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j -aXNjbzEZMBcGA1UEChMQTGluZGVuIExhYiwgSW5jLjEpMCcGA1UECxMgTGluZGVu -IExhYiBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxKTAnBgNVBAMTIExpbmRlbiBMYWIg -Q2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYJKoZIhvcNAQkBFhBjYUBsaW5kZW5s -YWIuY29tMB4XDTA1MDQyMTAyNDAzMVoXDTI1MDQxNjAyNDAzMVowgcwxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp -c2NvMRkwFwYDVQQKExBMaW5kZW4gTGFiLCBJbmMuMSkwJwYDVQQLEyBMaW5kZW4g -TGFiIENlcnRpZmljYXRlIEF1dGhvcml0eTEpMCcGA1UEAxMgTGluZGVuIExhYiBD -ZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgkqhkiG9w0BCQEWEGNhQGxpbmRlbmxh -Yi5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKXh1MThucdTbMg9bYBO -rAm8yWns32YojB0PRfbq8rUjepEhTm3/13s0u399Uc202v4ejcGhkIDWJZd2NZMF -oKrhmRfxGHSKPCuFaXC3jh0lRECj7k8FoPkcmaPjSyodrDFDUUuv+C06oYJoI+rk -8REyal9NwgHvqCzOrZtiTXAdAgMBAAGjggE2MIIBMjAdBgNVHQ4EFgQUO1zK2e1f -1wO1fHAjq6DTJobKDrcwggEBBgNVHSMEgfkwgfaAFDtcytntX9cDtXxwI6ug0yaG -yg63oYHSpIHPMIHMMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEW -MBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQTGluZGVuIExhYiwgSW5j -LjEpMCcGA1UECxMgTGluZGVuIExhYiBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxKTAn -BgNVBAMTIExpbmRlbiBMYWIgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYJKoZI -hvcNAQkBFhBjYUBsaW5kZW5sYWIuY29tggkA3imk0bCPrIgwDAYDVR0TBAUwAwEB -/zANBgkqhkiG9w0BAQQFAAOBgQA/ZkgfvwHYqk1UIAKZS3kMCxz0HvYuEQtviwnu -xA39CIJ65Zozs28Eg1aV9/Y+Of7TnWhW+U3J3/wD/GghaAGiKK6vMn9gJBIdBX/9 -e6ef37VGyiOEFFjnUIbuk0RWty0orN76q/lI/xjCi15XSA/VSq2j4vmnwfZcPTDu -glmQ1A== +MIIDfTCCAuagAwIBAgIDErvmMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT +MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0 +aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDIwNTIxMDQwMDAwWhcNMTgwODIxMDQwMDAw +WjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UE +AxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB +CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9m +OSm9BXiLnTjoBbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIu +T8rxh0PBFpVXLVDviS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6c +JmTM386DGXHKTubU1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmR +Cw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5asz +PeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo4HwMIHtMB8GA1UdIwQYMBaAFEjm +aPkr0rKV10fYIyAQTzOYkJ/UMB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrM +TjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjA6BgNVHR8EMzAxMC+g +LaArhilodHRwOi8vY3JsLmdlb3RydXN0LmNvbS9jcmxzL3NlY3VyZWNhLmNybDBO +BgNVHSAERzBFMEMGBFUdIAAwOzA5BggrBgEFBQcCARYtaHR0cHM6Ly93d3cuZ2Vv +dHJ1c3QuY29tL3Jlc291cmNlcy9yZXBvc2l0b3J5MA0GCSqGSIb3DQEBBQUAA4GB +AHbhEm5OSxYShjAGsoEIz/AIx8dxfmbuwu3UOx//8PDITtZDOLC5MH0Y0FWDomrL +NhGc6Ehmo21/uBPUR/6LWlxz/K7ZGzIZOKuXNBSqltLroxwUCEm2u+WR74M26x1W +b8ravHNjkOR/ez4iyz0H7V84dJzjA1BOoa+Y7mHyhD8S +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEb +MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow +GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRp +ZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVow +fjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G +A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAiBgNV +BAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEB +BQADggEPADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPM +cm3ye5drswfxdySRXyWP9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3S +HpR7LZQdqnXXs5jLrLxkU0C8j6ysNstcrbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996 +CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rCoznl2yY4rYsK7hljxxwk +3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3Vp6ea5EQz +6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNV +HQ4EFgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud +EwEB/wQFMAMBAf8wgYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2Rv +Y2EuY29tL1NlY3VyZUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRw +Oi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmww +DQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm4J4oqF7Tt/Q0 +5qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj +Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtI +gKvcnDe4IRRLDXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJ +aD61JlfutuC23bkpgHl9j6PwpCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDl +izeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1HRR3B7Hzs/Sk= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0 +IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz +BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y +aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG +9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy +NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y +azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs +YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw +Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl +cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY +dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9 +WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS +v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v +UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu +IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC +W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFFjCCBH+gAwIBAgIBADANBgkqhkiG9w0BAQQFADCBsDELMAkGA1UEBhMCSUwx +DzANBgNVBAgTBklzcmFlbDEOMAwGA1UEBxMFRWlsYXQxFjAUBgNVBAoTDVN0YXJ0 +Q29tIEx0ZC4xGjAYBgNVBAsTEUNBIEF1dGhvcml0eSBEZXAuMSkwJwYDVQQDEyBG +cmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYS +YWRtaW5Ac3RhcnRjb20ub3JnMB4XDTA1MDMxNzE3Mzc0OFoXDTM1MDMxMDE3Mzc0 +OFowgbAxCzAJBgNVBAYTAklMMQ8wDQYDVQQIEwZJc3JhZWwxDjAMBgNVBAcTBUVp +bGF0MRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMRowGAYDVQQLExFDQSBBdXRob3Jp +dHkgRGVwLjEpMCcGA1UEAxMgRnJlZSBTU0wgQ2VydGlmaWNhdGlvbiBBdXRob3Jp +dHkxITAfBgkqhkiG9w0BCQEWEmFkbWluQHN0YXJ0Y29tLm9yZzCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEA7YRgACOeyEpRKSfeOqE5tWmrCbIvNP1h3D3TsM+x +18LEwrHkllbEvqoUDufMOlDIOmKdw6OsWXuO7lUaHEe+o5c5s7XvIywI6Nivcy+5 +yYPo7QAPyHWlLzRMGOh2iCNJitu27Wjaw7ViKUylS7eYtAkUEKD4/mJ2IhULpNYI +LzUCAwEAAaOCAjwwggI4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgHmMB0G +A1UdDgQWBBQcicOWzL3+MtUNjIExtpidjShkjTCB3QYDVR0jBIHVMIHSgBQcicOW +zL3+MtUNjIExtpidjShkjaGBtqSBszCBsDELMAkGA1UEBhMCSUwxDzANBgNVBAgT +BklzcmFlbDEOMAwGA1UEBxMFRWlsYXQxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4x +GjAYBgNVBAsTEUNBIEF1dGhvcml0eSBEZXAuMSkwJwYDVQQDEyBGcmVlIFNTTCBD +ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSYWRtaW5Ac3Rh +cnRjb20ub3JnggEAMB0GA1UdEQQWMBSBEmFkbWluQHN0YXJ0Y29tLm9yZzAdBgNV +HRIEFjAUgRJhZG1pbkBzdGFydGNvbS5vcmcwEQYJYIZIAYb4QgEBBAQDAgAHMC8G +CWCGSAGG+EIBDQQiFiBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAy +BglghkgBhvhCAQQEJRYjaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL2NhLWNybC5j +cmwwKAYJYIZIAYb4QgECBBsWGWh0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy8wOQYJ +YIZIAYb4QgEIBCwWKmh0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9pbmRleC5waHA/ +YXBwPTExMTANBgkqhkiG9w0BAQQFAAOBgQBscSXhnjSRIe/bbL0BCFaPiNhBOlP1 +ct8nV0t2hPdopP7rPwl+KLhX6h/BquL/lp9JmeaylXOWxkjHXo0Hclb4g4+fd68p +00UOpO6wNnQt8M2YI3s3S9r+UZjEHjQ8iP2ZO1CnwYszx8JSFhKVU2Ui77qLzmLb +cCOxgN8aIDjnfg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcN +AQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZp +dHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMw +MVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQsw +CQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEQ +MA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOB +SvZiF3tfTQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkz +ABpTpyHhOEvWgxutr2TC+Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvH +LCu3GFH+4Hv2qEivbDtPL+/40UceJlfwUR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMP +PbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDaTpxt4brNj3pssAki14sL +2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQFMAMBAf8w +ggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwIC +MIHDHoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDk +AGwAagBhAHMAdABhAHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0 +AHMAZQBlAHIAaQBtAGkAcwBrAGUAcwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABz +AGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABrAGkAbgBuAGkAdABhAG0AaQBz +AGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nwcy8wKwYDVR0f +BCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE +FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcY +P2/v6X2+MA4GA1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOi +CfP+JmeaUOTDBS8rNXiRTHyoERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+g +kcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyLabVAyJRld/JXIWY7zoVAtjNjGr95 +HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678IIbsSt4beDI3poHS +na9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkhMp6q +qIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0Z +TbvGRNs2yyqcjg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJO +TDEeMBwGA1UEChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFh +dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEy +MTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4wHAYDVQQKExVTdGFhdCBkZXIgTmVk +ZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxhbmRlbiBSb290IENB +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFtvszn +ExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw71 +9tV2U02PjLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MO +hXeiD+EwR+4A5zN9RGcaC1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+U +tFE5A3+y3qcym7RHjm+0Sq7lr7HcsBthvJly3uSJt3omXdozSVtSnA71iq3DuD3o +BmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn622r+I/q85Ej0ZytqERAh +SQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRVHSAAMDww +OgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMv +cm9vdC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA +7Jbg0zTBLL9s+DANBgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k +/rvuFbQvBgwp8qiSpGEN/KtcCFtREytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzm +eafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbwMVcoEoJz6TMvplW0C5GUR5z6 +u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3ynGQI0DvDKcWy +7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR +iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw== -----END CERTIFICATE----- diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index cdabf2221..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 @@ -278,29 +291,6 @@ - SianaJ2CSizeExponent - - Comment - Exponent of size estimator. Should be between 0.0 and 1.0 - Persist - 1 - Type - F32 - Value - 1.0 - - SianaJ2CSizeOffset - - Comment - Number of bytes to add to size estimator. - Persist - 1 - Type - S32 - Value - 0 - - SianaLegacyJ2CSize Comment @@ -782,7 +772,7 @@ Type Boolean Value - 1 + 0 PrivateLookAt @@ -2212,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 @@ -3950,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 @@ -8208,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 @@ -8272,7 +8273,7 @@ Type Boolean Value - 0 + 0 MemoryPrivatePoolSize @@ -8515,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/shaders/class1/deferred/alphaNonIndexedNoColorF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaNonIndexedNoColorF.glsl index cb87b754b..1113a9845 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaNonIndexedNoColorF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaNonIndexedNoColorF.glsl @@ -31,6 +31,8 @@ out vec4 frag_color; #define frag_color gl_FragColor #endif +uniform float minimum_alpha; + uniform sampler2DRect depthMap; uniform sampler2D diffuseMap; @@ -70,9 +72,15 @@ void main() vec4 diff= texture2D(diffuseMap,vary_texcoord0.xy); + if (diff.a < minimum_alpha) + { + discard; + } + vec4 col = vec4(vary_ambient + vary_directional.rgb, 1.0); vec4 color = diff * col; + color.rgb = atmosLighting(color.rgb); color.rgb = scaleSoftClip(color.rgb); diff --git a/indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl index 75de47614..bff87cb6a 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl @@ -55,8 +55,6 @@ uniform float far_clip; uniform vec3 proj_origin; //origin of projection to be used for angular attenuation uniform float sun_wash; -uniform int proj_shadow_idx; -uniform float shadow_fade; uniform vec3 center; uniform vec3 color; @@ -143,7 +141,8 @@ void main() discard; } - vec3 norm = texture2DRect(normalMap, frag.xy).xyz*2.0-1.0; + vec3 norm = texture2DRect(normalMap, frag.xy).xyz; + norm = vec3((norm.xy-0.5)*2.0, norm.z); norm = normalize(norm); float l_dist = -dot(lv, proj_n); diff --git a/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl index 19800a8b8..f671d5b75 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl @@ -42,12 +42,13 @@ uniform sampler2DRect depthMap; uniform vec3 env_mat[3]; uniform float sun_wash; -uniform vec3 center; uniform vec3 color; uniform float falloff; uniform float size; VARYING vec4 vary_fragcoord; +VARYING vec3 trans_center; + uniform vec2 screen_res; uniform mat4 inv_proj; @@ -74,7 +75,7 @@ void main() frag.xy *= screen_res; vec3 pos = getPosition(frag.xy).xyz; - vec3 lv = center.xyz-pos; + vec3 lv = trans_center.xyz-pos; float dist2 = dot(lv,lv); dist2 /= size; if (dist2 > 1.0) diff --git a/indra/newview/app_settings/shaders/class1/deferred/pointLightV.glsl b/indra/newview/app_settings/shaders/class1/deferred/pointLightV.glsl index cb14e6d4e..949142123 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/pointLightV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/pointLightV.glsl @@ -24,16 +24,22 @@ */ uniform mat4 modelview_projection_matrix; +uniform mat4 modelview_matrix; ATTRIBUTE vec3 position; +uniform vec3 center; +uniform float size; + VARYING vec4 vary_fragcoord; +VARYING vec3 trans_center; void main() { //transform vertex - vec4 pos = modelview_projection_matrix * vec4(position.xyz, 1.0); + vec3 p = position*sqrt(size)+center; + vec4 pos = modelview_projection_matrix * vec4(p.xyz, 1.0); vary_fragcoord = pos; - + trans_center = (modelview_matrix*vec4(center.xyz, 1.0)).xyz; gl_Position = pos; } diff --git a/indra/newview/app_settings/shaders/class1/deferred/shadowCubeV.glsl b/indra/newview/app_settings/shaders/class1/deferred/shadowCubeV.glsl new file mode 100644 index 000000000..6195e2f1e --- /dev/null +++ b/indra/newview/app_settings/shaders/class1/deferred/shadowCubeV.glsl @@ -0,0 +1,44 @@ +/** + * @file shadowCubeV.glsl + * + * $LicenseInfo:firstyear=2011&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2007, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +uniform mat4 modelview_projection_matrix; + +ATTRIBUTE vec3 position; + +VARYING vec4 post_pos; + +uniform vec3 box_center; +uniform vec3 box_size; + +void main() +{ + //transform vertex + vec3 p = position*box_size+box_center; + vec4 pos = modelview_projection_matrix*vec4(p.xyz, 1.0); + + post_pos = pos; + + gl_Position = vec4(pos.x, pos.y, pos.w*0.5, pos.w); +} diff --git a/indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl index 7ed8ed337..cca63872d 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl @@ -24,18 +24,21 @@ */ -#extension GL_ARB_texture_rectangle : enable - #ifdef DEFINE_GL_FRAGCOLOR out vec4 frag_color; #else #define frag_color gl_FragColor #endif +//class 1 -- no shadows + +#extension GL_ARB_texture_rectangle : enable + uniform sampler2DRect diffuseRect; uniform sampler2DRect specularRect; uniform sampler2DRect depthMap; uniform sampler2DRect normalMap; +uniform samplerCube environmentMap; uniform sampler2D noiseMap; uniform sampler2D projectionMap; @@ -46,6 +49,7 @@ uniform vec3 proj_n; uniform float proj_focus; //distance from plane to begin blurring uniform float proj_lod; //(number of mips in proj map) uniform float proj_range; //range between near clip and far clip plane of projection +uniform float proj_ambient_lod; uniform float proj_ambiance; uniform float near_clip; uniform float far_clip; @@ -53,19 +57,66 @@ uniform float far_clip; uniform vec3 proj_origin; //origin of projection to be used for angular attenuation uniform float sun_wash; -uniform vec3 center; uniform vec3 color; uniform float falloff; uniform float size; VARYING vec4 vary_fragcoord; +VARYING vec3 trans_center; + uniform vec2 screen_res; uniform mat4 inv_proj; +vec4 texture2DLodSpecular(sampler2D projectionMap, vec2 tc, float lod) +{ + vec4 ret = texture2DLod(projectionMap, tc, lod); + + vec2 dist = tc-vec2(0.5); + + float det = max(1.0-lod/(proj_lod*0.5), 0.0); + + float d = dot(dist,dist); + + ret *= min(clamp((0.25-d)/0.25, 0.0, 1.0)+det, 1.0); + + return ret; +} + +vec4 texture2DLodDiffuse(sampler2D projectionMap, vec2 tc, float lod) +{ + vec4 ret = texture2DLod(projectionMap, tc, lod); + + vec2 dist = vec2(0.5) - abs(tc-vec2(0.5)); + + float det = min(lod/(proj_lod*0.5), 1.0); + + float d = min(dist.x, dist.y); + + float edge = 0.25*det; + + ret *= clamp(d/edge, 0.0, 1.0); + + return ret; +} + +vec4 texture2DLodAmbient(sampler2D projectionMap, vec2 tc, float lod) +{ + vec4 ret = texture2DLod(projectionMap, tc, lod); + + vec2 dist = tc-vec2(0.5); + + float d = dot(dist,dist); + + ret *= min(clamp((0.25-d)/0.25, 0.0, 1.0), 1.0); + + return ret; +} + + vec4 getPosition(vec2 pos_screen) { - float depth = texture2DRect(depthMap, pos_screen.xy).a; + float depth = texture2DRect(depthMap, pos_screen.xy).r; vec2 sc = pos_screen.xy*2.0; sc /= screen_res; sc -= vec2(1.0,1.0); @@ -84,16 +135,16 @@ void main() frag.xy *= screen_res; vec3 pos = getPosition(frag.xy).xyz; - vec3 lv = center.xyz-pos.xyz; + vec3 lv = trans_center.xyz-pos.xyz; float dist2 = dot(lv,lv); dist2 /= size; if (dist2 > 1.0) { discard; } - + vec3 norm = texture2DRect(normalMap, frag.xy).xyz; - norm = vec3((norm.xy-0.5)*2.0,norm.z); // unpack norm + norm = vec3((norm.xy-0.5)*2.0, norm.z); norm = normalize(norm); float l_dist = -dot(lv, proj_n); @@ -107,7 +158,11 @@ void main() proj_tc.xyz /= proj_tc.w; float fa = falloff+1.0; - float dist_atten = clamp(1.0-(dist2-1.0*(1.0-fa))/fa, 0.0, 1.0); + float dist_atten = min(1.0-(dist2-1.0*(1.0-fa))/fa, 1.0); + if (dist_atten <= 0.0) + { + discard; + } lv = proj_origin-pos.xyz; lv = normalize(lv); @@ -125,32 +180,32 @@ void main() proj_tc.y > 0.0) { float lit = 0.0; + float amb_da = proj_ambiance; + if (da > 0.0) { float diff = clamp((l_dist-proj_focus)/proj_range, 0.0, 1.0); float lod = diff * proj_lod; - vec4 plcol = texture2DLod(projectionMap, proj_tc.xy, lod); + vec4 plcol = texture2DLodDiffuse(projectionMap, proj_tc.xy, lod); vec3 lcol = color.rgb * plcol.rgb * plcol.a; lit = da * dist_atten * noise; col = lcol*lit*diff_tex; + amb_da += (da*0.5)*proj_ambiance; } - float diff = clamp((proj_range-proj_focus)/proj_range, 0.0, 1.0); - float lod = diff * proj_lod; - vec4 amb_plcol = texture2DLod(projectionMap, proj_tc.xy, lod); - //float amb_da = mix(proj_ambiance, proj_ambiance*max(-da, 0.0), max(da, 0.0)); - float amb_da = proj_ambiance; - + //float diff = clamp((proj_range-proj_focus)/proj_range, 0.0, 1.0); + vec4 amb_plcol = texture2DLodAmbient(projectionMap, proj_tc.xy, proj_lod); + amb_da += (da*da*0.5+0.5)*proj_ambiance; - + amb_da *= dist_atten * noise; - + amb_da = min(amb_da, 1.0-lit); - + col += amb_da*color.rgb*diff_tex.rgb*amb_plcol.rgb*amb_plcol.a; } @@ -168,18 +223,22 @@ void main() { vec3 pfinal = pos + ref * dot(pdelta, proj_n)/ds; - vec3 stc = (proj_mat * vec4(pfinal.xyz, 1.0)).xyz; + vec4 stc = (proj_mat * vec4(pfinal.xyz, 1.0)); if (stc.z > 0.0) { - stc.xy /= stc.z+proj_near; - + stc.xy /= stc.w; + + float fatten = clamp(spec.a*spec.a+spec.a*0.5, 0.25, 1.0); + + stc.xy = (stc.xy - vec2(0.5)) * fatten + vec2(0.5); + if (stc.x < 1.0 && stc.y < 1.0 && stc.x > 0.0 && stc.y > 0.0) { - vec4 scol = texture2DLod(projectionMap, stc.xy, proj_lod-spec.a*proj_lod); + vec4 scol = texture2DLodSpecular(projectionMap, stc.xy, proj_lod-spec.a*proj_lod); col += dist_atten*scol.rgb*color.rgb*scol.a*spec.rgb; } } diff --git a/indra/newview/app_settings/shaders/class1/interface/occlusionCubeV.glsl b/indra/newview/app_settings/shaders/class1/interface/occlusionCubeV.glsl new file mode 100644 index 000000000..5c479d27a --- /dev/null +++ b/indra/newview/app_settings/shaders/class1/interface/occlusionCubeV.glsl @@ -0,0 +1,38 @@ +/** + * @file occlusionCubeV.glsl + * + * $LicenseInfo:firstyear=2007&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2007, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +uniform mat4 modelview_projection_matrix; + +ATTRIBUTE vec3 position; + +uniform vec3 box_center; +uniform vec3 box_size; + +void main() +{ + vec3 p = position*box_size+box_center; + gl_Position = modelview_projection_matrix * vec4(p.xyz, 1.0); +} + diff --git a/indra/newview/app_settings/shaders/class1/transform/binormalV.glsl b/indra/newview/app_settings/shaders/class1/transform/binormalV.glsl new file mode 100644 index 000000000..44f1aa34a --- /dev/null +++ b/indra/newview/app_settings/shaders/class1/transform/binormalV.glsl @@ -0,0 +1,36 @@ +/** + * @file binormalV.glsl + * + * $LicenseInfo:firstyear=2007&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2007, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +uniform mat3 normal_matrix; + +ATTRIBUTE vec3 binormal; + +VARYING vec4 binormal_out; + +void main() +{ + binormal_out = vec4(normal_matrix * binormal, 0.0); +} + diff --git a/indra/newview/app_settings/shaders/class1/transform/colorV.glsl b/indra/newview/app_settings/shaders/class1/transform/colorV.glsl new file mode 100644 index 000000000..59c4a7d89 --- /dev/null +++ b/indra/newview/app_settings/shaders/class1/transform/colorV.glsl @@ -0,0 +1,36 @@ +/** + * @file colorV.glsl + * + * $LicenseInfo:firstyear=2007&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2007, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +uniform int color_in; + +ATTRIBUTE vec3 position; + +VARYING int color_out; + +void main() +{ + color_out = color_in; +} + diff --git a/indra/newview/app_settings/shaders/class1/transform/normalV.glsl b/indra/newview/app_settings/shaders/class1/transform/normalV.glsl new file mode 100644 index 000000000..a213aa0ae --- /dev/null +++ b/indra/newview/app_settings/shaders/class1/transform/normalV.glsl @@ -0,0 +1,36 @@ +/** + * @file normalV.glsl + * + * $LicenseInfo:firstyear=2007&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2007, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +uniform mat3 normal_matrix; + +ATTRIBUTE vec3 normal; + +VARYING vec4 normal_out; + +void main() +{ + normal_out = vec4(normalize(normal_matrix * normal), 0.0); +} + diff --git a/indra/newview/app_settings/shaders/class1/transform/positionV.glsl b/indra/newview/app_settings/shaders/class1/transform/positionV.glsl new file mode 100644 index 000000000..01eed18de --- /dev/null +++ b/indra/newview/app_settings/shaders/class1/transform/positionV.glsl @@ -0,0 +1,40 @@ +/** + * @file positionV.glsl + * + * $LicenseInfo:firstyear=2007&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2007, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +uniform mat4 modelview_matrix; + +uniform int texture_index_in; + +ATTRIBUTE vec3 position; + +VARYING vec3 position_out; +VARYING int texture_index_out; + +void main() +{ + texture_index_out = texture_index_in; + position_out = (modelview_matrix*vec4(position, 1.0)).xyz; +} + diff --git a/indra/newview/app_settings/shaders/class1/transform/texcoordV.glsl b/indra/newview/app_settings/shaders/class1/transform/texcoordV.glsl new file mode 100644 index 000000000..0e074f3ce --- /dev/null +++ b/indra/newview/app_settings/shaders/class1/transform/texcoordV.glsl @@ -0,0 +1,35 @@ +/** + * @file texcoordV.glsl + * + * $LicenseInfo:firstyear=2007&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2007, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + + +ATTRIBUTE vec2 texcoord0; + +VARYING vec2 texcoord_out; + +void main() +{ + texcoord_out = texcoord0; +} + diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl index 08f6ec63f..8db4cb58c 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl @@ -58,20 +58,22 @@ uniform float shadow_bias; uniform mat4 inv_proj; -float pcfShadow(sampler2DRectShadow shadowMap, vec4 stc, float scl) +float pcfShadow(sampler2DRectShadow shadowMap, vec4 stc) { stc.xyz /= stc.w; stc.z += shadow_bias; + + stc.x = floor(stc.x + fract(stc.y*12345)); // add some chaotic jitter to X sample pos according to Y to disguise the snapping going on here float cs = shadow2DRect(shadowMap, stc.xyz).x; float shadow = cs; - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(scl, scl, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(scl, -scl, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-scl, scl, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-scl, -scl, 0.0)).x, cs); - - return shadow/5.0; + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(2.0, 1.5, 0.0)).x; + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(1.0, -1.5, 0.0)).x; + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(-1.0, 1.5, 0.0)).x; + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(-2.0, -1.5, 0.0)).x; + + return shadow*0.2; } @@ -101,7 +103,7 @@ void main() float w = 1.0; w -= max(spos.z-far_split.z, 0.0)/transition_domain.z; - shadow += pcfShadow(shadowMap3, lpos, 0.25)*w; + shadow += pcfShadow(shadowMap3, lpos)*w; weight += w; shadow += max((pos.z+shadow_clip.z)/(shadow_clip.z-shadow_clip.w)*2.0-1.0, 0.0); } @@ -114,7 +116,7 @@ void main() float w = 1.0; w -= max(spos.z-far_split.y, 0.0)/transition_domain.y; w -= max(near_split.z-spos.z, 0.0)/transition_domain.z; - shadow += pcfShadow(shadowMap2, lpos, 0.75)*w; + shadow += pcfShadow(shadowMap2, lpos)*w; weight += w; } @@ -126,7 +128,7 @@ void main() float w = 1.0; w -= max(spos.z-far_split.x, 0.0)/transition_domain.x; w -= max(near_split.y-spos.z, 0.0)/transition_domain.y; - shadow += pcfShadow(shadowMap1, lpos, 0.75)*w; + shadow += pcfShadow(shadowMap1, lpos)*w; weight += w; } @@ -138,7 +140,7 @@ void main() float w = 1.0; w -= max(near_split.x-spos.z, 0.0)/transition_domain.x; - shadow += pcfShadow(shadowMap0, lpos, 1.0)*w; + shadow += pcfShadow(shadowMap0, lpos)*w; weight += w; } diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl index aae6a070e..33958a501 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl @@ -71,20 +71,22 @@ vec4 getPosition(vec2 pos_screen) return pos; } -float pcfShadow(sampler2DRectShadow shadowMap, vec4 stc, float scl) +float pcfShadow(sampler2DRectShadow shadowMap, vec4 stc) { stc.xyz /= stc.w; stc.z += shadow_bias; + + stc.x = floor(stc.x + fract(stc.y*12345)); // add some chaotic jitter to X sample pos according to Y to disguise the snapping going on here float cs = shadow2DRect(shadowMap, stc.xyz).x; float shadow = cs; - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(scl, scl, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(scl, -scl, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-scl, scl, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-scl, -scl, 0.0)).x, cs); - - return shadow/5.0; + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(2.0, 1.5, 0.0)).x; + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(1.0, -1.5, 0.0)).x; + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(-1.0, 1.5, 0.0)).x; + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(-2.0, -1.5, 0.0)).x; + + return shadow*0.2; } @@ -114,7 +116,7 @@ void main() float w = 1.0; w -= max(spos.z-far_split.z, 0.0)/transition_domain.z; - shadow += pcfShadow(shadowMap3, lpos, 0.25)*w; + shadow += pcfShadow(shadowMap3, lpos)*w; weight += w; shadow += max((pos.z+shadow_clip.z)/(shadow_clip.z-shadow_clip.w)*2.0-1.0, 0.0); } @@ -127,7 +129,7 @@ void main() float w = 1.0; w -= max(spos.z-far_split.y, 0.0)/transition_domain.y; w -= max(near_split.z-spos.z, 0.0)/transition_domain.z; - shadow += pcfShadow(shadowMap2, lpos, 0.75)*w; + shadow += pcfShadow(shadowMap2, lpos)*w; weight += w; } @@ -139,7 +141,7 @@ void main() float w = 1.0; w -= max(spos.z-far_split.x, 0.0)/transition_domain.x; w -= max(near_split.y-spos.z, 0.0)/transition_domain.y; - shadow += pcfShadow(shadowMap1, lpos, 0.75)*w; + shadow += pcfShadow(shadowMap1, lpos)*w; weight += w; } @@ -151,7 +153,7 @@ void main() float w = 1.0; w -= max(near_split.x-spos.z, 0.0)/transition_domain.x; - shadow += pcfShadow(shadowMap0, lpos, 1.0)*w; + shadow += pcfShadow(shadowMap0, lpos)*w; weight += w; } diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl index 931577359..2093fc37d 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl @@ -31,6 +31,8 @@ out vec4 frag_color; #define frag_color gl_FragColor #endif +uniform float minimum_alpha; + uniform sampler2DRectShadow shadowMap0; uniform sampler2DRectShadow shadowMap1; uniform sampler2DRectShadow shadowMap2; @@ -70,20 +72,22 @@ vec4 getPosition(vec2 pos_screen) return pos; } -float pcfShadow(sampler2DRectShadow shadowMap, vec4 stc, float scl) +float pcfShadow(sampler2DRectShadow shadowMap, vec4 stc) { stc.xyz /= stc.w; stc.z += shadow_bias; + + stc.x = floor(stc.x + fract(stc.y*12345)); // add some chaotic jitter to X sample pos according to Y to disguise the snapping going on here float cs = shadow2DRect(shadowMap, stc.xyz).x; float shadow = cs; - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(scl, scl, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(scl, -scl, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-scl, scl, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-scl, -scl, 0.0)).x, cs); - - return shadow/5.0; + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(2.0, 1.5, 0.0)).x; + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(1.0, -1.5, 0.0)).x; + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(-1.0, 1.5, 0.0)).x; + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(-2.0, -1.5, 0.0)).x; + + return shadow*0.2; } @@ -95,6 +99,13 @@ void main() float shadow = 0.0; vec4 pos = vec4(vary_position, 1.0); + vec4 diff = texture2D(diffuseMap,vary_texcoord0.xy); + + if (diff.a < minimum_alpha) + { + discard; + } + vec4 spos = pos; if (spos.z > -shadow_clip.w) @@ -113,7 +124,7 @@ void main() float w = 1.0; w -= max(spos.z-far_split.z, 0.0)/transition_domain.z; - shadow += pcfShadow(shadowMap3, lpos, 0.25)*w; + shadow += pcfShadow(shadowMap3, lpos)*w; weight += w; shadow += max((pos.z+shadow_clip.z)/(shadow_clip.z-shadow_clip.w)*2.0-1.0, 0.0); } @@ -126,7 +137,7 @@ void main() float w = 1.0; w -= max(spos.z-far_split.y, 0.0)/transition_domain.y; w -= max(near_split.z-spos.z, 0.0)/transition_domain.z; - shadow += pcfShadow(shadowMap2, lpos, 0.75)*w; + shadow += pcfShadow(shadowMap2, lpos)*w; weight += w; } @@ -138,7 +149,7 @@ void main() float w = 1.0; w -= max(spos.z-far_split.x, 0.0)/transition_domain.x; w -= max(near_split.y-spos.z, 0.0)/transition_domain.y; - shadow += pcfShadow(shadowMap1, lpos, 0.75)*w; + shadow += pcfShadow(shadowMap1, lpos)*w; weight += w; } @@ -150,7 +161,7 @@ void main() float w = 1.0; w -= max(near_split.x-spos.z, 0.0)/transition_domain.x; - shadow += pcfShadow(shadowMap0, lpos, 1.0)*w; + shadow += pcfShadow(shadowMap0, lpos)*w; weight += w; } @@ -162,8 +173,6 @@ void main() shadow = 1.0; } - vec4 diff = texture2D(diffuseMap,vary_texcoord0.xy); - vec4 col = vec4(vary_ambient + vary_directional.rgb*shadow, 1.0); vec4 color = diff * col; diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl index 61a7f1e32..a137bea30 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl @@ -309,11 +309,11 @@ void main() // vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz)); float sa = dot(refnormpersp, sun_dir.xyz); - vec3 dumbshiny = vary_SunlitColor*scol_ambocc.r*texture2D(lightFunc, vec2(sa, spec.a)).r; + vec3 dumbshiny = vary_SunlitColor*scol_ambocc.r*(6 * texture2D(lightFunc, vec2(sa, spec.a)).r); // add the two types of shiny together vec3 spec_contrib = dumbshiny * spec.rgb; - bloom = dot(spec_contrib, spec_contrib); + bloom = dot(spec_contrib, spec_contrib) / 4; col += spec_contrib; //add environmentmap diff --git a/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl index 99a277fbf..ab077d9e0 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl @@ -31,8 +31,6 @@ out vec4 frag_color; #define frag_color gl_FragColor #endif -VARYING vec4 vertex_color; - uniform sampler2DRect diffuseRect; uniform sampler2DRect specularRect; uniform sampler2DRect depthMap; @@ -49,6 +47,7 @@ uniform vec3 proj_n; uniform float proj_focus; //distance from plane to begin blurring uniform float proj_lod; //(number of mips in proj map) uniform float proj_range; //range between near clip and far clip plane of projection +uniform float proj_ambient_lod; uniform float proj_ambiance; uniform float near_clip; uniform float far_clip; @@ -58,16 +57,65 @@ uniform float sun_wash; uniform int proj_shadow_idx; uniform float shadow_fade; -VARYING vec4 vary_light; +uniform float size; +uniform vec3 color; +uniform float falloff; +VARYING vec3 trans_center; VARYING vec4 vary_fragcoord; uniform vec2 screen_res; uniform mat4 inv_proj; +vec4 texture2DLodSpecular(sampler2D projectionMap, vec2 tc, float lod) +{ + vec4 ret = texture2DLod(projectionMap, tc, lod); + + vec2 dist = tc-vec2(0.5); + + float det = max(1.0-lod/(proj_lod*0.5), 0.0); + + float d = dot(dist,dist); + + ret *= min(clamp((0.25-d)/0.25, 0.0, 1.0)+det, 1.0); + + return ret; +} + +vec4 texture2DLodDiffuse(sampler2D projectionMap, vec2 tc, float lod) +{ + vec4 ret = texture2DLod(projectionMap, tc, lod); + + vec2 dist = vec2(0.5) - abs(tc-vec2(0.5)); + + float det = min(lod/(proj_lod*0.5), 1.0); + + float d = min(dist.x, dist.y); + + float edge = 0.25*det; + + ret *= clamp(d/edge, 0.0, 1.0); + + return ret; +} + +vec4 texture2DLodAmbient(sampler2D projectionMap, vec2 tc, float lod) +{ + vec4 ret = texture2DLod(projectionMap, tc, lod); + + vec2 dist = tc-vec2(0.5); + + float d = dot(dist,dist); + + ret *= min(clamp((0.25-d)/0.25, 0.0, 1.0), 1.0); + + return ret; +} + + vec4 getPosition(vec2 pos_screen) { - float depth = texture2DRect(depthMap, pos_screen.xy).a; + float depth = texture2DRect(depthMap, pos_screen.xy).r; vec2 sc = pos_screen.xy*2.0; sc /= screen_res; sc -= vec2(1.0,1.0); @@ -85,6 +133,15 @@ void main() frag.xyz = frag.xyz*0.5+0.5; frag.xy *= screen_res; + vec3 pos = getPosition(frag.xy).xyz; + vec3 lv = trans_center.xyz-pos.xyz; + float dist2 = dot(lv,lv); + dist2 /= size; + if (dist2 > 1.0) + { + discard; + } + float shadow = 1.0; if (proj_shadow_idx >= 0) @@ -96,15 +153,6 @@ void main() shadow = min(sh[proj_shadow_idx]+shadow_fade, 1.0); } - vec3 pos = getPosition(frag.xy).xyz; - vec3 lv = vary_light.xyz-pos.xyz; - float dist2 = dot(lv,lv); - dist2 /= vary_light.w; - if (dist2 > 1.0) - { - discard; - } - vec3 norm = texture2DRect(normalMap, frag.xy).xyz; norm = vec3((norm.xy-0.5)*2.0,norm.z); // unpack norm @@ -119,8 +167,12 @@ void main() proj_tc.xyz /= proj_tc.w; - float fa = vertex_color.a+1.0; - float dist_atten = clamp(1.0-(dist2-1.0*(1.0-fa))/fa, 0.0, 1.0); + float fa = falloff+1.0; + float dist_atten = min(1.0-(dist2-1.0*(1.0-fa))/fa, 1.0); + if (dist_atten <= 0.0) + { + discard; + } lv = proj_origin-pos.xyz; lv = normalize(lv); @@ -138,37 +190,33 @@ void main() proj_tc.y > 0.0) { float lit = 0.0; + float amb_da = proj_ambiance; + if (da > 0.0) { float diff = clamp((l_dist-proj_focus)/proj_range, 0.0, 1.0); float lod = diff * proj_lod; - vec4 plcol = texture2DLod(projectionMap, proj_tc.xy, lod); + vec4 plcol = texture2DLodDiffuse(projectionMap, proj_tc.xy, lod); - vec3 lcol = vertex_color.rgb * plcol.rgb * plcol.a; + vec3 lcol = color.rgb * plcol.rgb * plcol.a; lit = da * dist_atten * noise; col = lcol*lit*diff_tex*shadow; - } - - float diff = clamp((proj_range-proj_focus)/proj_range, 0.0, 1.0); - float lod = diff * proj_lod; - vec4 amb_plcol = texture2DLod(projectionMap, proj_tc.xy, lod); - //float amb_da = mix(proj_ambiance, proj_ambiance*max(-da, 0.0), max(da, 0.0)); - float amb_da = proj_ambiance; - if (da > 0.0) - { amb_da += (da*0.5)*(1.0-shadow)*proj_ambiance; } + //float diff = clamp((proj_range-proj_focus)/proj_range, 0.0, 1.0); + vec4 amb_plcol = texture2DLodAmbient(projectionMap, proj_tc.xy, proj_lod); + amb_da += (da*da*0.5+0.5)*proj_ambiance; - + amb_da *= dist_atten * noise; - + amb_da = min(amb_da, 1.0-lit); - - col += amb_da*vertex_color.rgb*diff_tex.rgb*amb_plcol.rgb*amb_plcol.a; + + col += amb_da*color.rgb*diff_tex.rgb*amb_plcol.rgb*amb_plcol.a; } @@ -185,19 +233,23 @@ void main() { vec3 pfinal = pos + ref * dot(pdelta, proj_n)/ds; - vec3 stc = (proj_mat * vec4(pfinal.xyz, 1.0)).xyz; + vec4 stc = (proj_mat * vec4(pfinal.xyz, 1.0)); if (stc.z > 0.0) { - stc.xy /= stc.z+proj_near; - + stc.xy /= stc.w; + + float fatten = clamp(spec.a*spec.a+spec.a*0.5, 0.25, 1.0); + + stc.xy = (stc.xy - vec2(0.5)) * fatten + vec2(0.5); + if (stc.x < 1.0 && stc.y < 1.0 && stc.x > 0.0 && stc.y > 0.0) { - vec4 scol = texture2DLod(projectionMap, stc.xy, proj_lod-spec.a*proj_lod); - col += dist_atten*scol.rgb*vertex_color.rgb*scol.a*spec.rgb*shadow; + vec4 scol = texture2DLodSpecular(projectionMap, stc.xy, proj_lod-spec.a*proj_lod); + col += dist_atten*scol.rgb*color.rgb*scol.a*spec.rgb*shadow; } } } diff --git a/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl index 8c4ccf9cb..db3d76035 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl @@ -78,42 +78,42 @@ vec4 getPosition(vec2 pos_screen) return pos; } -float pcfShadow(sampler2DRectShadow shadowMap, vec4 stc, float scl) +float pcfShadow(sampler2DRectShadow shadowMap, vec4 stc, float scl, vec2 pos_screen) { stc.xyz /= stc.w; stc.z += shadow_bias*scl; - + + stc.x = floor(stc.x + fract(pos_screen.y*0.666666666)); // add some jitter to X sample pos according to Y to disguise the snapping going on here + float cs = shadow2DRect(shadowMap, stc.xyz).x; float shadow = cs; - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(1.5, 1.5, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(1.5, -1.5, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-1.5, 1.5, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-1.5, -1.5, 0.0)).x, cs); + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(2.0, 1.5, 0.0)).x; + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(1.0, -1.5, 0.0)).x; + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(-2.0, 1.5, 0.0)).x; + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(-1.0, -1.5, 0.0)).x; - return shadow/5.0; - - //return shadow; + return shadow*0.2; } -float pcfShadow(sampler2DShadow shadowMap, vec4 stc, float scl) +float pcfShadow(sampler2DShadow shadowMap, vec4 stc, float scl, vec2 pos_screen) { stc.xyz /= stc.w; stc.z += spot_shadow_bias*scl; + stc.x = floor(proj_shadow_res.x * stc.x + fract(pos_screen.y*0.666666666)) / proj_shadow_res.x; // snap float cs = shadow2D(shadowMap, stc.xyz).x; float shadow = cs; - vec2 off = 1.5/proj_shadow_res; + vec2 off = 1.0/proj_shadow_res; + off.y *= 1.5; - shadow += max(shadow2D(shadowMap, stc.xyz+vec3(off.x, off.y, 0.0)).x, cs); - shadow += max(shadow2D(shadowMap, stc.xyz+vec3(off.x, -off.y, 0.0)).x, cs); - shadow += max(shadow2D(shadowMap, stc.xyz+vec3(-off.x, off.y, 0.0)).x, cs); - shadow += max(shadow2D(shadowMap, stc.xyz+vec3(-off.x, -off.y, 0.0)).x, cs); - - return shadow/5.0; - - //return shadow; + shadow += shadow2D(shadowMap, stc.xyz+vec3(off.x*2.0, off.y, 0.0)).x; + shadow += shadow2D(shadowMap, stc.xyz+vec3(off.x, -off.y, 0.0)).x; + shadow += shadow2D(shadowMap, stc.xyz+vec3(-off.x, off.y, 0.0)).x; + shadow += shadow2D(shadowMap, stc.xyz+vec3(-off.x*2.0, -off.y, 0.0)).x; + + return shadow*0.2; } void main() @@ -166,7 +166,7 @@ void main() float w = 1.0; w -= max(spos.z-far_split.z, 0.0)/transition_domain.z; - shadow += pcfShadow(shadowMap3, lpos, 0.25)*w; + shadow += pcfShadow(shadowMap3, lpos, 0.25, pos_screen)*w; weight += w; shadow += max((pos.z+shadow_clip.z)/(shadow_clip.z-shadow_clip.w)*2.0-1.0, 0.0); } @@ -179,7 +179,7 @@ void main() float w = 1.0; w -= max(spos.z-far_split.y, 0.0)/transition_domain.y; w -= max(near_split.z-spos.z, 0.0)/transition_domain.z; - shadow += pcfShadow(shadowMap2, lpos, 0.75)*w; + shadow += pcfShadow(shadowMap2, lpos, 0.5, pos_screen)*w; weight += w; } @@ -191,7 +191,7 @@ void main() float w = 1.0; w -= max(spos.z-far_split.x, 0.0)/transition_domain.x; w -= max(near_split.y-spos.z, 0.0)/transition_domain.y; - shadow += pcfShadow(shadowMap1, lpos, 0.75)*w; + shadow += pcfShadow(shadowMap1, lpos, 0.75, pos_screen)*w; weight += w; } @@ -203,7 +203,7 @@ void main() float w = 1.0; w -= max(near_split.x-spos.z, 0.0)/transition_domain.x; - shadow += pcfShadow(shadowMap0, lpos, 1.0)*w; + shadow += pcfShadow(shadowMap0, lpos, 1.0, pos_screen)*w; weight += w; } @@ -237,11 +237,11 @@ void main() //spotlight shadow 1 vec4 lpos = shadow_matrix[4]*spos; - frag_color[2] = pcfShadow(shadowMap4, lpos, 0.8); + frag_color[2] = pcfShadow(shadowMap4, lpos, 0.8, pos_screen); //spotlight shadow 2 lpos = shadow_matrix[5]*spos; - frag_color[3] = pcfShadow(shadowMap5, lpos, 0.8); + frag_color[3] = pcfShadow(shadowMap5, lpos, 0.8, pos_screen); //frag_color.rgb = pos.xyz; //frag_color.b = shadow; diff --git a/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl b/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl index 02075a768..32b206e63 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl @@ -139,42 +139,42 @@ float calcAmbientOcclusion(vec4 pos, vec3 norm) return min(ret, 1.0); } -float pcfShadow(sampler2DRectShadow shadowMap, vec4 stc, float scl) +float pcfShadow(sampler2DRectShadow shadowMap, vec4 stc, float scl, vec2 pos_screen) { stc.xyz /= stc.w; stc.z += shadow_bias*scl; + + stc.x = floor(stc.x + fract(pos_screen.y*0.666666666)); float cs = shadow2DRect(shadowMap, stc.xyz).x; float shadow = cs; - - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(1.5, 1.5, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(1.5, -1.5, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-1.5, 1.5, 0.0)).x, cs); - shadow += max(shadow2DRect(shadowMap, stc.xyz+vec3(-1.5, -1.5, 0.0)).x, cs); - - return shadow/5.0; - //return shadow; + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(2.0, 1.5, 0.0)).x; + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(1.0, -1.5, 0.0)).x; + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(-1.0, 1.5, 0.0)).x; + shadow += shadow2DRect(shadowMap, stc.xyz+vec3(-2.0, -1.5, 0.0)).x; + + return shadow*0.2; } -float pcfShadow(sampler2DShadow shadowMap, vec4 stc, float scl) +float pcfShadow(sampler2DShadow shadowMap, vec4 stc, float scl, vec2 pos_screen) { stc.xyz /= stc.w; stc.z += spot_shadow_bias*scl; + stc.x = floor(proj_shadow_res.x * stc.x + fract(pos_screen.y*0.666666666)) / proj_shadow_res.x; // snap float cs = shadow2D(shadowMap, stc.xyz).x; float shadow = cs; - vec2 off = 1.5/proj_shadow_res; + vec2 off = 1.0/proj_shadow_res; + off.y *= 1.5; - shadow += max(shadow2D(shadowMap, stc.xyz+vec3(off.x, off.y, 0.0)).x, cs); - shadow += max(shadow2D(shadowMap, stc.xyz+vec3(off.x, -off.y, 0.0)).x, cs); - shadow += max(shadow2D(shadowMap, stc.xyz+vec3(-off.x, off.y, 0.0)).x, cs); - shadow += max(shadow2D(shadowMap, stc.xyz+vec3(-off.x, -off.y, 0.0)).x, cs); - - return shadow/5.0; - - //return shadow; + shadow += shadow2D(shadowMap, stc.xyz+vec3(off.x*2.0, off.y, 0.0)).x; + shadow += shadow2D(shadowMap, stc.xyz+vec3(off.x, -off.y, 0.0)).x; + shadow += shadow2D(shadowMap, stc.xyz+vec3(-off.x, off.y, 0.0)).x; + shadow += shadow2D(shadowMap, stc.xyz+vec3(-off.x*2.0, -off.y, 0.0)).x; + + return shadow*0.2; } void main() @@ -227,7 +227,7 @@ void main() float w = 1.0; w -= max(spos.z-far_split.z, 0.0)/transition_domain.z; - shadow += pcfShadow(shadowMap3, lpos, 0.25)*w; + shadow += pcfShadow(shadowMap3, lpos, 0.25, pos_screen)*w; weight += w; shadow += max((pos.z+shadow_clip.z)/(shadow_clip.z-shadow_clip.w)*2.0-1.0, 0.0); } @@ -240,7 +240,7 @@ void main() float w = 1.0; w -= max(spos.z-far_split.y, 0.0)/transition_domain.y; w -= max(near_split.z-spos.z, 0.0)/transition_domain.z; - shadow += pcfShadow(shadowMap2, lpos, 0.75)*w; + shadow += pcfShadow(shadowMap2, lpos, 0.5, pos_screen)*w; weight += w; } @@ -252,7 +252,7 @@ void main() float w = 1.0; w -= max(spos.z-far_split.x, 0.0)/transition_domain.x; w -= max(near_split.y-spos.z, 0.0)/transition_domain.y; - shadow += pcfShadow(shadowMap1, lpos, 0.75)*w; + shadow += pcfShadow(shadowMap1, lpos, 0.75, pos_screen)*w; weight += w; } @@ -264,7 +264,7 @@ void main() float w = 1.0; w -= max(near_split.x-spos.z, 0.0)/transition_domain.x; - shadow += pcfShadow(shadowMap0, lpos, 1.0)*w; + shadow += pcfShadow(shadowMap0, lpos, 1.0, pos_screen)*w; weight += w; } @@ -298,11 +298,11 @@ void main() //spotlight shadow 1 vec4 lpos = shadow_matrix[4]*spos; - frag_color[2] = pcfShadow(shadowMap4, lpos, 0.8); + frag_color[2] = pcfShadow(shadowMap4, lpos, 0.8, pos_screen); //spotlight shadow 2 lpos = shadow_matrix[5]*spos; - frag_color[3] = pcfShadow(shadowMap5, lpos, 0.8); + frag_color[3] = pcfShadow(shadowMap5, lpos, 0.8, pos_screen); //frag_color.rgb = pos.xyz; //frag_color.b = shadow; 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/jcfloaterareasearch.cpp b/indra/newview/jcfloaterareasearch.cpp index 57ad0bebd..3cb15b052 100644 --- a/indra/newview/jcfloaterareasearch.cpp +++ b/indra/newview/jcfloaterareasearch.cpp @@ -52,7 +52,7 @@ std::string JCFloaterAreaSearch::sSearchedDesc; std::string JCFloaterAreaSearch::sSearchedOwner; std::string JCFloaterAreaSearch::sSearchedGroup; -const std::string request_string = "JCFloaterAreaSearch::Requested_ø§µ"; +const std::string request_string = "JCFloaterAreaSearch::Requested_\xF8\xA7\xB5"; const F32 min_refresh_interval = 0.25f; // Minimum interval between list refreshes in seconds. JCFloaterAreaSearch::JCFloaterAreaSearch() : diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 44994b59a..08c35ec43 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2896,7 +2896,7 @@ void LLAgentCamera::lookAtObject(const LLUUID &object_id, bool self) BOOL LLAgentCamera::setPointAt(EPointAtType target_type, LLViewerObject *object, LLVector3 position) { // disallow pointing at attachments and avatars - if (object && (object->isAttachment() || object->isAvatar()) || gSavedSettings.getBOOL("DisablePointAtAndBeam")) + if ((object && (object->isAttachment() || object->isAvatar())) || gSavedSettings.getBOOL("DisablePointAtAndBeam")) { return FALSE; } diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 60ebf402e..4cab987ae 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -3428,7 +3428,7 @@ bool LLAppearanceMgr::moveWearable(LLViewerInventoryItem* item, bool closer_to_b //to cause appearance of the agent to be updated bool result = false; - if (result = gAgentWearables.moveWearable(item, closer_to_body)) + if ((result = gAgentWearables.moveWearable(item, closer_to_body))) { gAgentAvatarp->wearableUpdated(item->getWearableType(), FALSE); } diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 6364c1388..96b6166e4 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4038,7 +4038,9 @@ void LLAppViewer::idle() // if (!gNoRender) { +#if ENABLE_CLASSIC_CLOUDS LLWorld::getInstance()->updateClouds(gFrameDTClamped); +#endif gSky.propagateHeavenlyBodies(gFrameDTClamped); // moves sun, moon, and planets // Update wind vector @@ -4054,9 +4056,10 @@ void LLAppViewer::idle() // Compute average wind and use to drive motion of water average_wind = regionp->mWind.getAverage(); +#if ENABLE_CLASSIC_CLOUDS F32 cloud_density = regionp->mCloudLayer.getDensityRegion(wind_position_region); - gSky.setCloudDensityAtAgent(cloud_density); +#endif gSky.setWind(average_wind); //LLVOWater::setWind(average_wind); } diff --git a/indra/newview/llcloud.cpp b/indra/newview/llcloud.cpp index 2165f4238..fcdfbecd4 100644 --- a/indra/newview/llcloud.cpp +++ b/indra/newview/llcloud.cpp @@ -54,6 +54,7 @@ #include "lldrawpool.h" #include "llworld.h" +#if ENABLE_CLASSIC_CLOUDS extern LLPipeline gPipeline; const F32 CLOUD_UPDATE_RATE = 1.0f; // Global time dilation for clouds @@ -544,3 +545,4 @@ void LLCloudLayer::disconnectAllNeighbors() disconnectNeighbor(i); } } +#endif diff --git a/indra/newview/llcloud.h b/indra/newview/llcloud.h index f4ae03b68..b3fd6f681 100644 --- a/indra/newview/llcloud.h +++ b/indra/newview/llcloud.h @@ -89,6 +89,7 @@ class LLCloudLayer; class LLBitPack; class LLGroupHeader; +#if ENABLE_CLASSIC_CLOUDS const S32 CLOUD_GROUPS_PER_EDGE = 4; class LLCloudPuff @@ -201,5 +202,5 @@ protected: LLCloudGroup mCloudGroups[CLOUD_GROUPS_PER_EDGE][CLOUD_GROUPS_PER_EDGE]; }; - +#endif #endif diff --git a/indra/newview/llconsole.cpp b/indra/newview/llconsole.cpp index ccd4c4eb2..dc72314fe 100644 --- a/indra/newview/llconsole.cpp +++ b/indra/newview/llconsole.cpp @@ -1,11 +1,11 @@ -/** +/** * @file llconsole.cpp * @brief a scrolling console output device * * $LicenseInfo:firstyear=2001&license=viewergpl$ - * + * * Copyright (c) 2001-2009, Linden Research, Inc. - * + * * Second Life Viewer Source Code * The source code in this file ("Source Code") is provided by Linden Lab * to you under the terms of the GNU General Public License, version 2.0 @@ -13,17 +13,17 @@ * ("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. @@ -45,8 +45,6 @@ #include "llviewerwindow.h" #include "lltextparser.h" #include "llsd.h" -#include "llfontgl.h" -#include "llmath.h" #include "llstartup.h" @@ -72,7 +70,7 @@ LLConsole::LLConsole(const std::string& name, const LLRect &rect, { mTimer.reset(); - setFontSize( font_size_index ); + setFontSize( font_size_index ); } LLConsole::~LLConsole() @@ -97,10 +95,10 @@ void LLConsole::reshape(S32 width, S32 height, BOOL called_from_parent) { return; } - + mConsoleWidth = new_width; mConsoleHeight= new_height; - + LLView::reshape(new_width, new_height, called_from_parent); for(paragraph_t::iterator paragraph_it = mParagraphs.begin(); paragraph_it != mParagraphs.end(); paragraph_it++) @@ -127,7 +125,7 @@ void LLConsole::setFontSize(S32 size_index) { mFont = LLFontGL::getFontSansSerifHuge(); } - + for(paragraph_t::iterator paragraph_it = mParagraphs.begin(); paragraph_it != mParagraphs.end(); paragraph_it++) { (*paragraph_it)->updateLines((F32)getRect().getWidth(), mFont, true); @@ -156,7 +154,7 @@ void LLConsole::draw() // skip lines added more than mLinePersistTime ago F32 cur_time = mTimer.getElapsedTimeF32(); - + F32 skip_time = cur_time - mLinePersistTime; F32 fade_time = cur_time - mFadeTime; @@ -192,7 +190,7 @@ void LLConsole::draw() { return; } - + // draw remaining lines F32 y_pos = 0.f; @@ -207,7 +205,7 @@ void LLConsole::draw() F32 line_height = mFont->getLineHeight(); S32 message_spacing = 0; - + //080813 Spatters: This section makes a single huge black box behind all the text. S32 bkg_height=8; S32 bkg_width=0; @@ -230,7 +228,7 @@ void LLConsole::draw() { S32 target_height = llfloor( (*paragraph_it)->mLines.size() * line_height + message_spacing); S32 target_width = llfloor( (*paragraph_it)->mMaxWidth + CONSOLE_GUTTER_RIGHT); - + bkg_height+= target_height; if (target_width > bkg_width) { @@ -323,7 +321,7 @@ void LLConsole::addConsoleLine(const std::string& utf8line, const LLColor4 &colo } void LLConsole::addConsoleLine(const LLWString& wline, const LLColor4 &color) -{ +{ Paragraph* paragraph = new Paragraph(wline, color, mTimer.getElapsedTimeF32()); LLMutexLock lock(&mQueueMutex); mNewParagraphs.push_back ( paragraph ); @@ -335,24 +333,24 @@ void LLConsole::Paragraph::makeParagraphColorSegments (const LLColor4 &color) LLTextParser* highlight = LLTextParser::getInstance(); LLSD paragraph_color_segments; LLColor4 lcolor=color; - + highlight->parseFullLineHighlights(wstring_to_utf8str(mParagraphText), &lcolor); paragraph_color_segments = highlight->parsePartialLineHighlights( wstring_to_utf8str(mParagraphText), lcolor); - + for(LLSD::array_const_iterator color_segment_it = paragraph_color_segments.beginArray(); color_segment_it != paragraph_color_segments.endArray(); ++color_segment_it) - { + { LLSD color_llsd = (*color_segment_it)["color"]; std::string color_str = (*color_segment_it)["text"].asString(); ParagraphColorSegment color_segment; - + color_segment.mColor.setValue(color_llsd); color_segment.mNumChars = color_str.length(); - + mParagraphColorSegments.push_back(color_segment); } } @@ -368,22 +366,22 @@ void LLConsole::Paragraph::updateLines(F32 screen_width, LLFontGL* font, bool fo return; //No resize required. } } - + screen_width = screen_width - 30; //Margin for small windows. - + if ( mParagraphText.empty() || mParagraphColorSegments.empty() || font == NULL) { return; //Not enough info to complete. } - + mLines.clear(); //Chuck everything. mMaxWidth = 0.0f; - + paragraph_color_segments_t::iterator current_color = mParagraphColorSegments.begin(); - U32 current_color_length = (*current_color).mNumChars; - + U32 current_color_length = (*current_color).mNumChars; + S32 paragraph_offset = 0; //Offset into the paragraph text. // Wrap lines that are longer than the view is wide. @@ -406,13 +404,13 @@ void LLConsole::Paragraph::updateLines(F32 screen_width, LLFontGL* font, bool fo if (drawable != 0 || found_newline) { F32 x_position = 0; //Screen X position of text. - + mMaxWidth = llmax( mMaxWidth, (F32)font->getWidth( mParagraphText.substr( paragraph_offset, drawable ).c_str() ) ); line_color_segments_t line; - + U32 left_to_draw = drawable; U32 drawn = 0; - + while (left_to_draw >= current_color_length && current_color != mParagraphColorSegments.end() ) { @@ -420,12 +418,12 @@ void LLConsole::Paragraph::updateLines(F32 screen_width, LLFontGL* font, bool fo line.push_back( LineColorSegment( color_text, //Append segment to line. (*current_color).mColor, x_position ) ); - + x_position += font->getWidth( color_text.c_str() ); //Set up next screen position. - + drawn += current_color_length; left_to_draw -= current_color_length; - + current_color++; //Goto next paragraph color record. if (current_color != mParagraphColorSegments.end()) @@ -433,15 +431,15 @@ void LLConsole::Paragraph::updateLines(F32 screen_width, LLFontGL* font, bool fo current_color_length = (*current_color).mNumChars; } } - + if (left_to_draw > 0 && current_color != mParagraphColorSegments.end() ) { LLWString color_text = mParagraphText.substr( paragraph_offset + drawn, left_to_draw ); - + line.push_back( LineColorSegment( color_text, //Append segment to line. (*current_color).mColor, x_position ) ); - + current_color_length -= left_to_draw; } mLines.push_back(line); //Append line to paragraph line list. @@ -460,7 +458,7 @@ LLConsole::Paragraph::Paragraph (LLWString str, const LLColor4 &color, F32 add_t : mParagraphText(str), mAddTime(add_time), mMaxWidth(-1) { // Only call makeParagraphColorSegments if the user logged in already (we come - // here before he logged in when they disabled login/logout screens). + // here before they logged in when they disabled login/logout screens). // Otherwise makeParagraphColorSegments calls LLTextParser::getInstance() which // causes a one-time initialization by reading highlights.xml, which fails // when not logged in because it's per account. @@ -469,4 +467,3 @@ LLConsole::Paragraph::Paragraph (LLWString str, const LLColor4 &color, F32 add_t makeParagraphColorSegments(color); } } - diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 745c2f41f..b9df32f06 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -390,7 +390,9 @@ void LLDrawable::makeActive() pcode == LLViewerObject::LL_VO_SURFACE_PATCH || pcode == LLViewerObject::LL_VO_PART_GROUP || pcode == LLViewerObject::LL_VO_HUD_PART_GROUP || +#if ENABLE_CLASSIC_CLOUDS pcode == LLViewerObject::LL_VO_CLOUDS || +#endif pcode == LLViewerObject::LL_VO_GROUND || pcode == LLViewerObject::LL_VO_SKY) { @@ -454,7 +456,7 @@ void LLDrawable::makeStatic(BOOL warning_enabled) { if (isState(ACTIVE)) { - clearState(ACTIVE); + clearState(ACTIVE | ANIMATED_CHILD); if (mParent.notNull() && mParent->isActive() && warning_enabled) { @@ -542,9 +544,9 @@ F32 LLDrawable::updateXform(BOOL undamped) target_rot = new_rot; target_scale = new_scale; } - else + else if (mVObjp->getAngularVelocity().isExactlyZero()) { - // snap to final position + // snap to final position (only if no target omega is applied) dist_squared = 0.0f; if (getVOVolume() && !isRoot()) { //child prim snapping to some position, needs a rebuild @@ -553,15 +555,25 @@ F32 LLDrawable::updateXform(BOOL undamped) } } - if ((mCurrentScale != target_scale) || - (!isRoot() && - (dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED || - !mVObjp->getAngularVelocity().isExactlyZero() || - target_pos != mXform.getPosition() || - target_rot != mXform.getRotation()))) - { //child prim moving or scale change requires immediate rebuild + LLVector3 vec = mCurrentScale-target_scale; + + if (vec*vec > MIN_INTERPOLATE_DISTANCE_SQUARED) + { //scale change requires immediate rebuild + mCurrentScale = target_scale; gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE); } + else if (!isRoot() && + (!mVObjp->getAngularVelocity().isExactlyZero() || + dist_squared > 0.f)) + { //child prim moving relative to parent, tag as needing to be rendered atomically and rebuild + dist_squared = 1.f; //keep this object on the move list + if (!isState(LLDrawable::ANIMATED_CHILD)) + { + setState(LLDrawable::ANIMATED_CHILD); + gPipeline.markRebuild(this, LLDrawable::REBUILD_ALL, TRUE); + mVObjp->dirtySpatialGroup(); + } + } else if (!getVOVolume() && !isAvatar()) { movePartition(); @@ -572,9 +584,7 @@ F32 LLDrawable::updateXform(BOOL undamped) mXform.setRotation(target_rot); mXform.setScale(LLVector3(1,1,1)); //no scale in drawable transforms (IT'S A RULE!) mXform.updateMatrix(); - - mCurrentScale = target_scale; - + if (mSpatialBridge) { gPipeline.markMoved(mSpatialBridge, FALSE); @@ -600,7 +610,11 @@ void LLDrawable::moveUpdatePipeline(BOOL moved) // Update the face centers. for (S32 i = 0; i < getNumFaces(); i++) { - getFace(i)->updateCenterAgent(); + LLFace* face = getFace(i); + if (face) + { + face->updateCenterAgent(); + } } } @@ -731,7 +745,8 @@ void LLDrawable::updateDistance(LLCamera& camera, bool force_update) for (S32 i = 0; i < getNumFaces(); i++) { LLFace* facep = getFace(i); - if (force_update || facep->getPoolType() == LLDrawPool::POOL_ALPHA) + if (facep && + (force_update || facep->getPoolType() == LLDrawPool::POOL_ALPHA)) { LLVector4a box; box.setSub(facep->mExtents[1], facep->mExtents[0]); @@ -787,6 +802,7 @@ void LLDrawable::updateTexture() } }*/ + getVOVolume()->mFaceMappingChanged = TRUE; gPipeline.markRebuild(this, LLDrawable::REBUILD_MATERIAL, TRUE); } } @@ -830,13 +846,16 @@ void LLDrawable::shiftPos(const LLVector4a &shift_vector) for (S32 i = 0; i < getNumFaces(); i++) { LLFace *facep = getFace(i); - facep->mCenterAgent += LLVector3(shift_vector.getF32ptr()); - facep->mExtents[0].add(shift_vector); - facep->mExtents[1].add(shift_vector); - - if (!volume && facep->hasGeometry()) + if (facep) { - facep->clearVertexBuffer(); + facep->mCenterAgent += LLVector3(shift_vector.getF32ptr()); + facep->mExtents[0].add(shift_vector); + facep->mExtents[1].add(shift_vector); + + if (!volume && facep->hasGeometry()) + { + facep->clearVertexBuffer(); + } } } @@ -958,7 +977,10 @@ void LLDrawable::setSpatialGroup(LLSpatialGroup *groupp) for (S32 i = 0; i < getNumFaces(); ++i) { LLFace* facep = getFace(i); - facep->clearVertexBuffer(); + if (facep) + { + facep->clearVertexBuffer(); + } } } @@ -1544,15 +1566,17 @@ BOOL LLDrawable::isAnimating() const { return TRUE; } +#if ENABLE_CLASSIC_CLOUDS if (mVObjp->getPCode() == LLViewerObject::LL_VO_CLOUDS) { return TRUE; } +#endif - if (!isRoot() && !mVObjp->getAngularVelocity().isExactlyZero()) - { + /*if (!isRoot() && !mVObjp->getAngularVelocity().isExactlyZero()) + { //target omega return TRUE; - } + }*/ return FALSE; } diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h index 66ef4b7c4..6f07c82be 100644 --- a/indra/newview/lldrawable.h +++ b/indra/newview/lldrawable.h @@ -283,6 +283,7 @@ public: HAS_ALPHA = 0x04000000, RIGGED = 0x08000000, PARTITION_MOVE = 0x10000000, + ANIMATED_CHILD = 0x20000000, } EDrawableFlags; private: //aligned members @@ -339,12 +340,14 @@ inline LLFace* LLDrawable::getFace(const S32 i) const if ((U32) i >= mFaces.size()) { - llerrs << "Invalid face index." << llendl; + llwarns << "Invalid face index." << llendl; + return NULL; } if (!mFaces[i]) { - llerrs << "Null face found." << llendl; + llwarns << "Null face found." << llendl; + return NULL; } return mFaces[i]; diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index 4d4864470..500f8b67a 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -404,7 +404,9 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask) bool draw_glow_for_this_partition = mVertexShaderLevel > 0 && // no shaders = no glow. // All particle systems seem to come off the wire with texture entries which claim that they glow. This is probably a bug in the data. Suppress. group->mSpatialPartition->mPartitionType != LLViewerRegion::PARTITION_PARTICLE && +#if ENABLE_CLASSIC_CLOUDS group->mSpatialPartition->mPartitionType != LLViewerRegion::PARTITION_CLOUD && +#endif group->mSpatialPartition->mPartitionType != LLViewerRegion::PARTITION_HUD_PARTICLE; LLSpatialGroup::drawmap_elem_t& draw_info = group->mDrawMap[LLRenderPass::PASS_ALPHA]; @@ -413,13 +415,20 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask) { LLDrawInfo& params = **k; + if ((params.mVertexBuffer->getTypeMask() & mask) != mask) + { //FIXME! + llwarns << "Missing required components, skipping render batch." << llendl; + continue; + } + LLRenderPass::applyModelMatrix(params); - if (params.mFullbright) + + if (params.mFullbright) + { + // Turn off lighting if it hasn't already been so. + if (light_enabled || !initialized_lighting) { - // Turn off lighting if it hasn't already been so. - if (light_enabled || !initialized_lighting) - { initialized_lighting = TRUE; if (use_shaders) { diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index a91c2b3c5..a37f117c4 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -265,7 +265,9 @@ void LLDrawPoolAvatar::beginPostDeferredAlpha() sRenderingSkinned = TRUE; gPipeline.bindDeferredShader(*sVertexProgram); - + + sVertexProgram->setMinimumAlpha(0.2f); + sDiffuseChannel = sVertexProgram->enableTexture(LLViewerShaderMgr::DIFFUSE_MAP); } @@ -1436,7 +1438,7 @@ void LLDrawPoolAvatar::updateRiggedFaceVertexBuffer(LLVOAvatar* avatar, LLFace* void LLDrawPoolAvatar::renderRigged(LLVOAvatar* avatar, U32 type, bool glow) { - if (avatar->isSelf() && !gAgent.needsRenderAvatar() || !gMeshRepo.meshRezEnabled()) + if ((avatar->isSelf() && !gAgent.needsRenderAvatar()) || !gMeshRepo.meshRezEnabled()) { return; } 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 cd3c7812a..e52bb5959 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -50,11 +50,13 @@ #include "llsky.h" #include "llviewercamera.h" #include "llviewertexturelist.h" +#include "llvopartgroup.h" #include "llvosky.h" #include "llvovolume.h" #include "pipeline.h" #include "llviewerregion.h" #include "llviewerwindow.h" +#include "llviewershadermgr.h" #define LL_MAX_INDICES_COUNT 1000000 @@ -167,7 +169,19 @@ void LLFace::init(LLDrawable* drawablep, LLViewerObject* objp) mGeomCount = 0; mGeomIndex = 0; mIndicesCount = 0; - mIndicesIndex = 0; + if (drawablep->getRenderType() == LLPipeline::RENDER_TYPE_PARTICLES || + drawablep->getRenderType() == LLPipeline::RENDER_TYPE_HUD_PARTICLES +#if ENABLE_CLASSIC_CLOUDS + || drawablep->getRenderType() == LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS +#endif + ) + { //indicate to LLParticlePartition that this particle is uninitialized + mIndicesIndex = 0xFFFFFFFF; + } + else + { + mIndicesIndex = 0; + } mIndexInTex = 0; mTexture = NULL; mTEOffset = -1; @@ -183,12 +197,6 @@ void LLFace::init(LLDrawable* drawablep, LLViewerObject* objp) mFaceColor = LLColor4(1,0,0,1); - mLastVertexBuffer = mVertexBuffer; - mLastGeomCount = mGeomCount; - mLastGeomIndex = mGeomIndex; - mLastIndicesCount = mIndicesCount; - mLastIndicesIndex = mIndicesIndex; - mImportanceToCamera = 0.f ; mBoundingSphereRadius = 0.0f ; } @@ -206,6 +214,19 @@ void LLFace::destroy() mTexture->removeFace(this) ; } + if (mDrawablep.notNull() && + (mDrawablep->getRenderType() == LLPipeline::RENDER_TYPE_PARTICLES || + mDrawablep->getRenderType() == LLPipeline::RENDER_TYPE_HUD_PARTICLES +#if ENABLE_CLASSIC_CLOUDS + || mDrawablep->getRenderType() == LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS +#endif + ) && + mIndicesIndex != 0xFFFFFFFF) + { + LLVOPartGroup::freeVBSlot(getGeomIndex()/4); + mIndicesIndex = 0xFFFFFFFF; + } + if (mDrawPoolp) { if (this->isState(LLFace::RIGGED) && mDrawPoolp->getType() == LLDrawPool::POOL_AVATAR) @@ -372,7 +393,6 @@ void LLFace::setSize(S32 num_vertices, const S32 num_indices, bool align) mGeomCount = num_vertices; mIndicesCount = num_indices; mVertexBuffer = NULL; - mLastVertexBuffer = NULL; } llassert(verify()); @@ -1034,30 +1054,13 @@ bool LLFace::calcAlignedPlanarTE(const LLFace* align_to, LLVector2* res_st_offs void LLFace::updateRebuildFlags() { - if (!mDrawablep->isState(LLDrawable::REBUILD_VOLUME)) - { - BOOL moved = TRUE; - if (mLastVertexBuffer == mVertexBuffer && - !mVertexBuffer->isEmpty()) - { //this face really doesn't need to be regenerated, try real hard not to do so - if (mLastGeomCount == mGeomCount && - mLastGeomIndex == mGeomIndex && - mLastIndicesCount == mIndicesCount && - mLastIndicesIndex == mIndicesIndex) - { //data is in same location in vertex buffer - moved = FALSE; - } - } - mLastMoveTime = gFrameTimeSeconds; - - if (moved) - { - mDrawablep->setState(LLDrawable::REBUILD_VOLUME); - } + if (mDrawablep->isState(LLDrawable::REBUILD_VOLUME)) + { //this rebuild is zero overhead (direct consequence of some change that affects this face) + mLastUpdateTime = gFrameTimeSeconds; } else - { - mLastUpdateTime = gFrameTimeSeconds; + { //this rebuild is overhead (side effect of some change that does not affect this face) + mLastMoveTime = gFrameTimeSeconds; } } @@ -1096,6 +1099,72 @@ bool LLFace::canRenderAsMask() } +static LLFastTimer::DeclareTimer FTM_FACE_GEOM_VOLUME("Volume VB Cache"); + +//static +void LLFace::cacheFaceInVRAM(const LLVolumeFace& vf) +{ + LLFastTimer t(FTM_FACE_GEOM_VOLUME); + U32 mask = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0 | + LLVertexBuffer::MAP_BINORMAL | LLVertexBuffer::MAP_NORMAL; + + if (vf.mWeights) + { + mask |= LLVertexBuffer::MAP_WEIGHT4; + } + + LLVertexBuffer* buff = new LLVertexBuffer(mask, GL_STATIC_DRAW_ARB); + vf.mVertexBuffer = buff; + + buff->allocateBuffer(vf.mNumVertices, 0, true); + + LLStrider f_vert; + LLStrider f_binorm; + LLStrider f_norm; + LLStrider f_tc; + + buff->getBinormalStrider(f_binorm); + buff->getVertexStrider(f_vert); + buff->getNormalStrider(f_norm); + buff->getTexCoord0Strider(f_tc); + + for (U32 i = 0; i < (U32)vf.mNumVertices; ++i) + { + *f_vert++ = vf.mPositions[i]; + (*f_binorm++).set(vf.mBinormals[i].getF32ptr()); + *f_tc++ = vf.mTexCoords[i]; + (*f_norm++).set(vf.mNormals[i].getF32ptr()); + } + + if (vf.mWeights) + { + LLStrider f_wght; + buff->getWeight4Strider(f_wght); + for (U32 i = 0; i < (U32)vf.mNumVertices; ++i) + { + (*f_wght++).set(vf.mWeights[i].getF32ptr()); + } + } + + buff->flush(); +} + +//helper function for pushing primitives for transform shaders and cleaning up +//uninitialized data on the tail, plus tracking number of expected primitives +void push_for_transform(LLVertexBuffer* buff, U32 source_count, U32 dest_count) +{ + if (source_count > 0 && dest_count >= source_count) //protect against possible U32 wrapping + { + //push source primitives + buff->drawArrays(LLRender::POINTS, 0, source_count); + U32 tail = dest_count-source_count; + for (U32 i = 0; i < tail; ++i) + { //copy last source primitive into each element in tail + buff->drawArrays(LLRender::POINTS, source_count-1, 1); + } + gPipeline.mTransformFeedbackPrimitives += dest_count; + } +} static LLFastTimer::DeclareTimer FTM_FACE_GET_GEOM("Face Geom"); static LLFastTimer::DeclareTimer FTM_FACE_GEOM_POSITION("Position"); static LLFastTimer::DeclareTimer FTM_FACE_GEOM_NORMAL("Normal"); @@ -1113,8 +1182,8 @@ static LLFastTimer::DeclareTimer FTM_FACE_TEX_DEFAULT("Default"); static LLFastTimer::DeclareTimer FTM_FACE_TEX_QUICK("Quick"); static LLFastTimer::DeclareTimer FTM_FACE_TEX_QUICK_NO_XFORM("No Xform"); static LLFastTimer::DeclareTimer FTM_FACE_TEX_QUICK_XFORM("Xform"); - static LLFastTimer::DeclareTimer FTM_FACE_TEX_QUICK_PLANAR("Quick Planar"); + BOOL LLFace::getGeometryVolume(const LLVolume& volume, const S32 &f, const LLMatrix4& mat_vert_in, const LLMatrix3& mat_norm_in, @@ -1145,9 +1214,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, << " VF Num Indices: " << num_indices << " Indices Index: " << mIndicesIndex << " VB Num Indices: " << mVertexBuffer->getNumIndices() << llendl; - llwarns << "Last Indices Count: " << mLastIndicesCount - << " Last Indices Index: " << mLastIndicesIndex - << " Face Index: " << f + llwarns << " Face Index: " << f << " Pool Type: " << mPoolType << llendl; return FALSE; } @@ -1264,17 +1331,10 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, LLMatrix4a mat_normal; mat_normal.loadu(mat_norm_in); - //if it's not fullbright and has no normals, bake sunlight based on face normal - //bool bake_sunlight = !getTextureEntry()->getFullbright() && - // !mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_NORMAL); - F32 r = 0, os = 0, ot = 0, ms = 0, mt = 0, cos_ang = 0, sin_ang = 0; - + bool do_xform = false; if (rebuild_tcoord) { - LLFastTimer t(FTM_FACE_GEOM_TEXTURE); - bool do_xform; - if (tep) { r = tep->getRotation(); @@ -1303,310 +1363,368 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, { do_xform = false; } - - //bump setup - LLVector4a binormal_dir( -sin_ang, cos_ang, 0.f ); - LLVector4a bump_s_primary_light_ray(0.f, 0.f, 0.f); - LLVector4a bump_t_primary_light_ray(0.f, 0.f, 0.f); - - LLQuaternion bump_quat; - if (mDrawablep->isActive()) - { - bump_quat = LLQuaternion(mDrawablep->getRenderMatrix()); - } - - if (bump_code) - { - mVObjp->getVolume()->genBinormals(f); - F32 offset_multiple; - switch( bump_code ) - { - case BE_NO_BUMP: - offset_multiple = 0.f; - break; - case BE_BRIGHTNESS: - case BE_DARKNESS: - if( mTexture.notNull() && mTexture->hasGLTexture()) - { - // Offset by approximately one texel - S32 cur_discard = mTexture->getDiscardLevel(); - S32 max_size = llmax( mTexture->getWidth(), mTexture->getHeight() ); - max_size <<= cur_discard; - const F32 ARTIFICIAL_OFFSET = 2.f; - offset_multiple = ARTIFICIAL_OFFSET / (F32)max_size; - } - else - { - offset_multiple = 1.f/256; - } - break; - - default: // Standard bumpmap textures. Assumed to be 256x256 - offset_multiple = 1.f / 256; - break; - } - - F32 s_scale = 1.f; - F32 t_scale = 1.f; - if( tep ) - { - tep->getScale( &s_scale, &t_scale ); - } - // Use the nudged south when coming from above sun angle, such - // that emboss mapping always shows up on the upward faces of cubes when - // it's noon (since a lot of builders build with the sun forced to noon). - LLVector3 sun_ray = gSky.mVOSkyp->mBumpSunDir; - LLVector3 moon_ray = gSky.getMoonDirection(); - LLVector3& primary_light_ray = (sun_ray.mV[VZ] > 0) ? sun_ray : moon_ray; - - bump_s_primary_light_ray.load3((offset_multiple * s_scale * primary_light_ray).mV); - bump_t_primary_light_ray.load3((offset_multiple * t_scale * primary_light_ray).mV); - } - - U8 texgen = getTextureEntry()->getTexGen(); - if (rebuild_tcoord && texgen != LLTextureEntry::TEX_GEN_DEFAULT) - { //planar texgen needs binormals - mVObjp->getVolume()->genBinormals(f); - } - - U8 tex_mode = 0; + } - if (isState(TEXTURE_ANIM)) + static LLCachedControl use_transform_feedback("RenderUseTransformFeedback", false); + +#if 0//#ifdef GL_TRANSFORM_FEEDBACK_BUFFER + if (use_transform_feedback && + gTransformPositionProgram.mProgramObject && //transform shaders are loaded + mVertexBuffer->useVBOs() && //target buffer is in VRAM + !rebuild_weights && //TODO: add support for weights + !volume.isUnique()) //source volume is NOT flexi + { //use transform feedback to pack vertex buffer + + LLVertexBuffer* buff = (LLVertexBuffer*) vf.mVertexBuffer.get(); + + if (vf.mVertexBuffer.isNull() || buff->getNumVerts() != vf.mNumVertices) { - LLVOVolume* vobj = (LLVOVolume*) (LLViewerObject*) mVObjp; - tex_mode = vobj->mTexAnimMode; + mVObjp->getVolume()->genBinormals(f); + LLFace::cacheFaceInVRAM(vf); + buff = (LLVertexBuffer*) vf.mVertexBuffer.get(); + } - if (!tex_mode) - { - clearState(TEXTURE_ANIM); - } - else - { - os = ot = 0.f; - r = 0.f; - cos_ang = 1.f; - sin_ang = 0.f; - ms = mt = 1.f; + LLGLSLShader* cur_shader = LLGLSLShader::sCurBoundShaderPtr; + + gGL.pushMatrix(); + gGL.loadMatrix((GLfloat*) mat_vert_in.mMatrix); - do_xform = false; - } + if (rebuild_pos) + { + LLFastTimer t(FTM_FACE_GEOM_POSITION); + gTransformPositionProgram.bind(); - if (getVirtualSize() >= MIN_TEX_ANIM_SIZE) - { //don't override texture transform during tc bake - tex_mode = 0; - } + mVertexBuffer->bindForFeedback(0, LLVertexBuffer::TYPE_VERTEX, mGeomIndex, mGeomCount); + + U8 index = mTextureIndex < 255 ? mTextureIndex : 0; + + S32 val = 0; + U8* vp = (U8*) &val; + vp[0] = index; + vp[1] = 0; + vp[2] = 0; + vp[3] = 0; + + gTransformPositionProgram.uniform1i("texture_index_in", val); + glBeginTransformFeedback(GL_POINTS); + buff->setBuffer(LLVertexBuffer::MAP_VERTEX); + + push_for_transform(buff, vf.mNumVertices, mGeomCount); + + glEndTransformFeedback(); } - LLVector4a scalea; - scalea.load3(scale.mV); + if (rebuild_color) + { + LLFastTimer t(FTM_FACE_GEOM_COLOR); + gTransformColorProgram.bind(); + + mVertexBuffer->bindForFeedback(0, LLVertexBuffer::TYPE_COLOR, mGeomIndex, mGeomCount); - bool do_bump = bump_code && mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_TEXCOORD1); - bool do_tex_mat = tex_mode && mTextureMatrix; + S32 val = *((S32*) color.mV); - if (!do_bump) - { //not in atlas or not bump mapped, might be able to do a cheap update - mVertexBuffer->getTexCoord0Strider(tex_coords, mGeomIndex, mGeomCount); + gTransformColorProgram.uniform1i("color_in", val); + glBeginTransformFeedback(GL_POINTS); + buff->setBuffer(LLVertexBuffer::MAP_VERTEX); + push_for_transform(buff, vf.mNumVertices, mGeomCount); + glEndTransformFeedback(); + } - if (texgen != LLTextureEntry::TEX_GEN_PLANAR) + if (rebuild_emissive) + { + LLFastTimer t(FTM_FACE_GEOM_EMISSIVE); + gTransformColorProgram.bind(); + + mVertexBuffer->bindForFeedback(0, LLVertexBuffer::TYPE_EMISSIVE, mGeomIndex, mGeomCount); + + U8 glow = (U8) llclamp((S32) (getTextureEntry()->getGlow()*255), 0, 255); + + S32 glow32 = glow | + (glow << 8) | + (glow << 16) | + (glow << 24); + + gTransformColorProgram.uniform1i("color_in", glow32); + glBeginTransformFeedback(GL_POINTS); + buff->setBuffer(LLVertexBuffer::MAP_VERTEX); + push_for_transform(buff, vf.mNumVertices, mGeomCount); + glEndTransformFeedback(); + } + + if (rebuild_normal) + { + LLFastTimer t(FTM_FACE_GEOM_NORMAL); + gTransformNormalProgram.bind(); + + mVertexBuffer->bindForFeedback(0, LLVertexBuffer::TYPE_NORMAL, mGeomIndex, mGeomCount); + + glBeginTransformFeedback(GL_POINTS); + buff->setBuffer(LLVertexBuffer::MAP_NORMAL); + push_for_transform(buff, vf.mNumVertices, mGeomCount); + glEndTransformFeedback(); + } + + if (rebuild_binormal) + { + LLFastTimer t(FTM_FACE_GEOM_BINORMAL); + gTransformBinormalProgram.bind(); + + mVertexBuffer->bindForFeedback(0, LLVertexBuffer::TYPE_BINORMAL, mGeomIndex, mGeomCount); + + glBeginTransformFeedback(GL_POINTS); + buff->setBuffer(LLVertexBuffer::MAP_BINORMAL); + push_for_transform(buff, vf.mNumVertices, mGeomCount); + glEndTransformFeedback(); + } + + if (rebuild_tcoord) + { + LLFastTimer t(FTM_FACE_GEOM_TEXTURE); + gTransformTexCoordProgram.bind(); + + mVertexBuffer->bindForFeedback(0, LLVertexBuffer::TYPE_TEXCOORD0, mGeomIndex, mGeomCount); + + glBeginTransformFeedback(GL_POINTS); + buff->setBuffer(LLVertexBuffer::MAP_TEXCOORD0); + push_for_transform(buff, vf.mNumVertices, mGeomCount); + glEndTransformFeedback(); + + bool do_bump = bump_code && mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_TEXCOORD1); + + if (do_bump) { - LLFastTimer t(FTM_FACE_TEX_QUICK); - if (!do_tex_mat) + mVertexBuffer->bindForFeedback(0, LLVertexBuffer::TYPE_TEXCOORD1, mGeomIndex, mGeomCount); + glBeginTransformFeedback(GL_POINTS); + buff->setBuffer(LLVertexBuffer::MAP_TEXCOORD0); + push_for_transform(buff, vf.mNumVertices, mGeomCount); + glEndTransformFeedback(); + } + } + + glBindBufferARB(GL_TRANSFORM_FEEDBACK_BUFFER, 0); + + gGL.popMatrix(); + + if (cur_shader) + { + cur_shader->bind(); + } + } + else +#endif + { + //if it's not fullbright and has no normals, bake sunlight based on face normal + //bool bake_sunlight = !getTextureEntry()->getFullbright() && + // !mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_NORMAL); + + if (rebuild_tcoord) + { + LLFastTimer t(FTM_FACE_GEOM_TEXTURE); + + //bump setup + LLVector4a binormal_dir( -sin_ang, cos_ang, 0.f ); + LLVector4a bump_s_primary_light_ray(0.f, 0.f, 0.f); + LLVector4a bump_t_primary_light_ray(0.f, 0.f, 0.f); + + LLQuaternion bump_quat; + if (mDrawablep->isActive()) + { + bump_quat = LLQuaternion(mDrawablep->getRenderMatrix()); + } + + if (bump_code) + { + mVObjp->getVolume()->genBinormals(f); + F32 offset_multiple; + switch( bump_code ) { - if (!do_xform) + case BE_NO_BUMP: + offset_multiple = 0.f; + break; + case BE_BRIGHTNESS: + case BE_DARKNESS: + if( mTexture.notNull() && mTexture->hasGLTexture()) { - LLFastTimer t(FTM_FACE_TEX_QUICK_NO_XFORM); - LLVector4a::memcpyNonAliased16((F32*) tex_coords.get(), (F32*) vf.mTexCoords, num_vertices*2*sizeof(F32)); + // Offset by approximately one texel + S32 cur_discard = mTexture->getDiscardLevel(); + S32 max_size = llmax( mTexture->getWidth(), mTexture->getHeight() ); + max_size <<= cur_discard; + const F32 ARTIFICIAL_OFFSET = 2.f; + offset_multiple = ARTIFICIAL_OFFSET / (F32)max_size; } else { - LLFastTimer t(FTM_FACE_TEX_QUICK_XFORM); - F32* dst = (F32*) tex_coords.get(); - LLVector4a* src = (LLVector4a*) vf.mTexCoords; + offset_multiple = 1.f/256; + } + break; - LLVector4a trans; - trans.splat(-0.5f); + default: // Standard bumpmap textures. Assumed to be 256x256 + offset_multiple = 1.f / 256; + break; + } - LLVector4a rot0; - rot0.set(cos_ang, -sin_ang, cos_ang, -sin_ang); + F32 s_scale = 1.f; + F32 t_scale = 1.f; + if( tep ) + { + tep->getScale( &s_scale, &t_scale ); + } + // Use the nudged south when coming from above sun angle, such + // that emboss mapping always shows up on the upward faces of cubes when + // it's noon (since a lot of builders build with the sun forced to noon). + LLVector3 sun_ray = gSky.mVOSkyp->mBumpSunDir; + LLVector3 moon_ray = gSky.getMoonDirection(); + LLVector3& primary_light_ray = (sun_ray.mV[VZ] > 0) ? sun_ray : moon_ray; - LLVector4a rot1; - rot1.set(sin_ang, cos_ang, sin_ang, cos_ang); + bump_s_primary_light_ray.load3((offset_multiple * s_scale * primary_light_ray).mV); + bump_t_primary_light_ray.load3((offset_multiple * t_scale * primary_light_ray).mV); + } - LLVector4a scale; - scale.set(ms, mt, ms, mt); + U8 texgen = getTextureEntry()->getTexGen(); + if (rebuild_tcoord && texgen != LLTextureEntry::TEX_GEN_DEFAULT) + { //planar texgen needs binormals + mVObjp->getVolume()->genBinormals(f); + } - LLVector4a offset; - offset.set(os+0.5f, ot+0.5f, os+0.5f, ot+0.5f); + U8 tex_mode = 0; + + if (isState(TEXTURE_ANIM)) + { + LLVOVolume* vobj = (LLVOVolume*) (LLViewerObject*) mVObjp; + tex_mode = vobj->mTexAnimMode; - LLVector4Logical mask; - mask.clear(); - mask.setElement<2>(); - mask.setElement<3>(); + if (!tex_mode) + { + clearState(TEXTURE_ANIM); + } + else + { + os = ot = 0.f; + r = 0.f; + cos_ang = 1.f; + sin_ang = 0.f; + ms = mt = 1.f; - U32 count = num_vertices/2 + num_vertices%2; + do_xform = false; + } - for (U32 i = 0; i < count; i++) + if (getVirtualSize() >= MIN_TEX_ANIM_SIZE) + { //don't override texture transform during tc bake + tex_mode = 0; + } + } + + LLVector4a scalea; + scalea.load3(scale.mV); + + bool do_bump = bump_code && mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_TEXCOORD1); + bool do_tex_mat = tex_mode && mTextureMatrix; + + if (!do_bump) + { //not in atlas or not bump mapped, might be able to do a cheap update + mVertexBuffer->getTexCoord0Strider(tex_coords, mGeomIndex, mGeomCount); + + if (texgen != LLTextureEntry::TEX_GEN_PLANAR) + { + LLFastTimer t(FTM_FACE_TEX_QUICK); + if (!do_tex_mat) + { + if (!do_xform) + { + LLFastTimer t(FTM_FACE_TEX_QUICK_NO_XFORM); + LLVector4a::memcpyNonAliased16((F32*) tex_coords.get(), (F32*) vf.mTexCoords, num_vertices*2*sizeof(F32)); + } + else + { + LLFastTimer t(FTM_FACE_TEX_QUICK_XFORM); + F32* dst = (F32*) tex_coords.get(); + LLVector4a* src = (LLVector4a*) vf.mTexCoords; + + LLVector4a trans; + trans.splat(-0.5f); + + LLVector4a rot0; + rot0.set(cos_ang, -sin_ang, cos_ang, -sin_ang); + + LLVector4a rot1; + rot1.set(sin_ang, cos_ang, sin_ang, cos_ang); + + LLVector4a scale; + scale.set(ms, mt, ms, mt); + + LLVector4a offset; + offset.set(os+0.5f, ot+0.5f, os+0.5f, ot+0.5f); + + LLVector4Logical mask; + mask.clear(); + mask.setElement<2>(); + mask.setElement<3>(); + + U32 count = num_vertices/2 + num_vertices%2; + + for (U32 i = 0; i < count; i++) + { + LLVector4a res = *src++; + xform4a(res, trans, mask, rot0, rot1, offset, scale); + res.store4a(dst); + dst += 4; + } + } + } + else + { //do tex mat, no texgen, no atlas, no bump + for (S32 i = 0; i < num_vertices; i++) { - LLVector4a res = *src++; - xform4a(res, trans, mask, rot0, rot1, offset, scale); - res.store4a(dst); - dst += 4; + LLVector2 tc(vf.mTexCoords[i]); + //LLVector4a& norm = vf.mNormals[i]; + //LLVector4a& center = *(vf.mCenter); + + LLVector3 tmp(tc.mV[0], tc.mV[1], 0.f); + tmp = tmp * *mTextureMatrix; + tc.mV[0] = tmp.mV[0]; + tc.mV[1] = tmp.mV[1]; + *tex_coords++ = tc; } } } else - { //do tex mat, no texgen, no atlas, no bump - for (S32 i = 0; i < num_vertices; i++) - { - LLVector2 tc(vf.mTexCoords[i]); - //LLVector4a& norm = vf.mNormals[i]; - //LLVector4a& center = *(vf.mCenter); - - LLVector3 tmp(tc.mV[0], tc.mV[1], 0.f); - tmp = tmp * *mTextureMatrix; - tc.mV[0] = tmp.mV[0]; - tc.mV[1] = tmp.mV[1]; - *tex_coords++ = tc; - } - } - } - else - { //no bump, no atlas, tex gen planar - LLFastTimer t(FTM_FACE_TEX_QUICK_PLANAR); - if (do_tex_mat) - { - for (S32 i = 0; i < num_vertices; i++) - { - LLVector2 tc(vf.mTexCoords[i]); - LLVector4a& norm = vf.mNormals[i]; - LLVector4a& center = *(vf.mCenter); - LLVector4a vec = vf.mPositions[i]; - vec.mul(scalea); - planarProjection(tc, norm, center, vec); - - LLVector3 tmp(tc.mV[0], tc.mV[1], 0.f); - tmp = tmp * *mTextureMatrix; - tc.mV[0] = tmp.mV[0]; - tc.mV[1] = tmp.mV[1]; - - *tex_coords++ = tc; - } - } - else - { - for (S32 i = 0; i < num_vertices; i++) - { - LLVector2 tc(vf.mTexCoords[i]); - LLVector4a& norm = vf.mNormals[i]; - LLVector4a& center = *(vf.mCenter); - LLVector4a vec = vf.mPositions[i]; - vec.mul(scalea); - planarProjection(tc, norm, center, vec); - - xform(tc, cos_ang, sin_ang, os, ot, ms, mt); - - *tex_coords++ = tc; - } - } - } - - if (map_range) - { - mVertexBuffer->flush(); - } - } - else - { //either bump mapped or in atlas, just do the whole expensive loop - LLFastTimer t(FTM_FACE_TEX_DEFAULT); - mVertexBuffer->getTexCoord0Strider(tex_coords, mGeomIndex, mGeomCount, map_range); - - std::vector bump_tc; - - for (S32 i = 0; i < num_vertices; i++) - { - LLVector2 tc(vf.mTexCoords[i]); - - LLVector4a& norm = vf.mNormals[i]; - - LLVector4a& center = *(vf.mCenter); - - if (texgen != LLTextureEntry::TEX_GEN_DEFAULT) - { - LLVector4a vec = vf.mPositions[i]; - - vec.mul(scalea); - - switch (texgen) + { //no bump, no atlas, tex gen planar + LLFastTimer t(FTM_FACE_TEX_QUICK_PLANAR); + if (do_tex_mat) { - case LLTextureEntry::TEX_GEN_PLANAR: + for (S32 i = 0; i < num_vertices; i++) + { + LLVector2 tc(vf.mTexCoords[i]); + LLVector4a& norm = vf.mNormals[i]; + LLVector4a& center = *(vf.mCenter); + LLVector4a vec = vf.mPositions[i]; + vec.mul(scalea); planarProjection(tc, norm, center, vec); - break; - case LLTextureEntry::TEX_GEN_SPHERICAL: - sphericalProjection(tc, norm, center, vec); - break; - case LLTextureEntry::TEX_GEN_CYLINDRICAL: - cylindricalProjection(tc, norm, center, vec); - break; - default: - break; - } - } - - if (tex_mode && mTextureMatrix) - { - LLVector3 tmp(tc.mV[0], tc.mV[1], 0.f); - tmp = tmp * *mTextureMatrix; - tc.mV[0] = tmp.mV[0]; - tc.mV[1] = tmp.mV[1]; - } - else - { - xform(tc, cos_ang, sin_ang, os, ot, ms, mt); - } - - - *tex_coords++ = tc; - if (do_bump) - { - bump_tc.push_back(tc); - } - } - - if (map_range) - { - mVertexBuffer->flush(); - } - - if (do_bump) - { - mVertexBuffer->getTexCoord1Strider(tex_coords2, mGeomIndex, mGeomCount, map_range); - - for (S32 i = 0; i < num_vertices; i++) - { - LLVector4a tangent; - tangent.setCross3(vf.mBinormals[i], vf.mNormals[i]); - - LLMatrix4a tangent_to_object; - tangent_to_object.setRows(tangent, vf.mBinormals[i], vf.mNormals[i]); - LLVector4a t; - tangent_to_object.rotate(binormal_dir, t); - LLVector4a binormal; - mat_normal.rotate(t, binormal); - //VECTORIZE THIS - if (mDrawablep->isActive()) - { - LLVector3 t; - t.set(binormal.getF32ptr()); - t *= bump_quat; - binormal.load3(t.mV); + LLVector3 tmp(tc.mV[0], tc.mV[1], 0.f); + tmp = tmp * *mTextureMatrix; + tc.mV[0] = tmp.mV[0]; + tc.mV[1] = tmp.mV[1]; + + *tex_coords++ = tc; + } } + else + { + for (S32 i = 0; i < num_vertices; i++) + { + LLVector2 tc(vf.mTexCoords[i]); + LLVector4a& norm = vf.mNormals[i]; + LLVector4a& center = *(vf.mCenter); + LLVector4a vec = vf.mPositions[i]; + vec.mul(scalea); + planarProjection(tc, norm, center, vec); + + xform(tc, cos_ang, sin_ang, os, ot, ms, mt); - binormal.normalize3fast(); - LLVector2 tc = bump_tc[i]; - tc += LLVector2( bump_s_primary_light_ray.dot3(tangent).getF32(), bump_t_primary_light_ray.dot3(binormal).getF32() ); - - *tex_coords2++ = tc; + *tex_coords++ = tc; + } + } } if (map_range) @@ -1614,205 +1732,304 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, mVertexBuffer->flush(); } } - } - } + else + { //either bump mapped or in atlas, just do the whole expensive loop + LLFastTimer t(FTM_FACE_TEX_DEFAULT); + mVertexBuffer->getTexCoord0Strider(tex_coords, mGeomIndex, mGeomCount, map_range); - if (rebuild_pos) - { - LLFastTimer t(FTM_FACE_GEOM_POSITION); - llassert(num_vertices > 0); + std::vector bump_tc; - mVertexBuffer->getVertexStrider(vert, mGeomIndex, mGeomCount, map_range); + for (S32 i = 0; i < num_vertices; i++) + { + LLVector2 tc(vf.mTexCoords[i]); + + LLVector4a& norm = vf.mNormals[i]; + + LLVector4a& center = *(vf.mCenter); + + if (texgen != LLTextureEntry::TEX_GEN_DEFAULT) + { + LLVector4a vec = vf.mPositions[i]; + + vec.mul(scalea); + + switch (texgen) + { + case LLTextureEntry::TEX_GEN_PLANAR: + planarProjection(tc, norm, center, vec); + break; + case LLTextureEntry::TEX_GEN_SPHERICAL: + sphericalProjection(tc, norm, center, vec); + break; + case LLTextureEntry::TEX_GEN_CYLINDRICAL: + cylindricalProjection(tc, norm, center, vec); + break; + default: + break; + } + } + + if (tex_mode && mTextureMatrix) + { + LLVector3 tmp(tc.mV[0], tc.mV[1], 0.f); + tmp = tmp * *mTextureMatrix; + tc.mV[0] = tmp.mV[0]; + tc.mV[1] = tmp.mV[1]; + } + else + { + xform(tc, cos_ang, sin_ang, os, ot, ms, mt); + } + + + *tex_coords++ = tc; + if (do_bump) + { + bump_tc.push_back(tc); + } + } + + if (map_range) + { + mVertexBuffer->flush(); + } + + if (do_bump) + { + mVertexBuffer->getTexCoord1Strider(tex_coords2, mGeomIndex, mGeomCount, map_range); + + for (S32 i = 0; i < num_vertices; i++) + { + LLVector4a tangent; + tangent.setCross3(vf.mBinormals[i], vf.mNormals[i]); + + LLMatrix4a tangent_to_object; + tangent_to_object.setRows(tangent, vf.mBinormals[i], vf.mNormals[i]); + LLVector4a t; + tangent_to_object.rotate(binormal_dir, t); + LLVector4a binormal; + mat_normal.rotate(t, binormal); + + //VECTORIZE THIS + if (mDrawablep->isActive()) + { + LLVector3 t; + t.set(binormal.getF32ptr()); + t *= bump_quat; + binormal.load3(t.mV); + } + + binormal.normalize3fast(); + LLVector2 tc = bump_tc[i]; + tc += LLVector2( bump_s_primary_light_ray.dot3(tangent).getF32(), bump_t_primary_light_ray.dot3(binormal).getF32() ); + + *tex_coords2++ = tc; + } + + if (map_range) + { + mVertexBuffer->flush(); + } + } + } + } + + if (rebuild_pos) + { + LLFastTimer t(FTM_FACE_GEOM_POSITION); + llassert(num_vertices > 0); + + mVertexBuffer->getVertexStrider(vert, mGeomIndex, mGeomCount, map_range); - LLMatrix4a mat_vert; - mat_vert.loadu(mat_vert_in); + LLMatrix4a mat_vert; + mat_vert.loadu(mat_vert_in); - LLVector4a* src = vf.mPositions; - volatile F32* dst = (volatile F32*) vert.get(); + LLVector4a* src = vf.mPositions; + volatile F32* dst = (volatile F32*) vert.get(); - volatile F32* end = dst+num_vertices*4; - LLVector4a res; + volatile F32* end = dst+num_vertices*4; + LLVector4a res; - LLVector4a texIdx; + LLVector4a texIdx; - U8 index = mTextureIndex < 255 ? mTextureIndex : 0; + U8 index = mTextureIndex < 255 ? mTextureIndex : 0; - F32 val = 0.f; - U8* vp = (U8*) &val; - vp[0] = index; - vp[1] = 0; - vp[2] = 0; - vp[3] = 0; + F32 val = 0.f; + U8* vp = (U8*) &val; + vp[0] = index; + vp[1] = 0; + vp[2] = 0; + vp[3] = 0; - llassert(index <= LLGLSLShader::sIndexedTextureChannels-1); + llassert(index <= LLGLSLShader::sIndexedTextureChannels-1); - LLVector4Logical mask; - mask.clear(); - mask.setElement<3>(); + LLVector4Logical mask; + mask.clear(); + mask.setElement<3>(); - texIdx.set(0,0,0,val); + texIdx.set(0,0,0,val); - { - LLFastTimer t(FTM_FACE_POSITION_STORE); - LLVector4a tmp; - - do - { - mat_vert.affineTransform(*src++, res); - tmp.setSelectWithMask(mask, texIdx, res); - tmp.store4a((F32*) dst); - dst += 4; - } - while(dst < end); - } - - { - LLFastTimer t(FTM_FACE_POSITION_PAD); - S32 aligned_pad_vertices = mGeomCount - num_vertices; - res.set(res[0], res[1], res[2], 0.f); - - while (aligned_pad_vertices > 0) { - --aligned_pad_vertices; - res.store4a((F32*) dst); - dst += 4; + LLFastTimer t(FTM_FACE_POSITION_STORE); + LLVector4a tmp; + + do + { + mat_vert.affineTransform(*src++, res); + tmp.setSelectWithMask(mask, texIdx, res); + tmp.store4a((F32*) dst); + dst += 4; + } + while(dst < end); + } + + { + LLFastTimer t(FTM_FACE_POSITION_PAD); + S32 aligned_pad_vertices = mGeomCount - num_vertices; + res.set(res[0], res[1], res[2], 0.f); + + while (aligned_pad_vertices > 0) + { + --aligned_pad_vertices; + res.store4a((F32*) dst); + dst += 4; + } + } + + if (map_range) + { + mVertexBuffer->flush(); } } - if (map_range) - { - mVertexBuffer->flush(); - } - } - if (rebuild_normal) - { - LLFastTimer t(FTM_FACE_GEOM_NORMAL); - mVertexBuffer->getNormalStrider(norm, mGeomIndex, mGeomCount, map_range); - F32* normals = (F32*) norm.get(); + if (rebuild_normal) + { + LLFastTimer t(FTM_FACE_GEOM_NORMAL); + mVertexBuffer->getNormalStrider(norm, mGeomIndex, mGeomCount, map_range); + F32* normals = (F32*) norm.get(); - for (S32 i = 0; i < num_vertices; i++) - { - LLVector4a normal; - mat_normal.rotate(vf.mNormals[i], normal); - normal.normalize3fast(); - normal.store4a(normals); - normals += 4; - } + for (S32 i = 0; i < num_vertices; i++) + { + LLVector4a normal; + mat_normal.rotate(vf.mNormals[i], normal); + normal.normalize3fast(); + normal.store4a(normals); + normals += 4; + } - if (map_range) + if (map_range) + { + mVertexBuffer->flush(); + } + } + + if (rebuild_binormal) { - mVertexBuffer->flush(); - } - } + LLFastTimer t(FTM_FACE_GEOM_BINORMAL); + mVertexBuffer->getBinormalStrider(binorm, mGeomIndex, mGeomCount, map_range); + F32* binormals = (F32*) binorm.get(); - if (rebuild_binormal) - { - LLFastTimer t(FTM_FACE_GEOM_BINORMAL); - mVertexBuffer->getBinormalStrider(binorm, mGeomIndex, mGeomCount, map_range); - F32* binormals = (F32*) binorm.get(); - - for (S32 i = 0; i < num_vertices; i++) - { - LLVector4a binormal; - mat_normal.rotate(vf.mBinormals[i], binormal); - binormal.normalize3fast(); - binormal.store4a(binormals); - binormals += 4; - } + for (S32 i = 0; i < num_vertices; i++) + { + LLVector4a binormal; + mat_normal.rotate(vf.mBinormals[i], binormal); + binormal.normalize3fast(); + binormal.store4a(binormals); + binormals += 4; + } - if (map_range) - { - mVertexBuffer->flush(); + if (map_range) + { + mVertexBuffer->flush(); + } } - } - if (rebuild_weights && vf.mWeights) - { - LLFastTimer t(FTM_FACE_GEOM_WEIGHTS); - mVertexBuffer->getWeight4Strider(wght, mGeomIndex, mGeomCount, map_range); - F32* weights = (F32*) wght.get(); - LLVector4a::memcpyNonAliased16(weights, (F32*) vf.mWeights, num_vertices*4*sizeof(F32)); - if (map_range) + if (rebuild_weights && vf.mWeights) { - mVertexBuffer->flush(); + LLFastTimer t(FTM_FACE_GEOM_WEIGHTS); + mVertexBuffer->getWeight4Strider(wght, mGeomIndex, mGeomCount, map_range); + F32* weights = (F32*) wght.get(); + LLVector4a::memcpyNonAliased16(weights, (F32*) vf.mWeights, num_vertices*4*sizeof(F32)); + if (map_range) + { + mVertexBuffer->flush(); + } + } + + if (rebuild_color && mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_COLOR) ) + { + LLFastTimer t(FTM_FACE_GEOM_COLOR); + mVertexBuffer->getColorStrider(colors, mGeomIndex, mGeomCount, map_range); + + LLVector4a src; + + U32 vec[4]; + vec[0] = vec[1] = vec[2] = vec[3] = color.mAll; + + src.loadua((F32*) vec); + + F32* dst = (F32*) colors.get(); + S32 num_vecs = num_vertices/4; + if (num_vertices%4 > 0) + { + ++num_vecs; + } + + for (S32 i = 0; i < num_vecs; i++) + { + src.store4a(dst); + dst += 4; + } + + if (map_range) + { + mVertexBuffer->flush(); + } + } + + if (rebuild_emissive) + { + LLFastTimer t(FTM_FACE_GEOM_EMISSIVE); + LLStrider emissive; + mVertexBuffer->getEmissiveStrider(emissive, mGeomIndex, mGeomCount, map_range); + + U8 glow = (U8) llclamp((S32) (getTextureEntry()->getGlow()*255), 0, 255); + + LLVector4a src; + + + U32 glow32 = glow | + (glow << 8) | + (glow << 16) | + (glow << 24); + + U32 vec[4]; + std::fill_n(vec,4,glow32); // for clang + + src.loadua((F32*) vec); + + F32* dst = (F32*) emissive.get(); + S32 num_vecs = num_vertices/4; + if (num_vertices%4 > 0) + { + ++num_vecs; + } + + for (S32 i = 0; i < num_vecs; i++) + { + src.store4a(dst); + dst += 4; + } + + if (map_range) + { + mVertexBuffer->flush(); + } } } - // FS-5132 Only use color strider if face has colors. - // if (rebuild_color) - if (rebuild_color && mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_COLOR) ) - // - { - LLFastTimer t(FTM_FACE_GEOM_COLOR); - mVertexBuffer->getColorStrider(colors, mGeomIndex, mGeomCount, map_range); - - LLVector4a src; - - U32 vec[4]; - vec[0] = vec[1] = vec[2] = vec[3] = color.mAll; - - src.loadua((F32*) vec); - - F32* dst = (F32*) colors.get(); - S32 num_vecs = num_vertices/4; - if (num_vertices%4 > 0) - { - ++num_vecs; - } - - for (S32 i = 0; i < num_vecs; i++) - { - src.store4a(dst); - dst += 4; - } - - if (map_range) - { - mVertexBuffer->flush(); - } - } - - if (rebuild_emissive) - { - LLFastTimer t(FTM_FACE_GEOM_EMISSIVE); - LLStrider emissive; - mVertexBuffer->getEmissiveStrider(emissive, mGeomIndex, mGeomCount, map_range); - - U8 glow = (U8) llclamp((S32) (getTextureEntry()->getGlow()*255), 0, 255); - - LLVector4a src; - - - U32 glow32 = glow | - (glow << 8) | - (glow << 16) | - (glow << 24); - - U32 vec[4]; - std::fill_n(vec,4,glow32); - - src.loadua((F32*) vec); - - F32* dst = (F32*) emissive.get(); - S32 num_vecs = num_vertices/4; - if (num_vertices%4 > 0) - { - ++num_vecs; - } - - for (S32 i = 0; i < num_vecs; i++) - { - src.store4a(dst); - dst += 4; - } - - if (map_range) - { - mVertexBuffer->flush(); - } - } if (rebuild_tcoord) { mTexExtents[0].setVec(0,0); @@ -1828,11 +2045,6 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, mTexExtents[1][1] *= et ; } - mLastVertexBuffer = mVertexBuffer; - mLastGeomCount = mGeomCount; - mLastGeomIndex = mGeomIndex; - mLastIndicesCount = mIndicesCount; - mLastIndicesIndex = mIndicesIndex; return TRUE; } @@ -2233,7 +2445,6 @@ void LLFace::setVertexBuffer(LLVertexBuffer* buffer) void LLFace::clearVertexBuffer() { mVertexBuffer = NULL; - mLastVertexBuffer = NULL; } //static diff --git a/indra/newview/llface.h b/indra/newview/llface.h index f6d514760..5513ecd41 100644 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -88,6 +88,8 @@ public: static void initClass(); + static void cacheFaceInVRAM(const LLVolumeFace& vf); + public: LLFace(LLDrawable* drawablep, LLViewerObject* objp) { init(drawablep, objp); } ~LLFace() { destroy(); } @@ -245,7 +247,6 @@ public: private: LLPointer mVertexBuffer; - LLPointer mLastVertexBuffer; U32 mState; LLFacePool* mDrawPoolp; @@ -259,12 +260,6 @@ private: U32 mIndicesIndex; // index into draw pool for indices (yeah, I know!) S32 mIndexInTex ; - //previous rebuild's geometry info - U16 mLastGeomCount; - U16 mLastGeomIndex; - U32 mLastIndicesCount; - U32 mLastIndicesIndex; - LLXformMatrix* mXform; LLPointer mTexture; LLPointer mDrawablep; 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/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp index 32a533570..11edb6071 100644 --- a/indra/newview/llflexibleobject.cpp +++ b/indra/newview/llflexibleobject.cpp @@ -368,7 +368,7 @@ void LLVolumeImplFlexible::doFlexibleUpdate() LLPath *path = &volume->getPath(); if ((mSimulateRes == 0 || !mInitialized) && mVO->mDrawable->isVisible()) { - mVO->markForUpdate(TRUE); + //mVO->markForUpdate(TRUE); if (!doIdleUpdate(gAgent, *LLWorld::getInstance(), 0.0)) { return; // we did not get updated or initialized, proceeding without can be dangerous @@ -729,7 +729,11 @@ BOOL LLVolumeImplFlexible::doUpdateGeometry(LLDrawable *drawable) else if (!mUpdated || rotated) { volume->mDrawable->setState(LLDrawable::REBUILD_POSITION); - volume->dirtyMesh(); + LLSpatialGroup* group = volume->mDrawable->getSpatialGroup(); + if (group) + { + group->dirtyMesh(); + } volume->genBBoxes(isVolumeGlobal()); } @@ -814,15 +818,17 @@ LLQuaternion LLVolumeImplFlexible::getEndRotation() }//------------------------------------------------------------------ -void LLVolumeImplFlexible::updateRelativeXform() +void LLVolumeImplFlexible::updateRelativeXform(bool force_identity) { LLQuaternion delta_rot; LLVector3 delta_pos, delta_scale; LLVOVolume* vo = (LLVOVolume*) mVO; + bool use_identity = vo->mDrawable->isSpatialRoot() || force_identity; + //matrix from local space to parent relative/global space - delta_rot = vo->mDrawable->isSpatialRoot() ? LLQuaternion() : vo->mDrawable->getRotation(); - delta_pos = vo->mDrawable->isSpatialRoot() ? LLVector3(0,0,0) : vo->mDrawable->getPosition(); + delta_rot = use_identity ? LLQuaternion() : vo->mDrawable->getRotation(); + delta_pos = use_identity ? LLVector3(0,0,0) : vo->mDrawable->getPosition(); delta_scale = LLVector3(1,1,1); // Vertex transform (4x4) diff --git a/indra/newview/llflexibleobject.h b/indra/newview/llflexibleobject.h index bdfbded82..faed3801b 100644 --- a/indra/newview/llflexibleobject.h +++ b/indra/newview/llflexibleobject.h @@ -95,7 +95,7 @@ class LLVolumeImplFlexible : public LLVolumeInterface bool isVolumeGlobal() const { return true; } bool isActive() const { return true; } const LLMatrix4& getWorldMatrix(LLXformMatrix* xform) const; - void updateRelativeXform(); + void updateRelativeXform(bool force_identity); void doFlexibleUpdate(); // Called to update the simulation void doFlexibleRebuild(); // Called to rebuild the geometry void preRebuild(); 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/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/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp index 5991cba8e..c89c414b5 100644 --- a/indra/newview/llgroupmgr.cpp +++ b/indra/newview/llgroupmgr.cpp @@ -1178,7 +1178,7 @@ void LLGroupMgr::processGroupRoleDataReply(LLMessageSystem* msg, void** data) group_datap->mChanged = TRUE; #if SHY_MOD //Group title script access - gGroupRoleChanger.CheckUpdateRole(group_id,group_data->mRoles); + gGroupRoleChanger.CheckUpdateRole(group_id,group_datap->mRoles); #endif //shy_mod LLGroupMgr::getInstance()->notifyObservers(GC_ROLE_DATA); } 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/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 2aa836a7b..8fcbb600e 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -5583,7 +5583,7 @@ LLUIImagePtr LLWearableBridge::getIcon() const return LLInventoryIcon::getIcon(mAssetType, mInvType, mWearableType, FALSE); } -//LLAppearanceMgr::moveWearable unfortunately fails for non-link item, so links in CoF must be found for this to work. +//LLAppearanceMgr::moveWearable unfortunately fails for non-link items, so links in CoF must be found for this to work. void move_wearable_item(LLViewerInventoryItem* item, bool closer_to_body) { if(!item) diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index 828ad5689..42a4f5c46 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -424,7 +424,7 @@ void LLInventoryFilter::setFilterSubString(const std::string& string) if (mFilterOps.mFilterTypes == FILTERTYPE_UUID) { mFilterOps.mFilterTypes &= ~FILTERTYPE_UUID; - mFilterOps.mFilterUUID == LLUUID::null; + //mFilterOps.mFilterUUID == LLUUID::null; setModified(FILTER_RESTART); } @@ -519,8 +519,8 @@ void LLInventoryFilter::setHoursAgo(U32 hours) bool is_increasing_from_zero = is_increasing && !mFilterOps.mHoursAgo; // *NOTE: need to cache last filter time, in case filter goes stale - BOOL less_restrictive = (are_date_limits_valid && ((is_increasing && mFilterOps.mHoursAgo)) || !hours); - BOOL more_restrictive = (are_date_limits_valid && (!is_increasing && hours) || is_increasing_from_zero); + BOOL less_restrictive = ((are_date_limits_valid && ((is_increasing && mFilterOps.mHoursAgo))) || !hours); + BOOL more_restrictive = ((are_date_limits_valid && (!is_increasing && hours)) || is_increasing_from_zero); mFilterOps.mHoursAgo = hours; mFilterOps.mMinDate = time_min(); 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/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp index 488ba2e3f..b6feb554a 100644 --- a/indra/newview/llmaniptranslate.cpp +++ b/indra/newview/llmaniptranslate.cpp @@ -1598,7 +1598,11 @@ void LLManipTranslate::renderSnapGuides() LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, GL_GREATER); LLGLEnable stipple(GL_LINE_STIPPLE); gGL.flush(); - glLineStipple(1, 0x3333); + + if (!LLGLSLShader::sNoFixedFunction) + { + glLineStipple(1, 0x3333); + } switch (mManipPart) { @@ -1712,16 +1716,20 @@ void LLManipTranslate::highlightIntersection(LLVector3 normal, gClipProgram.uniform4fv("clip_plane", 1, plane.v); BOOL particles = gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_PARTICLES); +#if ENABLE_CLASSIC_CLOUDS BOOL clouds = gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS); +#endif if (particles) { LLPipeline::toggleRenderType(LLPipeline::RENDER_TYPE_PARTICLES); } +#if ENABLE_CLASSIC_CLOUDS if (clouds) { LLPipeline::toggleRenderType(LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS); } +#endif //stencil in volumes glStencilOp(GL_INCR, GL_INCR, GL_INCR); @@ -1742,10 +1750,12 @@ void LLManipTranslate::highlightIntersection(LLVector3 normal, { LLPipeline::toggleRenderType(LLPipeline::RENDER_TYPE_PARTICLES); } +#if ENABLE_CLASSIC_CLOUDS if (clouds) { LLPipeline::toggleRenderType(LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS); } +#endif gGL.setColorMask(true, false); } 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/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/llpaneldisplay.cpp b/indra/newview/llpaneldisplay.cpp index 8e1245ed9..aaf304236 100644 --- a/indra/newview/llpaneldisplay.cpp +++ b/indra/newview/llpaneldisplay.cpp @@ -265,8 +265,12 @@ BOOL LLPanelDisplay::postBuild() mCtrlNonImpostors = getChild("AvatarMaxVisible"); //---------------------------------------------------------------------------- - // radio set for lighting detail - mRadioLightingDetail2 = getChild("LightingDetailRadio"); + // Checkbox for lighting detail + mCtrlLightingDetail2 = getChild("LightingDetailRadio"); + + //---------------------------------------------------------------------------- + // Checkbox for ambient occlusion + mCtrlAmbientOcc = getChild("UseSSAO"); //---------------------------------------------------------------------------- // radio set for terrain detail mode @@ -465,6 +469,7 @@ void LLPanelDisplay::refreshEnabledState() mCtrlAutoDetectAspect->setVisible(isFullScreen); mFullScreenInfo->setVisible(!isFullScreen); mWindowSizeLabel->setVisible(!isFullScreen); + mCtrlWindowSize->setVisible(!isFullScreen); // disable graphics settings and exit if it's not set to custom if(!gSavedSettings.getBOOL("RenderCustomSettings")) @@ -515,7 +520,8 @@ void LLPanelDisplay::refreshEnabledState() mCtrlDeferred->setEnabled(can_defer); mCtrlShadowDetail->setEnabled(can_defer && gSavedSettings.getBOOL("RenderDeferred")); - mCtrlDeferredDoF->setEnabled(can_defer && gSavedSettings.getBOOL("RenderDeferred")); + mCtrlAmbientOcc->setEnabled(can_defer && gSavedSettings.getBOOL("RenderDeferred")); + mCtrlDeferredDoF->setEnabled(can_defer && gSavedSettings.getBOOL("RenderDeferred")); // Disable max non-impostors slider if avatar impostors are off mCtrlNonImpostors->setEnabled(gSavedSettings.getBOOL("RenderUseImpostors")); @@ -578,6 +584,8 @@ void LLPanelDisplay::disableUnavailableSettings() mCtrlDeferred->setEnabled(FALSE); mCtrlDeferred->setValue(FALSE); + mCtrlAmbientOcc->setEnabled(FALSE); + mCtrlAmbientOcc->setValue(FALSE); mCtrlDeferredDoF->setEnabled(FALSE); mCtrlDeferredDoF->setValue(FALSE); mCtrlShadowDetail->setEnabled(FALSE); @@ -625,6 +633,8 @@ void LLPanelDisplay::disableUnavailableSettings() { mCtrlDeferred->setEnabled(FALSE); mCtrlDeferred->setValue(FALSE); + mCtrlAmbientOcc->setEnabled(FALSE); + mCtrlAmbientOcc->setValue(FALSE); mCtrlDeferredDoF->setEnabled(FALSE); mCtrlDeferredDoF->setValue(FALSE); mCtrlShadowDetail->setEnabled(FALSE); @@ -663,7 +673,8 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden) llassert(mCtrlAvatarImpostors != NULL); llassert(mCtrlNonImpostors != NULL); llassert(mCtrlAvatarCloth != NULL); - llassert(mRadioLightingDetail2 != NULL); + llassert(mCtrlLightingDetail2 != NULL); + llassert(mCtrlAmbientOcc != NULL); llassert(mRadioTerrainDetail != NULL); llassert(mCtrlReflectionDetail != NULL); @@ -712,7 +723,8 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden) mCtrlAvatarImpostors->setVisible(!isHidden); mCtrlNonImpostors->setVisible(!isHidden); mCtrlAvatarCloth->setVisible(!isHidden); - mRadioLightingDetail2->setVisible(!isHidden); + mCtrlLightingDetail2->setVisible(!isHidden); + mCtrlAmbientOcc->setVisible(!isHidden); mRadioTerrainDetail->setVisible(!isHidden); mCtrlReflectionDetail->setVisible(!isHidden); diff --git a/indra/newview/llpaneldisplay.h b/indra/newview/llpaneldisplay.h index 7b1ec9004..9b601d7d1 100644 --- a/indra/newview/llpaneldisplay.h +++ b/indra/newview/llpaneldisplay.h @@ -117,7 +117,8 @@ protected: LLComboBox *mCtrlShadowDetail; LLCheckBoxCtrl *mCtrlAvatarImpostors; LLCheckBoxCtrl *mCtrlAvatarCloth; - LLRadioGroup *mRadioLightingDetail2; + LLCheckBoxCtrl *mCtrlLightingDetail2; + LLCheckBoxCtrl *mCtrlAmbientOcc; LLRadioGroup *mRadioTerrainDetail; LLTextBox *mAspectRatioLabel1; diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp index 6052bf7f3..2156a8120 100644 --- a/indra/newview/llpaneleditwearable.cpp +++ b/indra/newview/llpaneleditwearable.cpp @@ -61,6 +61,47 @@ #include "llwearablelist.h" +// subparts of the UI for focus, camera position, etc. +enum ESubpart { + SUBPART_SHAPE_HEAD = 1, // avoid 0 + SUBPART_SHAPE_EYES, + SUBPART_SHAPE_EARS, + SUBPART_SHAPE_NOSE, + SUBPART_SHAPE_MOUTH, + SUBPART_SHAPE_CHIN, + SUBPART_SHAPE_TORSO, + SUBPART_SHAPE_LEGS, + SUBPART_SHAPE_WHOLE, + SUBPART_SHAPE_DETAIL, + SUBPART_SKIN_COLOR, + SUBPART_SKIN_FACEDETAIL, + SUBPART_SKIN_MAKEUP, + SUBPART_SKIN_BODYDETAIL, + SUBPART_HAIR_COLOR, + SUBPART_HAIR_STYLE, + SUBPART_HAIR_EYEBROWS, + SUBPART_HAIR_FACIAL, + SUBPART_EYES, + SUBPART_SHIRT, + SUBPART_PANTS, + SUBPART_SHOES, + SUBPART_SOCKS, + SUBPART_JACKET, + SUBPART_GLOVES, + SUBPART_UNDERSHIRT, + SUBPART_UNDERPANTS, + SUBPART_SKIRT, + SUBPART_ALPHA, + SUBPART_TATTOO, + SUBPART_PHYSICS_BREASTS_UPDOWN, + SUBPART_PHYSICS_BREASTS_INOUT, + SUBPART_PHYSICS_BREASTS_LEFTRIGHT, + SUBPART_PHYSICS_BELLY_UPDOWN, + SUBPART_PHYSICS_BUTT_UPDOWN, + SUBPART_PHYSICS_BUTT_LEFTRIGHT, + SUBPART_PHYSICS_ADVANCED, + }; + using namespace LLVOAvatarDefines; typedef std::vector subpart_vec_t; @@ -696,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 @@ -934,7 +975,7 @@ void LLPanelEditWearable::setWearableIndex(S32 index) } - const LLEditWearableDictionary::SubpartEntry *subpart_entry = LLEditWearableDictionary::getInstance()->getSubpart(mCurrentSubpart); + const LLEditWearableDictionary::SubpartEntry *subpart_entry = LLEditWearableDictionary::getInstance()->getSubpart((ESubpart)mCurrentSubpart); if(subpart_entry) { value_map_t sorted_params; diff --git a/indra/newview/llpaneleditwearable.h b/indra/newview/llpaneleditwearable.h index 4d80ac262..d1877ecaf 100644 --- a/indra/newview/llpaneleditwearable.h +++ b/indra/newview/llpaneleditwearable.h @@ -47,47 +47,6 @@ class LLLineEditor; class LLSubpart; class LLWearableSaveAsDialog; -// subparts of the UI for focus, camera position, etc. -enum ESubpart { - SUBPART_SHAPE_HEAD = 1, // avoid 0 - SUBPART_SHAPE_EYES, - SUBPART_SHAPE_EARS, - SUBPART_SHAPE_NOSE, - SUBPART_SHAPE_MOUTH, - SUBPART_SHAPE_CHIN, - SUBPART_SHAPE_TORSO, - SUBPART_SHAPE_LEGS, - SUBPART_SHAPE_WHOLE, - SUBPART_SHAPE_DETAIL, - SUBPART_SKIN_COLOR, - SUBPART_SKIN_FACEDETAIL, - SUBPART_SKIN_MAKEUP, - SUBPART_SKIN_BODYDETAIL, - SUBPART_HAIR_COLOR, - SUBPART_HAIR_STYLE, - SUBPART_HAIR_EYEBROWS, - SUBPART_HAIR_FACIAL, - SUBPART_EYES, - SUBPART_SHIRT, - SUBPART_PANTS, - SUBPART_SHOES, - SUBPART_SOCKS, - SUBPART_JACKET, - SUBPART_GLOVES, - SUBPART_UNDERSHIRT, - SUBPART_UNDERPANTS, - SUBPART_SKIRT, - SUBPART_ALPHA, - SUBPART_TATTOO, - SUBPART_PHYSICS_BREASTS_UPDOWN, - SUBPART_PHYSICS_BREASTS_INOUT, - SUBPART_PHYSICS_BREASTS_LEFTRIGHT, - SUBPART_PHYSICS_BELLY_UPDOWN, - SUBPART_PHYSICS_BUTT_UPDOWN, - SUBPART_PHYSICS_BUTT_LEFTRIGHT, - SUBPART_PHYSICS_ADVANCED, - }; - using namespace LLVOAvatarDefines; class LLPanelEditWearable : public LLPanel @@ -168,7 +127,7 @@ private: typedef std::map s32_uuid_map_t; s32_uuid_map_t mPreviousAlphaTexture; - ESubpart mCurrentSubpart; + U32 mCurrentSubpart; U32 mCurrentIndex; LLWearable* mCurrentWearable; LLWearable* mPendingWearable; //For SaveAs. There's a period where the old wearable will be removed, but the new one will still be pending, 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/llpanellandmedia.cpp b/indra/newview/llpanellandmedia.cpp index 417d14897..e49e849a0 100644 --- a/indra/newview/llpanellandmedia.cpp +++ b/indra/newview/llpanellandmedia.cpp @@ -120,31 +120,12 @@ BOOL LLPanelLandMedia::postBuild() childSetCommitCallback("media_size_height", onCommitAny, this); mMediaSizeCtrlLabel = getChild("media_size"); - /*mMediaNavigateAllowCheck = getChild("check navigate allow"); Making Dummy View -HgB - childSetCommitCallback("check navigate allow", onCommitAny, this);*/ - mMediaURLFilterCheck = getChild("check navigate filter"); - childSetCommitCallback("check navigate filter", onCommitAny, this); - mSetURLButton = getChild("set_media_url"); childSetAction("set_media_url", onSetBtn, this); mResetURLButton = getChild("reset_media_url"); childSetAction("reset_media_url", onResetBtn, this); - mURLFilterList = getChild("filter_list"); - - mMediaURLFilterDomainEdit = getChild("navigate_filter_domain"); - - mMediaURLFilterAddButton = getChild("add_navigate_filter"); - childSetAction("add_navigate_filter", onClickAddURLFilter, this); - - mMediaURLFilterRemoveButton = getChild("remove_navigate_filter"); - childSetAction("remove_navigate_filter", onClickRemoveURLFilter, this); - - mRadioNavigateControl = getChild("radio_navigate_allow"); - childSetCommitCallback("radio_navigate_allow", onCommitAny, this); - - return TRUE; } @@ -222,43 +203,11 @@ void LLPanelLandMedia::refresh() mSetURLButton->setEnabled( can_change_media ); mResetURLButton->setEnabled( can_change_media ); - mMediaURLFilterCheck->set( parcel->getMediaURLFilterEnable() ); - mMediaURLFilterCheck->setEnabled( can_change_media ); - LLFloaterURLEntry* floater_url_entry = (LLFloaterURLEntry*)mURLEntryFloater.get(); if (floater_url_entry) { floater_url_entry->updateFromLandMediaPanel(); } - - // This radial control is really just an inverse mapping to the boolean allow_navigate value. - // It is set as a radial merely for user readability. - mRadioNavigateControl->setSelectedIndex(! parcel->getMediaAllowNavigate()); - mRadioNavigateControl->setEnabled( can_change_media ); - - mMediaURLFilterDomainEdit->setEnabled( can_change_media ); - mMediaURLFilterAddButton->setEnabled( can_change_media ); - mMediaURLFilterRemoveButton->setEnabled( can_change_media ); - - if (mURLFilterList) - { - mURLFilterList->setEnabled( can_change_media ); - - mURLFilterList->deleteAllItems(); - - LLSD list = parcel->getMediaURLFilterList(); - - for (LLSD::array_iterator i = list.beginArray(); i != list.endArray(); ++i) - { - std::string domain = (*i).asString(); - - LLSD element; - element["id"] = domain; - element["columns"][0]["value"] = domain; - - mURLFilterList->addElement(element); - } - } } } @@ -281,8 +230,7 @@ void LLPanelLandMedia::populateMIMECombo() mMediaTypeCombo->add(info.mLabel, mime_type); } } - // *TODO: The sort order is based on std::map key, which is - // ASCII-sorted and is wrong in other languages. TRANSLATE + mMediaTypeCombo->add( default_label, default_mime_type, ADD_BOTTOM ); } @@ -341,17 +289,15 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl*, void *userdata) } // Extract data from UI - std::string media_url = self->mMediaURLEdit->getText(); - std::string media_desc = self->mMediaDescEdit->getText(); - std::string mime_type = self->childGetText("mime_type"); + std::string media_url = self->mMediaURLEdit->getText(); + std::string media_desc = self->mMediaDescEdit->getText(); + std::string mime_type = self->childGetText("mime_type"); U8 media_auto_scale = self->mMediaAutoScaleCheck->get(); - U8 media_loop = self->mMediaLoopCheck->get(); - F32 media_reset_time = (F32)self->mMediaResetCtrl->get(); + U8 media_loop = self->mMediaLoopCheck->get(); + F32 media_reset_time = (F32)self->mMediaResetCtrl->get(); S32 media_width = (S32)self->mMediaWidthCtrl->get(); S32 media_height = (S32)self->mMediaHeightCtrl->get(); LLUUID media_id = self->mMediaTextureCtrl->getImageAssetID(); - U8 navigate_allow = ! self->mRadioNavigateControl->getSelectedIndex(); - U8 navigate_filter = self->mMediaURLFilterCheck->get(); self->childSetText("mime_type", mime_type); @@ -368,8 +314,6 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl*, void *userdata) parcel->setMediaID(media_id); parcel->setMediaAutoScale ( media_auto_scale ); parcel->setMediaLoop ( media_loop ); - parcel->setMediaURLFilterEnable(navigate_filter); - parcel->setMediaAllowNavigate(navigate_allow); parcel->setMediaURLTimeout(media_reset_time); @@ -402,79 +346,3 @@ void LLPanelLandMedia::onResetBtn(void *userdata) // LLViewerParcelMedia::sendMediaNavigateMessage(parcel->getMediaURL()); } -// static -void LLPanelLandMedia::onClickAddURLFilter(void *userdata) -{ - LLPanelLandMedia *panelp = (LLPanelLandMedia *)userdata; - LLParcel* parcel = panelp->mParcel->getParcel(); - - LLSD list = parcel->getMediaURLFilterList(); - - std::string domain = panelp->mMediaURLFilterDomainEdit->getText(); - LLStringUtil::trim(domain); - - BOOL add = TRUE; - if (domain == "") - { - add = FALSE; - } - - // check for dupes - for(S32 i = 0; i < list.size(); i++) - { - if (list[i].asString() == domain) - { - add = FALSE; - break; - } - } - - if (add) - { - list.append(domain); - parcel->setMediaURLFilterList(list); - - LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel ); - - panelp->mMediaURLFilterDomainEdit->setText(std::string("")); - - panelp->refresh(); - } - -} - -// static -void LLPanelLandMedia::onClickRemoveURLFilter(void *data) -{ - LLPanelLandMedia* panelp = (LLPanelLandMedia*)data; - if (panelp && panelp->mURLFilterList) - { - LLParcel* parcel = panelp->mParcel->getParcel(); - if (parcel) - { - LLSD list = parcel->getMediaURLFilterList(); - - std::vector domains = panelp->mURLFilterList->getAllSelected(); - for (std::vector::iterator iter = domains.begin(); iter != domains.end(); iter++) - { - LLScrollListItem* item = *iter; - const std::string domain = item->getValue().asString(); - - for(S32 i = 0; i < list.size(); i++) - { - if (list[i].asString() == domain) - { - list.erase(i); - break; - } - } - } - - parcel->setMediaURLFilterList(list); - LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel ); - - panelp->refresh(); - } - } - -} diff --git a/indra/newview/llpanellandmedia.h b/indra/newview/llpanellandmedia.h index c883d9801..6f9d9bb54 100644 --- a/indra/newview/llpanellandmedia.h +++ b/indra/newview/llpanellandmedia.h @@ -57,8 +57,6 @@ private: static void onCommitType(LLUICtrl* ctrl, void *userdata); static void onSetBtn(void* userdata); static void onResetBtn(void* userdata); - static void onClickAddURLFilter(void *userdata); - static void onClickRemoveURLFilter(void *userdata); private: LLLineEditor* mMediaURLEdit; @@ -76,15 +74,6 @@ private: LLCheckBoxCtrl* mMediaLoopCheck; LLCheckBoxCtrl* mMediaUrlCheck; LLHandle mURLEntryFloater; - LLCheckBoxCtrl* mMediaNavigateAllowCheck; - LLCheckBoxCtrl* mMediaURLFilterCheck; - LLLineEditor* mMediaURLFilterDomainEdit; - LLButton* mMediaURLFilterAddButton; - LLButton* mMediaURLFilterRemoveButton; - LLScrollListCtrl* mURLFilterList; - LLRadioGroup* mRadioNavigateControl; - - LLSafeHandle& mParcel; }; 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/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 7843a9e97..fc78ecae6 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -478,10 +478,10 @@ void LLPanelObject::getState( ) } // can move or rotate only linked group with move permissions, or sub-object with move and modify perms - BOOL enable_move = objectp->permMove() && (!objectp->isAttachment() && objectp->permModify() || !gSavedSettings.getBOOL("EditLinkedParts")); + BOOL enable_move = objectp->permMove() && ((!objectp->isAttachment() && objectp->permModify()) || !gSavedSettings.getBOOL("EditLinkedParts")); BOOL enable_scale = objectp->permMove() && objectp->permModify(); - BOOL enable_rotate = objectp->permMove() && ( (objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts")); - BOOL enable_link = objectp->permMove() && !objectp->isAttachment() && (objectp->permModify() || !gSavedSettings.getBOOL("EditLinkedParts")); + BOOL enable_rotate = objectp->permMove() && ((objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts")); + BOOL enable_link = objectp->permMove() && ((!objectp->isAttachment() && objectp->permModify()) || !gSavedSettings.getBOOL("EditLinkedParts")); childSetEnabled("build_math_constants",true); S32 selected_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount(); BOOL single_volume = (LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME )) diff --git a/indra/newview/llpreviewsound.cpp b/indra/newview/llpreviewsound.cpp index c88cc1cc6..e1832477a 100644 --- a/indra/newview/llpreviewsound.cpp +++ b/indra/newview/llpreviewsound.cpp @@ -146,7 +146,7 @@ void LLPreviewSound::playAmbient( void* userdata ) if(item && gAudiop) { - int gain = 0.01f; + F32 gain = 0.01f; for(int i = 0; i < 2; i++) { gMessageSystem->newMessageFast(_PREHASH_SoundTrigger); 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/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index f4cde0074..5cce8fd34 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -90,12 +90,32 @@ static F32 sCurMaxTexPriority = 1.f; class LLOcclusionQueryPool : public LLGLNamePool { +public: + LLOcclusionQueryPool() + { + mCurQuery = 1; + } + protected: + + std::list mAvailableName; + GLuint mCurQuery; + virtual GLuint allocateName() { - GLuint name; - glGenQueriesARB(1, &name); - return name; + GLuint ret = 0; + + if (!mAvailableName.empty()) + { + ret = mAvailableName.front(); + mAvailableName.pop_front(); + } + else + { + ret = mCurQuery++; + } + + return ret; } virtual void releaseName(GLuint name) @@ -103,7 +123,8 @@ protected: #if LL_TRACK_PENDING_OCCLUSION_QUERIES LLSpatialGroup::sPendingQueries.erase(name); #endif - glDeleteQueriesARB(1, &name); + llassert(std::find(mAvailableName.begin(), mAvailableName.end(), name) == mAvailableName.end()); + mAvailableName.push_back(name); } }; @@ -265,78 +286,40 @@ U8* get_box_fan_indices_ptr(LLCamera* camera, const LLVector4a& center) return (U8*) (sOcclusionIndices+cypher*8); } - -static LLFastTimer::DeclareTimer FTM_BUILD_OCCLUSION("Build Occlusion"); -void LLSpatialGroup::buildOcclusion() + +//create a vertex buffer for efficiently rendering cubes +LLVertexBuffer* ll_create_cube_vb(U32 type_mask, U32 usage) { - //if (mOcclusionVerts.isNull()) - { - mOcclusionVerts = new LLVertexBuffer(LLVertexBuffer::MAP_VERTEX, - LLVertexBuffer::sUseStreamDraw ? mBufferUsage : 0); //if GL has a hard time with VBOs, don't use them for occlusion culling. - mOcclusionVerts->allocateBuffer(8, 64, true); - - LLStrider idx; - mOcclusionVerts->getIndexStrider(idx); - for (U32 i = 0; i < 64; i++) - { - *idx++ = sOcclusionIndices[i]; - } - } + LLVertexBuffer* ret = new LLVertexBuffer(type_mask, usage); - LLVector4a fudge; - fudge.splat(SG_OCCLUSION_FUDGE); - - LLVector4a r; - r.setAdd(mBounds[1], fudge); + ret->allocateBuffer(8, 64, true); LLStrider pos; - + LLStrider idx; + + ret->getVertexStrider(pos); + ret->getIndexStrider(idx); + + pos[0] = LLVector3(-1,-1,-1); + pos[1] = LLVector3(-1,-1, 1); + pos[2] = LLVector3(-1, 1,-1); + pos[3] = LLVector3(-1, 1, 1); + pos[4] = LLVector3( 1,-1,-1); + pos[5] = LLVector3( 1,-1, 1); + pos[6] = LLVector3( 1, 1,-1); + pos[7] = LLVector3( 1, 1, 1); + + for (U32 i = 0; i < 64; i++) { - LLFastTimer t(FTM_BUILD_OCCLUSION); - mOcclusionVerts->getVertexStrider(pos); + idx[i] = sOcclusionIndices[i]; } - { - LLVector4a* v = (LLVector4a*) pos.get(); + ret->flush(); - const LLVector4a& c = mBounds[0]; - const LLVector4a& s = r; - - static const LLVector4a octant[] = - { - LLVector4a(-1.f, -1.f, -1.f), - LLVector4a(-1.f, -1.f, 1.f), - LLVector4a(-1.f, 1.f, -1.f), - LLVector4a(-1.f, 1.f, 1.f), - - LLVector4a(1.f, -1.f, -1.f), - LLVector4a(1.f, -1.f, 1.f), - LLVector4a(1.f, 1.f, -1.f), - LLVector4a(1.f, 1.f, 1.f), - }; - - //vertex positions are encoded so the 3 bits of their vertex index - //correspond to their axis facing, with bit position 3,2,1 matching - //axis facing x,y,z, bit set meaning positive facing, bit clear - //meaning negative facing - - for (S32 i = 0; i < 8; ++i) - { - LLVector4a p; - p.setMul(s, octant[i]); - p.add(c); - v[i] = p; - } - } - - { - mOcclusionVerts->flush(); - LLVertexBuffer::unbind(); - } - - clearState(LLSpatialGroup::OCCLUSION_DIRTY); + return ret; } +static LLFastTimer::DeclareTimer FTM_BUILD_OCCLUSION("Build Occlusion"); BOOL earlyFail(LLCamera* camera, LLSpatialGroup* group); @@ -398,8 +381,6 @@ LLSpatialGroup::~LLSpatialGroup() } } - mOcclusionVerts = NULL; - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); clearDrawMap(); } @@ -568,6 +549,11 @@ void LLSpatialGroup::rebuildGeom() if (!isDead()) { mSpatialPartition->rebuildGeom(this); + + if (isState(LLSpatialGroup::MESH_DIRTY)) + { + gPipeline.markMeshDirty(this); + } } } @@ -580,20 +566,14 @@ void LLSpatialGroup::rebuildMesh() } static LLFastTimer::DeclareTimer FTM_REBUILD_VBO("VBO Rebuilt"); +static LLFastTimer::DeclareTimer FTM_ADD_GEOMETRY_COUNT("Add Geometry"); +static LLFastTimer::DeclareTimer FTM_CREATE_VB("Create VB"); +static LLFastTimer::DeclareTimer FTM_GET_GEOMETRY("Get Geometry"); void LLSpatialPartition::rebuildGeom(LLSpatialGroup* group) { - /*if (!gPipeline.hasRenderType(mDrawableType)) - { - return; - }*/ - if (group->isDead() || !group->isState(LLSpatialGroup::GEOM_DIRTY)) { - /*if (!group->isState(LLSpatialGroup::GEOM_DIRTY) && mRenderByGroup) - { - llerrs << "WTF?" << llendl; - }*/ return; } @@ -610,27 +590,36 @@ void LLSpatialPartition::rebuildGeom(LLSpatialGroup* group) //get geometry count U32 index_count = 0; U32 vertex_count = 0; - - addGeometryCount(group, vertex_count, index_count); + + { + LLFastTimer t(FTM_ADD_GEOMETRY_COUNT); + addGeometryCount(group, vertex_count, index_count); + } if (vertex_count > 0 && index_count > 0) { //create vertex buffer containing volume geometry for this node - group->mBuilt = 1.f; - if (group->mVertexBuffer.isNull() || - !group->mVertexBuffer->isWriteable() || - (group->mBufferUsage != group->mVertexBuffer->getUsage() && LLVertexBuffer::sEnableVBOs)) { - group->mVertexBuffer = createVertexBuffer(mVertexDataMask, group->mBufferUsage); - group->mVertexBuffer->allocateBuffer(vertex_count, index_count, true); - stop_glerror(); + LLFastTimer t(FTM_CREATE_VB); + group->mBuilt = 1.f; + if (group->mVertexBuffer.isNull() || + !group->mVertexBuffer->isWriteable() || + (group->mBufferUsage != group->mVertexBuffer->getUsage() && LLVertexBuffer::sEnableVBOs)) + { + group->mVertexBuffer = createVertexBuffer(mVertexDataMask, group->mBufferUsage); + group->mVertexBuffer->allocateBuffer(vertex_count, index_count, true); + stop_glerror(); + } + else + { + group->mVertexBuffer->resizeBuffer(vertex_count, index_count); + stop_glerror(); + } } - else + { - group->mVertexBuffer->resizeBuffer(vertex_count, index_count); - stop_glerror(); + LLFastTimer t(FTM_GET_GEOMETRY); + getGeometry(group); } - - getGeometry(group); } else { @@ -821,11 +810,6 @@ void LLSpatialGroup::shift(const LLVector4a &offset) setState(GEOM_DIRTY); gPipeline.markRebuild(this, TRUE); } - - if (mOcclusionVerts.notNull()) - { - setState(OCCLUSION_DIRTY); - } } class LLSpatialSetState : public LLSpatialGroup::OctreeTraveler @@ -1122,8 +1106,6 @@ LLSpatialGroup::LLSpatialGroup(OctreeNode* node, LLSpatialPartition* part) : mVisible[i] = 0; } - mOcclusionVerts = NULL; - mRadius = 1; mPixelArea = 1024.f; } @@ -1353,10 +1335,14 @@ void LLSpatialGroup::handleChildRemoval(const OctreeNode* parent, const OctreeNo unbound(); } -void LLSpatialGroup::destroyGL() +void LLSpatialGroup::destroyGL(bool keep_occlusion) { setState(LLSpatialGroup::GEOM_DIRTY | LLSpatialGroup::IMAGE_DIRTY); - gPipeline.markRebuild(this, TRUE); + + if (!keep_occlusion) + { //going to need a rebuild + gPipeline.markRebuild(this, TRUE); + } mLastUpdateTime = gFrameTimeSeconds; mVertexBuffer = NULL; @@ -1364,16 +1350,18 @@ void LLSpatialGroup::destroyGL() clearDrawMap(); - for (U32 i = 0; i < LLViewerCamera::NUM_CAMERAS; i++) + if (!keep_occlusion) { - if (mOcclusionQuery[i]) + for (U32 i = 0; i < LLViewerCamera::NUM_CAMERAS; i++) { - sQueryPool.release(mOcclusionQuery[i]); - mOcclusionQuery[i] = 0; + if (mOcclusionQuery[i]) + { + sQueryPool.release(mOcclusionQuery[i]); + mOcclusionQuery[i] = 0; + } } } - mOcclusionVerts = NULL; for (LLSpatialGroup::element_iter i = getData().begin(); i != getData().end(); ++i) { @@ -1381,7 +1369,10 @@ void LLSpatialGroup::destroyGL() for (S32 j = 0; j < drawable->getNumFaces(); j++) { LLFace* facep = drawable->getFace(j); - facep->clearVertexBuffer(); + if (facep) + { + facep->clearVertexBuffer(); + } } } } @@ -1444,15 +1435,14 @@ BOOL LLSpatialGroup::rebound() mBounds[1].mul(0.5f); } - setState(OCCLUSION_DIRTY); - clearState(DIRTY); return TRUE; } static LLFastTimer::DeclareTimer FTM_OCCLUSION_READBACK("Readback Occlusion"); -static LLFastTimer::DeclareTimer FTM_OCCLUSION_WAIT("Wait"); +static LLFastTimer::DeclareTimer FTM_OCCLUSION_WAIT("Occlusion Wait"); + void LLSpatialGroup::checkOcclusion() { if (LLPipeline::sUseOcclusion > 1) @@ -1471,7 +1461,9 @@ void LLSpatialGroup::checkOcclusion() { glGetQueryObjectuivARB(mOcclusionQuery[LLViewerCamera::sCurCameraID], GL_QUERY_RESULT_AVAILABLE_ARB, &available); - if (mOcclusionIssued[LLViewerCamera::sCurCameraID] < gFrameCount) + static LLCachedControl wait_for_query("RenderSynchronousOcclusion", true); + + if (wait_for_query && mOcclusionIssued[LLViewerCamera::sCurCameraID] < gFrameCount) { //query was issued last frame, wait until it's available S32 max_loop = 1024; LLFastTimer t(FTM_OCCLUSION_WAIT); @@ -1580,12 +1572,6 @@ void LLSpatialGroup::doOcclusion(LLCamera* camera) mOcclusionQuery[LLViewerCamera::sCurCameraID] = sQueryPool.allocate(); } - if (mOcclusionVerts.isNull() || isState(LLSpatialGroup::OCCLUSION_DIRTY)) - { - LLFastTimer t(FTM_OCCLUSION_BUILD); - buildOcclusion(); - } - // Depth clamp all water to avoid it being culled as a result of being // behind the far clip plane, and in the case of edge water to avoid // it being culled while still visible. @@ -1616,10 +1602,13 @@ void LLSpatialGroup::doOcclusion(LLCamera* camera) glBeginQueryARB(mode, mOcclusionQuery[LLViewerCamera::sCurCameraID]); } - { - LLFastTimer t(FTM_OCCLUSION_SET_BUFFER); - mOcclusionVerts->setBuffer(LLVertexBuffer::MAP_VERTEX); - } + LLGLSLShader* shader = LLGLSLShader::sCurBoundShaderPtr; + llassert(shader); + + shader->uniform3fv(LLShaderMgr::BOX_CENTER, 1, mBounds[0].getF32ptr()); + shader->uniform3f(LLShaderMgr::BOX_SIZE, mBounds[1][0]+SG_OCCLUSION_FUDGE, + mBounds[1][1]+SG_OCCLUSION_FUDGE, + mBounds[1][2]+SG_OCCLUSION_FUDGE); if (!use_depth_clamp && mSpatialPartition->mDrawableType == LLDrawPool::POOL_VOIDWATER) { @@ -1628,12 +1617,12 @@ void LLSpatialGroup::doOcclusion(LLCamera* camera) LLGLSquashToFarClip squash(glh_get_current_projection(), 1); if (camera->getOrigin().isExactlyZero()) { //origin is invalid, draw entire box - mOcclusionVerts->drawRange(LLRender::TRIANGLE_FAN, 0, 7, 8, 0); - mOcclusionVerts->drawRange(LLRender::TRIANGLE_FAN, 0, 7, 8, b111*8); + gPipeline.mCubeVB->drawRange(LLRender::TRIANGLE_FAN, 0, 7, 8, 0); + gPipeline.mCubeVB->drawRange(LLRender::TRIANGLE_FAN, 0, 7, 8, b111*8); } else { - mOcclusionVerts->drawRange(LLRender::TRIANGLE_FAN, 0, 7, 8, get_box_fan_indices(camera, mBounds[0])); + gPipeline.mCubeVB->drawRange(LLRender::TRIANGLE_FAN, 0, 7, 8, get_box_fan_indices(camera, mBounds[0])); } } else @@ -1641,12 +1630,12 @@ void LLSpatialGroup::doOcclusion(LLCamera* camera) LLFastTimer t(FTM_OCCLUSION_DRAW); if (camera->getOrigin().isExactlyZero()) { //origin is invalid, draw entire box - mOcclusionVerts->drawRange(LLRender::TRIANGLE_FAN, 0, 7, 8, 0); - mOcclusionVerts->drawRange(LLRender::TRIANGLE_FAN, 0, 7, 8, b111*8); + gPipeline.mCubeVB->drawRange(LLRender::TRIANGLE_FAN, 0, 7, 8, 0); + gPipeline.mCubeVB->drawRange(LLRender::TRIANGLE_FAN, 0, 7, 8, b111*8); } else { - mOcclusionVerts->drawRange(LLRender::TRIANGLE_FAN, 0, 7, 8, get_box_fan_indices(camera, mBounds[0])); + gPipeline.mCubeVB->drawRange(LLRender::TRIANGLE_FAN, 0, 7, 8, get_box_fan_indices(camera, mBounds[0])); } } @@ -2372,18 +2361,21 @@ void pushVerts(LLSpatialGroup* group, U32 mask) void pushVerts(LLFace* face, U32 mask) { - llassert(face->verify()); - - LLVertexBuffer* buffer = face->getVertexBuffer(); - - if (buffer && (face->getGeomCount() >= 3)) + if (face) { - buffer->setBuffer(mask); - U16 start = face->getGeomStart(); - U16 end = start + face->getGeomCount()-1; - U32 count = face->getIndicesCount(); - U16 offset = face->getIndicesStart(); - buffer->drawRange(LLRender::TRIANGLES, start, end, count, offset); + llassert(face->verify()); + + LLVertexBuffer* buffer = face->getVertexBuffer(); + + if (buffer && (face->getGeomCount() >= 3)) + { + buffer->setBuffer(mask); + U16 start = face->getGeomStart(); + U16 end = start + face->getGeomCount()-1; + U32 count = face->getIndicesCount(); + U16 offset = face->getIndicesStart(); + buffer->drawRange(LLRender::TRIANGLES, start, end, count, offset); + } } } @@ -2418,7 +2410,7 @@ void pushBufferVerts(LLSpatialGroup* group, U32 mask) { if (group->mSpatialPartition->mRenderByGroup) { - if (!group->mDrawMap.empty()) + if (!group->mDrawMap.empty() && !group->mDrawMap.begin()->second.empty()) { LLDrawInfo* params = *(group->mDrawMap.begin()->second.begin()); LLRenderPass::applyModelMatrix(*params); @@ -2521,7 +2513,7 @@ void renderOctree(LLSpatialGroup* group) for (S32 j = 0; j < drawable->getNumFaces(); j++) { LLFace* face = drawable->getFace(j); - if (face->getVertexBuffer()) + if (face && face->getVertexBuffer()) { if (gFrameTimeSeconds - face->mLastUpdateTime < 0.5f) { @@ -2571,34 +2563,25 @@ void renderOctree(LLSpatialGroup* group) LLVector4a size = group->mObjectBounds[1]; size.mul(1.01f); size.add(fudge); - - { - LLGLDepthTest depth(GL_TRUE, GL_FALSE); - drawBox(group->mObjectBounds[0], fudge); - } + + //{ + // LLGLDepthTest depth(GL_TRUE, GL_FALSE); + // drawBox(group->mObjectBounds[0], fudge); + //} gGL.setSceneBlendType(LLRender::BT_ALPHA); - if (group->mBuilt <= 0.f) + //if (group->mBuilt <= 0.f) { //draw opaque outline - gGL.color4f(col.mV[0], col.mV[1], col.mV[2], 1.f); - drawBoxOutline(group->mObjectBounds[0], group->mObjectBounds[1]); + //gGL.diffuseColor4f(col.mV[0], col.mV[1], col.mV[2], 1.f); + //drawBoxOutline(group->mObjectBounds[0], group->mObjectBounds[1]); - if (group->mOctreeNode->isLeaf()) - { - gGL.diffuseColor4f(1,1,1,1); - } - else - { - gGL.diffuseColor4f(0,1,1,1); - } - + gGL.diffuseColor4f(0,1,1,1); drawBoxOutline(group->mBounds[0],group->mBounds[1]); - - + //draw bounding box for draw info - if (group->mSpatialPartition->mRenderByGroup) + /*if (group->mSpatialPartition->mRenderByGroup) { gGL.diffuseColor4f(1.0f, 0.75f, 0.25f, 0.6f); for (LLSpatialGroup::draw_map_t::iterator i = group->mDrawMap.begin(); i != group->mDrawMap.end(); ++i) @@ -2615,7 +2598,7 @@ void renderOctree(LLSpatialGroup* group) drawBoxOutline(center, size); } } - } + }*/ } // LLSpatialGroup::OctreeNode* node = group->mOctreeNode; @@ -2898,15 +2881,17 @@ void renderBoundingBox(LLDrawable* drawable, BOOL set_color = TRUE) for (S32 i = 0; i < drawable->getNumFaces(); i++) { LLFace* facep = drawable->getFace(i); + if (facep) + { + ext = facep->mExtents; - ext = facep->mExtents; - - pos.setAdd(ext[0], ext[1]); - pos.mul(0.5f); - size.setSub(ext[1], ext[0]); - size.mul(0.5f); + pos.setAdd(ext[0], ext[1]); + pos.mul(0.5f); + size.setSub(ext[1], ext[0]); + size.mul(0.5f); - drawBoxOutline(pos,size); + drawBoxOutline(pos,size); + } } //render drawable bounding box @@ -3399,18 +3384,21 @@ void renderPhysicsShapes(LLSpatialGroup* group) for (S32 i = 0; i < drawable->getNumFaces(); ++i) { LLFace* face = drawable->getFace(i); - LLVertexBuffer* buff = face->getVertexBuffer(); - if (buff) + if (face) { - glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); + LLVertexBuffer* buff = face->getVertexBuffer(); + if (buff) + { + glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); - buff->setBuffer(LLVertexBuffer::MAP_VERTEX); - gGL.diffuseColor3f(0.2f, 0.5f, 0.3f); - buff->draw(LLRender::TRIANGLES, buff->getNumIndices(), 0); + buff->setBuffer(LLVertexBuffer::MAP_VERTEX); + gGL.diffuseColor3f(0.2f, 0.5f, 0.3f); + buff->draw(LLRender::TRIANGLES, buff->getNumIndices(), 0); - gGL.diffuseColor3f(0.2f, 1.f, 0.3f); - glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); - buff->draw(LLRender::TRIANGLES, buff->getNumIndices(), 0); + gGL.diffuseColor3f(0.2f, 1.f, 0.3f); + glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); + buff->draw(LLRender::TRIANGLES, buff->getNumIndices(), 0); + } } } } @@ -3434,6 +3422,7 @@ void renderTexturePriority(LLDrawable* drawable) //LLViewerTexture* imagep = facep->getTexture(); //if (imagep) + if (facep) { //F32 vsize = imagep->mMaxVirtualSize; @@ -3451,7 +3440,7 @@ void renderTexturePriority(LLDrawable* drawable) } //else //{ - // gGL.color4f(1,0,1,1); + // gGL.diffuseColor4f(1,0,1,1); //} LLVector4a center; @@ -3464,13 +3453,13 @@ void renderTexturePriority(LLDrawable* drawable) drawBox(center, size); /*S32 boost = imagep->getBoostLevel(); - if (boost) + if (boost>LLViewerTexture::BOOST_NONE) { F32 t = (F32) boost / (F32) (LLViewerTexture::BOOST_MAX_LEVEL-1); LLVector4 col = lerp(boost_cold, boost_hot, t); LLGLEnable blend_on(GL_BLEND); gGL.blendFunc(GL_SRC_ALPHA, GL_ONE); - gGL.color4fv(col.mV); + gGL.diffuseColor4fv(col.mV); drawBox(center, size); gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); }*/ @@ -3486,7 +3475,11 @@ void renderPoints(LLDrawable* drawablep) gGL.diffuseColor3f(1,1,1); for (S32 i = 0; i < drawablep->getNumFaces(); i++) { - gGL.vertex3fv(drawablep->getFace(i)->mCenterLocal.mV); + LLFace * face = drawablep->getFace(i); + if (face) + { + gGL.vertex3fv(face->mCenterLocal.mV); + } } gGL.end(); } @@ -3563,7 +3556,11 @@ void renderLights(LLDrawable* drawablep) for (S32 i = 0; i < drawablep->getNumFaces(); i++) { - pushVerts(drawablep->getFace(i), LLVertexBuffer::MAP_VERTEX); + LLFace * face = drawablep->getFace(i); + if (face) + { + pushVerts(face, LLVertexBuffer::MAP_VERTEX); + } } const LLVector4a* ext = drawablep->getSpatialExtents(); @@ -3961,18 +3958,21 @@ public: for (U32 i = 0; i < (U32)drawable->getNumFaces(); ++i) { LLFace* facep = drawable->getFace(i); - U8 index = facep->getTextureIndex(); - if (facep->mDrawInfo) + if (facep) { - if (index < 255) + U8 index = facep->getTextureIndex(); + if (facep->mDrawInfo) { - if (facep->mDrawInfo->mTextureList.size() <= index) + if (index < 255) { - llerrs << "Face texture index out of bounds." << llendl; - } - else if (facep->mDrawInfo->mTextureList[index] != facep->getTexture()) - { - llerrs << "Face texture index incorrect." << llendl; + if (facep->mDrawInfo->mTextureList.size() <= index) + { + llerrs << "Face texture index out of bounds." << llendl; + } + else if (facep->mDrawInfo->mTextureList[index] != facep->getTexture()) + { + llerrs << "Face texture index incorrect." << llendl; + } } } } diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h index 3cdf95e2c..95ba1c036 100644 --- a/indra/newview/llspatialpartition.h +++ b/indra/newview/llspatialpartition.h @@ -268,11 +268,10 @@ public: SKIP_FRUSTUM_CHECK = 0x00000020, IN_IMAGE_QUEUE = 0x00000040, IMAGE_DIRTY = 0x00000080, - OCCLUSION_DIRTY = 0x00000100, - MESH_DIRTY = 0x00000200, - NEW_DRAWINFO = 0x00000400, - IN_BUILD_Q1 = 0x00000800, - IN_BUILD_Q2 = 0x00001000, + MESH_DIRTY = 0x00000100, + NEW_DRAWINFO = 0x00000200, + IN_BUILD_Q1 = 0x00000400, + IN_BUILD_Q2 = 0x00000800, STATE_MASK = 0x0000FFFF, } eSpatialState; @@ -318,10 +317,9 @@ public: BOOL boundObjects(BOOL empty, LLVector4a& newMin, LLVector4a& newMax); void unbound(); BOOL rebound(); - void buildOcclusion(); //rebuild mOcclusionVerts void checkOcclusion(); //read back last occlusion query (if any) void doOcclusion(LLCamera* camera); //issue occlusion query - void destroyGL(); + void destroyGL(bool keep_occlusion = false); void updateDistance(LLCamera& camera); BOOL needsUpdate(); @@ -386,7 +384,6 @@ public: LLSpatialPartition* mSpatialPartition; LLPointer mVertexBuffer; - LLPointer mOcclusionVerts; GLuint mOcclusionQuery[LLViewerCamera::NUM_CAMERAS]; U32 mBufferUsage; @@ -637,6 +634,7 @@ class LLParticlePartition : public LLSpatialPartition { public: LLParticlePartition(); + virtual void rebuildGeom(LLSpatialGroup* group); virtual void getGeometry(LLSpatialGroup* group); virtual void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count); virtual F32 calcPixelArea(LLSpatialGroup* group, LLCamera& camera); @@ -651,18 +649,24 @@ public: }; //spatial partition for grass (implemented in LLVOGrass.cpp) -class LLGrassPartition : public LLParticlePartition +class LLGrassPartition : public LLSpatialPartition { public: LLGrassPartition(); + virtual void getGeometry(LLSpatialGroup* group); + virtual void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count); +protected: + U32 mRenderPass; }; //spatial partition for clouds (implemented in LLVOClouds.cpp) +#if ENABLE_CLASSIC_CLOUDS class LLCloudPartition : public LLParticlePartition { public: LLCloudPartition(); }; +#endif //class for wrangling geometry out of volumes (implemented in LLVOVolume.cpp) class LLVolumeGeometryManager: public LLGeometryManager diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index af0b25add..15ca87ad7 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -660,17 +660,6 @@ bool idle_startup() { gAudiop = NULL; -#ifdef LL_OPENAL - if (!gAudiop -#if !LL_WINDOWS - && NULL == getenv("LL_BAD_OPENAL_DRIVER") -#endif // !LL_WINDOWS - ) - { - gAudiop = (LLAudioEngine *) new LLAudioEngine_OpenAL(); - } -#endif - #ifdef LL_FMODEX if (!gAudiop #if !LL_WINDOWS @@ -682,6 +671,17 @@ bool idle_startup() } #endif +#ifdef LL_OPENAL + if (!gAudiop +#if !LL_WINDOWS + && NULL == getenv("LL_BAD_OPENAL_DRIVER") +#endif // !LL_WINDOWS + ) + { + gAudiop = (LLAudioEngine *) new LLAudioEngine_OpenAL(); + } +#endif + #ifdef LL_FMOD if (!gAudiop #if !LL_WINDOWS @@ -4288,11 +4288,13 @@ bool process_login_success_response(std::string& password) gMoonTextureID = id; } +#if ENABLE_CLASSIC_CLOUDS id = global_textures["cloud_texture_id"]; if(id.notNull()) { gCloudTextureID = id; } +#endif } diff --git a/indra/newview/llsurfacepatch.cpp b/indra/newview/llsurfacepatch.cpp index 0b8e4c608..770f6579a 100644 --- a/indra/newview/llsurfacepatch.cpp +++ b/indra/newview/llsurfacepatch.cpp @@ -236,8 +236,8 @@ void LLSurfacePatch::eval(const U32 x, const U32 y, const U32 stride, LLVector3 const F32 xyScaleInv = (1.f / xyScale)*(0.2222222222f); F32 vec[3] = { - (F32)fmod((mOriginGlobal.mdV[0] + x)*xyScaleInv, 256.f), - (F32)fmod((mOriginGlobal.mdV[1] + y)*xyScaleInv, 256.f), + (F32)fmod((F32)(mOriginGlobal.mdV[0] + x)*xyScaleInv, 256.f), + (F32)fmod((F32)(mOriginGlobal.mdV[1] + y)*xyScaleInv, 256.f), 0.f }; F32 rand_val = llclamp(noise2(vec)* 0.75f + 0.5f, 0.f, 1.f); diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp index 58c9afbde..39c610ce0 100644 --- a/indra/newview/lltexturecache.cpp +++ b/indra/newview/lltexturecache.cpp @@ -245,9 +245,9 @@ bool LLTextureCacheLocalFileWorker::doRead() } } #else - if (!mDataSize || mDataSize > local_size - mOffset) + if (!mDataSize || mDataSize > local_size) { - mDataSize = local_size - mOffset; + mDataSize = local_size; } mReadData = (U8*)ALLOCATE_MEM(LLImageBase::getPrivatePool(), mDataSize); @@ -375,7 +375,7 @@ bool LLTextureCacheRemoteWorker::doRead() llassert(local_size != 0); // we're assuming there is a non empty local file here... if (!mDataSize || mDataSize > local_size - mOffset) { - mDataSize = local_size - mOffset; + mDataSize = local_size - mOffset; } // Allocate read buffer mReadData = (U8*)ALLOCATE_MEM(LLImageBase::getPrivatePool(), mDataSize); @@ -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 4462fc886..a9f31ca0f 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -1282,6 +1282,8 @@ bool LLTextureFetchWorker::doWork(S32 param) return true ; //abort. } } + resetFormattedData(); + cur_size = 0; } mRequestedSize = mDesiredSize; mRequestedDiscard = mDesiredDiscard; @@ -1315,7 +1317,6 @@ bool LLTextureFetchWorker::doWork(S32 param) LLImageBase::TYPE_AVATAR_BAKE == mType); #endif - if(cur_size > 0) offset--; // Will call callbackHttpGet when curl request completes std::vector headers; headers.push_back("Accept: image/x-j2c"); @@ -1467,14 +1468,11 @@ bool LLTextureFetchWorker::doWork(S32 param) } U8* buffer = (U8*)ALLOCATE_MEM(LLImageBase::getPrivatePool(), mBufferSize); - if (cur_size > 0) { + if (cur_size > 0) + { memcpy(buffer, mFormattedImage->getData(), cur_size); - mBufferSize--; - if(mRequestedSize == 1) mRequestedDiscard = 0; - else memcpy(buffer + cur_size, mBuffer+1, mRequestedSize-1); // append } - else memcpy(buffer + cur_size, mBuffer, mRequestedSize); // append - + memcpy(buffer + cur_size, mBuffer, mRequestedSize); // append // NOTE: setData releases current data and owns new data (buffer) mFormattedImage->setData(buffer, mBufferSize); // delete temp data @@ -1837,11 +1835,7 @@ S32 LLTextureFetchWorker::callbackHttpGet(const LLChannelDescriptors& channels, mBuffer = (U8*)ALLOCATE_MEM(LLImageBase::getPrivatePool(), data_size); buffer->readAfter(channels.in(), NULL, mBuffer, data_size); mBufferSize += data_size; - if(mFormattedImage.notNull() && mFormattedImage->getDataSize() > 0 && data_size == 1) - { - mHaveAllData = TRUE; - } - else if (data_size < mRequestedSize && mRequestedDiscard == 0) + if (data_size < mRequestedSize && mRequestedDiscard == 0) { mHaveAllData = TRUE; } 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/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp index ff4f66e63..db5d56fd8 100644 --- a/indra/newview/lltoolmgr.cpp +++ b/indra/newview/lltoolmgr.cpp @@ -282,7 +282,24 @@ bool LLToolMgr::canEdit() void LLToolMgr::toggleBuildMode() { - if (!inBuildMode()) + if (inBuildMode()) + { + if (gSavedSettings.getBOOL("EditCameraMovement")) + { + // just reset the view, will pull us out of edit mode + handle_reset_view(); + } + else + { + // manually disable edit mode, but do not affect the camera + gAgentCamera.resetView(false); + gFloaterTools->close(); + gViewerWindow->showCursor(); + } + // avoid spurious avatar movements pulling out of edit mode + LLViewerJoystick::getInstance()->setNeedsReset(); + } + else { ECameraMode camMode = gAgentCamera.getCameraMode(); if (CAMERA_MODE_MOUSELOOK == camMode || CAMERA_MODE_CUSTOMIZE_AVATAR == camMode) @@ -332,24 +349,8 @@ void LLToolMgr::toggleBuildMode() LLViewerJoystick::getInstance()->setNeedsReset(); } - else - { - if (gSavedSettings.getBOOL("EditCameraMovement")) - { - // just reset the view, will pull us out of edit mode - handle_reset_view(); - } - else - { - // manually disable edit mode, but do not affect the camera - gAgentCamera.resetView(false); - gFloaterTools->close(); - gViewerWindow->showCursor(); - } - // avoid spurious avatar movements pulling out of edit mode - LLViewerJoystick::getInstance()->setNeedsReset(); - } } + bool LLToolMgr::inBuildMode() { // when entering mouselook inEdit() immediately returns true before diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index bacfa4938..7d9f0a136 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -675,7 +675,7 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask) const LLPickInfo& pick = gViewerWindow->getHoverPick(); object = pick.getObject(); if ( (object) && (rlv_handler_t::isEnabled()) && - ( ((gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH))) && (!gRlvHandler.canTouch(object, pick.mObjectOffset)) || + ( (((gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH))) && (!gRlvHandler.canTouch(object, pick.mObjectOffset))) || ((gRlvHandler.hasBehaviour(RLV_BHVR_INTERACT)) && (!object->isHUDAttachment())) ) ) { gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW); diff --git a/indra/newview/lltoolplacer.cpp b/indra/newview/lltoolplacer.cpp index 9ae84c2e1..f9b5e4541 100644 --- a/indra/newview/lltoolplacer.cpp +++ b/indra/newview/lltoolplacer.cpp @@ -35,9 +35,6 @@ // self header #include "lltoolplacer.h" -// linden library headers -#include "llprimitive.h" - // viewer headers #include "llbutton.h" #include "llviewercontrol.h" @@ -50,12 +47,10 @@ #include "llviewerobject.h" #include "llviewerregion.h" #include "llviewerwindow.h" -#include "llwindow.h" #include "llworld.h" #include "llui.h" //Headers added for functions moved from viewer.cpp -#include "llvoavatarself.h" #include "llvograss.h" #include "llvotree.h" #include "llvolumemessage.h" @@ -67,11 +62,17 @@ #include "llviewerobjectlist.h" #include "llviewercamera.h" #include "llviewerstats.h" +#include "llvoavatarself.h" + +// linden library headers +#include "llprimitive.h" +#include "llwindow.h" // #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/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 905899b4f..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; } @@ -579,10 +583,11 @@ bool handleCloudSettingsChanged(const LLSD& newvalue) if((bool)LLPipeline::hasRenderTypeControl((void*)LLPipeline::RENDER_TYPE_WL_CLOUDS)!=bCloudsEnabled) LLPipeline::toggleRenderTypeControl((void*)LLPipeline::RENDER_TYPE_WL_CLOUDS); +#if ENABLE_CLASSIC_CLOUDS if( !gSavedSettings.getBOOL("SkyUseClassicClouds") ) bCloudsEnabled = false; - if((bool)LLPipeline::hasRenderTypeControl((void*)LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS)!=bCloudsEnabled ) LLPipeline::toggleRenderTypeControl((void*)LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS); +#endif return true; } diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 7d65692e1..8b8c8b703 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -813,12 +813,12 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot, boo gTextureList.updateImages(max_image_decode_time); } - { + /*{ LLFastTimer t(FTM_IMAGE_UPDATE_DELETE); //remove dead textures from GL LLImageGL::deleteDeadTextures(); stop_glerror(); - } + }*/ } llpushcallstacks ; LLGLState::checkStates(); @@ -948,6 +948,29 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot, boo && !gRestoreGL) { LLViewerCamera::sCurCameraID = LLViewerCamera::CAMERA_WORLD; + + LLCachedControl render_depth_pre_pass("RenderDepthPrePass", false); + if (render_depth_pre_pass && LLGLSLShader::sNoFixedFunction) + { + gGL.setColorMask(false, false); + + U32 types[] = { + LLRenderPass::PASS_SIMPLE, + LLRenderPass::PASS_FULLBRIGHT, + LLRenderPass::PASS_SHINY + }; + + U32 num_types = LL_ARRAY_SIZE(types); + gOcclusionProgram.bind(); + for (U32 i = 0; i < num_types; i++) + { + gPipeline.renderObjects(types[i], LLVertexBuffer::MAP_VERTEX, FALSE); + } + + gOcclusionProgram.unbind(); + } + + gGL.setColorMask(true, false); if (LLPipeline::sRenderDeferred && !LLPipeline::sUnderWaterRender) { diff --git a/indra/newview/llviewerjointattachment.cpp b/indra/newview/llviewerjointattachment.cpp index 5164daf22..52abedded 100644 --- a/indra/newview/llviewerjointattachment.cpp +++ b/indra/newview/llviewerjointattachment.cpp @@ -127,7 +127,11 @@ void LLViewerJointAttachment::setupDrawable(LLViewerObject *object) { for (S32 face_num = 0; face_num < object->mDrawable->getNumFaces(); face_num++) { - object->mDrawable->getFace(face_num)->setState(LLFace::HUD_RENDER); + LLFace *face = object->mDrawable->getFace(face_num); + if (face) + { + face->setState(LLFace::HUD_RENDER); + } } } @@ -146,7 +150,11 @@ void LLViewerJointAttachment::setupDrawable(LLViewerObject *object) { for (S32 face_num = 0; face_num < childp->mDrawable->getNumFaces(); face_num++) { - childp->mDrawable->getFace(face_num)->setState(LLFace::HUD_RENDER); + LLFace * face = childp->mDrawable->getFace(face_num); + if (face) + { + face->setState(LLFace::HUD_RENDER); + } } } } @@ -260,7 +268,11 @@ void LLViewerJointAttachment::removeObject(LLViewerObject *object) { for (S32 face_num = 0; face_num < object->mDrawable->getNumFaces(); face_num++) { - object->mDrawable->getFace(face_num)->clearState(LLFace::HUD_RENDER); + LLFace * face = object->mDrawable->getFace(face_num); + if (face) + { + face->clearState(LLFace::HUD_RENDER); + } } } } @@ -278,7 +290,11 @@ void LLViewerJointAttachment::removeObject(LLViewerObject *object) { for (S32 face_num = 0; face_num < childp->mDrawable->getNumFaces(); face_num++) { - childp->mDrawable->getFace(face_num)->clearState(LLFace::HUD_RENDER); + LLFace * face = childp->mDrawable->getFace(face_num); + if (face) + { + face->clearState(LLFace::HUD_RENDER); + } } } } 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/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 87719e554..669c57d43 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -875,8 +875,6 @@ void init_menus() gLoginMenuBarView->setBackgroundColor( color ); gMenuHolder->addChild(gLoginMenuBarView); - - LLToolMgr::getInstance()->initMenu(sMenus); } @@ -1371,7 +1369,11 @@ void init_debug_rendering_menu(LLMenuGL* menu) &LLPipeline::hasRenderTypeControl, (void*)LLPipeline::RENDER_TYPE_GRASS, '0', MASK_CONTROL|MASK_ALT|MASK_SHIFT)); //NOTE: Using a static variable, as an unsigned long long cannot fit in the space of a pointer. Pass pointer to callbacks - static U64 cloud_flags = (1ULL<addChild(new LLMenuItemCheckGL("Clouds", //This clobbers skyuseclassicclouds, but.. big deal. &LLPipeline::toggleRenderPairedTypeControl, NULL, &LLPipeline::hasRenderPairedTypeControl, @@ -9506,4 +9508,6 @@ void initialize_menus() addMenu(new RlvEnableIfNot(), "RLV.EnableIfNot"); } // [/RLVa:KB] + + LLToolMgr::getInstance()->initMenu(sMenus); } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 266362ae8..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); + } } @@ -5332,7 +5336,7 @@ void process_avatar_sit_response(LLMessageSystem *mesgsys, void **user_data) if (object) { LLVector3 sit_spot = object->getPositionAgent() + (sitPosition * object->getRotation()); - if (!use_autopilot || isAgentAvatarValid() && gAgentAvatarp->isSitting() && gAgentAvatarp->getRoot() == object->getRoot()) + if (!use_autopilot || (isAgentAvatarValid() && gAgentAvatarp->isSitting() && gAgentAvatarp->getRoot() == object->getRoot())) { //we're already sitting on this object, so don't autopilot } diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index b8e828643..54ed9ac8d 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -175,8 +175,10 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco res = NULL; break; case LL_PCODE_LEGACY_TEXT_BUBBLE: res = new LLVOTextBubble(id, pcode, regionp); break; +#if ENABLE_CLASSIC_CLOUDS case LL_VO_CLOUDS: res = new LLVOClouds(id, pcode, regionp); break; +#endif case LL_VO_SURFACE_PATCH: res = new LLVOSurfacePatch(id, pcode, regionp); break; case LL_VO_SKY: @@ -442,7 +444,9 @@ void LLViewerObject::dump() const llinfos << "PositionAgent: " << getPositionAgent() << llendl; llinfos << "PositionGlobal: " << getPositionGlobal() << llendl; llinfos << "Velocity: " << getVelocity() << llendl; - if (mDrawable.notNull() && mDrawable->getNumFaces()) + if (mDrawable.notNull() && + mDrawable->getNumFaces() && + mDrawable->getFace(0)) { LLFacePool *poolp = mDrawable->getFace(0)->getPool(); if (poolp) @@ -2870,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 { @@ -2980,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, @@ -4555,7 +4603,11 @@ U32 LLViewerObject::getNumVertices() const num_faces = mDrawable->getNumFaces(); for (i = 0; i < num_faces; i++) { - num_vertices += mDrawable->getFace(i)->getGeomCount(); + LLFace * facep = mDrawable->getFace(i); + if (facep) + { + num_vertices += facep->getGeomCount(); + } } } return num_vertices; @@ -4570,7 +4622,11 @@ U32 LLViewerObject::getNumIndices() const num_faces = mDrawable->getNumFaces(); for (i = 0; i < num_faces; i++) { - num_indices += mDrawable->getFace(i)->getIndicesCount(); + LLFace * facep = mDrawable->getFace(i); + if (facep) + { + num_indices += facep->getIndicesCount(); + } } } return num_indices; @@ -4855,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 2bcee1478..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 @@ -951,7 +963,10 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world) iter != idle_list.end(); iter++) { objectp = *iter; - if (objectp->getPCode() == LLViewerObject::LL_VO_CLOUDS || + if ( +#if ENABLE_CLASSIC_CLOUDS + objectp->getPCode() == LLViewerObject::LL_VO_CLOUDS || +#endif objectp->isAvatar()) { objectp->idleUpdate(agent, world, frame_time); @@ -1732,7 +1747,10 @@ void LLViewerObjectList::generatePickList(LLCamera &camera) LLViewerObject* last_objectp = NULL; for (S32 face_num = 0; face_num < drawablep->getNumFaces(); face_num++) { - LLViewerObject* objectp = drawablep->getFace(face_num)->getViewerObject(); + LLFace * facep = drawablep->getFace(face_num); + if (!facep) continue; + + LLViewerObject* objectp = facep->getViewerObject(); if (objectp && objectp != last_objectp) { diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp index fb78b29fa..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; @@ -762,7 +772,7 @@ void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type) if (media_url.empty()) { - media_action == "allow"; + media_action = "allow"; } else if (!sMediaFilterListLoaded || sDeniedMedia.count(domain) || sDeniedMedia.count(ip)) { diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 529d0e034..9ed016d71 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1678,9 +1678,6 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use // Request access list information for this land parcel_mgr.sendParcelAccessListRequest(AL_ACCESS | AL_BAN); - // Request the media url filter list for this land - parcel_mgr.requestParcelMediaURLFilter(); - // Request dwell for this land, if it's not public land. parcel_mgr.mSelectedDwell = 0.f; if (0 != local_id) @@ -2010,67 +2007,6 @@ void LLViewerParcelMgr::sendParcelAccessListUpdate(U32 which) } } -class LLParcelMediaURLFilterResponder : public LLHTTPClient::Responder -{ - virtual void result(const LLSD& content) - { - LLViewerParcelMgr::getInstance()->receiveParcelMediaURLFilter(content); - } -}; - -void LLViewerParcelMgr::requestParcelMediaURLFilter() -{ - if (!mSelected) - { - return; - } - - LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal( mWestSouth ); - if (!region) - { - return; - } - - LLParcel* parcel = mCurrentParcel; - if (!parcel) - { - llwarns << "no parcel" << llendl; - return; - } - - LLSD body; - body["local-id"] = parcel->getLocalID(); - body["list"] = parcel->getMediaURLFilterList(); - - std::string url = region->getCapability("ParcelMediaURLFilterList"); - if (!url.empty()) - { - LLHTTPClient::post(url, body, new LLParcelMediaURLFilterResponder); - } - else - { - llwarns << "can't get ParcelMediaURLFilterList cap" << llendl; - } -} - - -void LLViewerParcelMgr::receiveParcelMediaURLFilter(const LLSD &content) -{ - if (content.has("list")) - { - LLParcel* parcel = LLViewerParcelMgr::getInstance()->mCurrentParcel; - if (!parcel) return; - - if (content["local-id"].asInteger() == parcel->getLocalID()) - { - parcel->setMediaURLFilterList(content["list"]); - - LLViewerParcelMgr::getInstance()->notifyObservers(); - } - } -} - - void LLViewerParcelMgr::deedLandToGroup() { std::string group_name; diff --git a/indra/newview/llviewerparcelmgr.h b/indra/newview/llviewerparcelmgr.h index c65f57b46..72531ff55 100644 --- a/indra/newview/llviewerparcelmgr.h +++ b/indra/newview/llviewerparcelmgr.h @@ -227,11 +227,6 @@ public: // Takes an Access List flag, like AL_ACCESS or AL_BAN void sendParcelAccessListRequest(U32 flags); - // asks for the parcel's media url filter list - void requestParcelMediaURLFilter(); - // receive the response - void receiveParcelMediaURLFilter(const LLSD &content); - // Dwell is not part of the usual parcel update information because the // simulator doesn't actually know the per-parcel dwell. Ack! We have // to get it out of the database. diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp index e70975b11..94a2968b4 100644 --- a/indra/newview/llviewerpartsim.cpp +++ b/indra/newview/llviewerpartsim.cpp @@ -482,7 +482,7 @@ void LLViewerPartSim::checkParticleCount(U32 size) LLViewerPartSim::LLViewerPartSim() { LLMemType mt(LLMemType::MTYPE_PARTICLES); - sMaxParticleCount = gSavedSettings.getS32("RenderMaxPartCount"); + sMaxParticleCount = llmin(gSavedSettings.getS32("RenderMaxPartCount"), LL_MAX_PARTICLE_COUNT); static U32 id_seed = 0; mID = ++id_seed; } diff --git a/indra/newview/llviewerpartsim.h b/indra/newview/llviewerpartsim.h index 8f1f72518..7e625f2c0 100644 --- a/indra/newview/llviewerpartsim.h +++ b/indra/newview/llviewerpartsim.h @@ -45,6 +45,8 @@ class LLViewerRegion; class LLViewerTexture; class LLVOPartGroup; +#define LL_MAX_PARTICLE_COUNT 8192 + typedef void (*LLVPCallback)(LLViewerPart &part, const F32 dt); /////////////////// 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/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 2e96edcb4..6755005a8 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -336,7 +336,9 @@ LLViewerRegion::LLViewerRegion(const U64 &handle, mImpl->mObjectPartition.push_back(new LLWaterPartition()); //PARTITION_WATER mImpl->mObjectPartition.push_back(new LLTreePartition()); //PARTITION_TREE mImpl->mObjectPartition.push_back(new LLParticlePartition()); //PARTITION_PARTICLE +#if ENABLE_CLASSIC_CLOUDS mImpl->mObjectPartition.push_back(new LLCloudPartition()); //PARTITION_CLOUD +#endif mImpl->mObjectPartition.push_back(new LLGrassPartition()); //PARTITION_GRASS mImpl->mObjectPartition.push_back(new LLVolumePartition()); //PARTITION_VOLUME mImpl->mObjectPartition.push_back(new LLBridgePartition()); //PARTITION_BRIDGE @@ -366,7 +368,9 @@ LLViewerRegion::~LLViewerRegion() // Can't do this on destruction, because the neighbor pointers might be invalid. // This should be reference counted... disconnectAllNeighbors(); +#if ENABLE_CLASSIC_CLOUDS mCloudLayer.destroy(); +#endif LLViewerPartSim::getInstance()->cleanupRegion(this); gObjectList.killObjects(this); @@ -502,7 +506,9 @@ void LLViewerRegion::setOriginGlobal(const LLVector3d &origin_global) updateRenderMatrix(); mImpl->mLandp->setOriginGlobal(origin_global); mWind.setOriginGlobal(origin_global); +#if ENABLE_CLASSIC_CLOUDS mCloudLayer.setOriginGlobal(origin_global); +#endif calculateCenterGlobal(); } @@ -778,14 +784,18 @@ void LLViewerRegion::forceUpdate() void LLViewerRegion::connectNeighbor(LLViewerRegion *neighborp, U32 direction) { mImpl->mLandp->connectNeighbor(neighborp->mImpl->mLandp, direction); +#if ENABLE_CLASSIC_CLOUDS mCloudLayer.connectNeighbor(&(neighborp->mCloudLayer), direction); +#endif } void LLViewerRegion::disconnectAllNeighbors() { mImpl->mLandp->disconnectAllNeighbors(); +#if ENABLE_CLASSIC_CLOUDS mCloudLayer.disconnectAllNeighbors(); +#endif } LLVLComposition * LLViewerRegion::getComposition() const @@ -1588,7 +1598,6 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) #endif //MESH_IMPORT capabilityNames.append("NewFileAgentInventory"); capabilityNames.append("ParcelPropertiesUpdate"); - capabilityNames.append("ParcelMediaURLFilterList"); capabilityNames.append("ParcelNavigateMedia"); capabilityNames.append("ParcelVoiceInfoRequest"); capabilityNames.append("ProductInfoRequest"); diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index 3d33e9b7f..b7fd43602 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -86,7 +86,9 @@ public: PARTITION_WATER, PARTITION_TREE, PARTITION_PARTICLE, +#if ENABLE_CLASSIC_CLOUDS PARTITION_CLOUD, +#endif PARTITION_GRASS, PARTITION_VOLUME, PARTITION_BRIDGE, @@ -354,7 +356,9 @@ protected: public: LLWind mWind; +#if ENABLE_CLASSIC_CLOUDS LLCloudLayer mCloudLayer; +#endif LLViewerParcelOverlay *mParcelOverlay; LLStat mBitStat; diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 175f0bfec..0eb0b3cc2 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -73,9 +73,16 @@ LLVector4 gShinyOrigin; // Make sure WL Sky is the first program LLGLSLShader gWLSkyProgram(LLViewerShaderMgr::SHADER_WINDLIGHT); LLGLSLShader gWLCloudProgram(LLViewerShaderMgr::SHADER_WINDLIGHT); +//transform shaders +LLGLSLShader gTransformPositionProgram(LLViewerShaderMgr::SHADER_TRANSFORM); +LLGLSLShader gTransformTexCoordProgram(LLViewerShaderMgr::SHADER_TRANSFORM); +LLGLSLShader gTransformNormalProgram(LLViewerShaderMgr::SHADER_TRANSFORM); +LLGLSLShader gTransformColorProgram(LLViewerShaderMgr::SHADER_TRANSFORM); +LLGLSLShader gTransformBinormalProgram(LLViewerShaderMgr::SHADER_TRANSFORM); //utility shaders LLGLSLShader gOcclusionProgram(LLViewerShaderMgr::SHADER_INTERFACE); +LLGLSLShader gOcclusionCubeProgram(LLViewerShaderMgr::SHADER_INTERFACE); LLGLSLShader gCustomAlphaProgram(LLViewerShaderMgr::SHADER_INTERFACE); LLGLSLShader gGlowCombineProgram(LLViewerShaderMgr::SHADER_INTERFACE); LLGLSLShader gSplatTextureRectProgram(LLViewerShaderMgr::SHADER_INTERFACE); @@ -189,6 +196,7 @@ LLGLSLShader gDeferredSunProgram(LLViewerShaderMgr::SHADER_DEFERRED); LLGLSLShader gDeferredBlurLightProgram(LLViewerShaderMgr::SHADER_DEFERRED); LLGLSLShader gDeferredSoftenProgram(LLViewerShaderMgr::SHADER_DEFERRED); LLGLSLShader gDeferredShadowProgram(LLViewerShaderMgr::SHADER_DEFERRED); //Not in mShaderList +LLGLSLShader gDeferredShadowCubeProgram(LLViewerShaderMgr::SHADER_DEFERRED); LLGLSLShader gDeferredShadowAlphaMaskProgram(LLViewerShaderMgr::SHADER_DEFERRED); LLGLSLShader gDeferredAvatarShadowProgram(LLViewerShaderMgr::SHADER_DEFERRED);//Not in mShaderList LLGLSLShader gDeferredAttachmentShadowProgram(LLViewerShaderMgr::SHADER_DEFERRED); @@ -389,6 +397,7 @@ void LLViewerShaderMgr::setShaders() S32 wl_class = 2; S32 water_class = 2; S32 deferred_class = 0; + S32 transform_class = gGLManager.mHasTransformFeedback ? 1 : 0; if (LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") && gSavedSettings.getBOOL("RenderDeferred") && @@ -436,6 +445,7 @@ void LLViewerShaderMgr::setShaders() mVertexShaderLevel[SHADER_EFFECT] = effect_class; mVertexShaderLevel[SHADER_WINDLIGHT] = wl_class; mVertexShaderLevel[SHADER_DEFERRED] = deferred_class; + mVertexShaderLevel[SHADER_TRANSFORM] = transform_class; BOOL loaded = loadBasicShaders(); @@ -445,65 +455,109 @@ void LLViewerShaderMgr::setShaders() gPipeline.mVertexShadersLoaded = 1; // Load all shaders to set max levels - loadShadersEnvironment(); - loadShadersWater(); - loadShadersWindLight(); - loadShadersEffects(); - loadShadersInterface(); - - // Load max avatar shaders to set the max level - mVertexShaderLevel[SHADER_AVATAR] = 3; - mMaxAvatarShaderLevel = 3; - - if (gSavedSettings.getBOOL("RenderAvatarVP") && loadShadersObject()) - { - BOOL avatar_cloth = gSavedSettings.getBOOL("RenderAvatarCloth"); - S32 avatar_class = 1; - - // cloth is a class3 shader - if(avatar_cloth) - { - avatar_class = 3; - } + loaded = loadShadersEnvironment(); - // Set the actual level - mVertexShaderLevel[SHADER_AVATAR] = avatar_class; - loadShadersAvatar(); - if (mVertexShaderLevel[SHADER_AVATAR] != avatar_class) - { - if (mVertexShaderLevel[SHADER_AVATAR] == 0) + if (loaded) + { + loaded = loadShadersWater(); + } + + if (loaded) + { + loaded = loadShadersWindLight(); + } + + if (loaded) + { + loaded = loadShadersEffects(); + } + + if (loaded) + { + loaded = loadShadersInterface(); + } + + if (loaded) + { + loaded = loadTransformShaders(); + } + + if (loaded) + { + // Load max avatar shaders to set the max level + mVertexShaderLevel[SHADER_AVATAR] = 3; + mMaxAvatarShaderLevel = 3; + + if (gSavedSettings.getBOOL("RenderAvatarVP") && loadShadersObject()) + { //hardware skinning is enabled and rigged attachment shaders loaded correctly + BOOL avatar_cloth = gSavedSettings.getBOOL("RenderAvatarCloth"); + S32 avatar_class = 1; + + // cloth is a class3 shader + if(avatar_cloth) { + avatar_class = 3; + } + + // Set the actual level + mVertexShaderLevel[SHADER_AVATAR] = avatar_class; + loadShadersAvatar(); + if (mVertexShaderLevel[SHADER_AVATAR] != avatar_class) + { + if (mVertexShaderLevel[SHADER_AVATAR] == 0) + { + gSavedSettings.setBOOL("RenderAvatarVP", FALSE); + } + if(llmax(mVertexShaderLevel[SHADER_AVATAR]-1,0) >= 3) + { + avatar_cloth = true; + } + else + { + avatar_cloth = false; + } + gSavedSettings.setBOOL("RenderAvatarCloth", avatar_cloth); + } + } + else + { //hardware skinning not possible, neither is deferred rendering + mVertexShaderLevel[SHADER_AVATAR] = 0; + mVertexShaderLevel[SHADER_DEFERRED] = 0; + + if (gSavedSettings.getBOOL("RenderAvatarVP")) + { + gSavedSettings.setBOOL("RenderDeferred", FALSE); + gSavedSettings.setBOOL("RenderAvatarCloth", FALSE); gSavedSettings.setBOOL("RenderAvatarVP", FALSE); } - if(llmax(mVertexShaderLevel[SHADER_AVATAR]-1,0) >= 3) - { - avatar_cloth = true; - } - else - { - avatar_cloth = false; - } - gSavedSettings.setBOOL("RenderAvatarCloth", avatar_cloth); + + loadShadersAvatar(); // unloads + + loaded = loadShadersObject(); } } - else - { - mVertexShaderLevel[SHADER_AVATAR] = 0; - mVertexShaderLevel[SHADER_DEFERRED] = 0; - if (gSavedSettings.getBOOL("RenderAvatarVP")) - { - gSavedSettings.setBOOL("RenderDeferred", FALSE); - gSavedSettings.setBOOL("RenderAvatarCloth", FALSE); - gSavedSettings.setBOOL("RenderAvatarVP", FALSE); + if (!loaded) + { //some shader absolutely could not load, try to fall back to a simpler setting + if (gSavedSettings.getBOOL("WindLightUseAtmosShaders")) + { //disable windlight and try again + gSavedSettings.setBOOL("WindLightUseAtmosShaders", FALSE); + reentrance = false; + setShaders(); + return; } - loadShadersAvatar(); // unloads - loadShadersObject(); - } + if (gSavedSettings.getBOOL("VertexShaderEnable")) + { //disable shaders outright and try again + gSavedSettings.setBOOL("VertexShaderEnable", FALSE); + reentrance = false; + setShaders(); + return; + } + } - if (!loadShadersDeferred()) - { + if (loaded && !loadShadersDeferred()) + { //everything else succeeded but deferred failed, disable deferred and try again gSavedSettings.setBOOL("RenderDeferred", FALSE); reentrance = false; setShaders(); @@ -629,12 +683,13 @@ BOOL LLViewerShaderMgr::loadBasicShaders() // (in order of shader function call depth for reference purposes, deepest level first) shaders.clear(); - S32 ch = llmax(LLGLSLShader::sIndexedTextureChannels-1, 1); + S32 ch = 1; - static const LLCachedControl no_texture_indexing("ShyotlUseLegacyTextureBatching",false); - if (gGLManager.mGLVersion < 3.1f || no_texture_indexing) - { //force to 1 texture index channel for old drivers - ch = 1; + if (gGLManager.mGLSLVersionMajor > 1 || gGLManager.mGLSLVersionMinor >= 30) + { //use indexed texture rendering for GLSL >= 1.30 + static const LLCachedControl no_texture_indexing("ShyotlUseLegacyTextureBatching",false); + if(!no_texture_indexing) + ch = llmax(LLGLSLShader::sIndexedTextureChannels-1, 1); } std::vector index_channels; @@ -688,7 +743,7 @@ BOOL LLViewerShaderMgr::loadShadersEnvironment() if (mVertexShaderLevel[SHADER_ENVIRONMENT] == 0) { unloadShaderClass(SHADER_ENVIRONMENT); - return FALSE; + return TRUE; } if (success) @@ -726,7 +781,7 @@ BOOL LLViewerShaderMgr::loadShadersWater() if (mVertexShaderLevel[SHADER_WATER] == 0) { unloadShaderClass(SHADER_WATER); - return FALSE; + return TRUE; } if (success) @@ -808,7 +863,7 @@ BOOL LLViewerShaderMgr::loadShadersEffects() if (mVertexShaderLevel[SHADER_EFFECT] == 0) { unloadShaderClass(SHADER_EFFECT); - return FALSE; + return TRUE; } if(LLPipeline::sRenderGlow) @@ -1083,7 +1138,7 @@ BOOL LLViewerShaderMgr::loadShadersDeferred() gDeferredSpotLightProgram.mName = "Deferred SpotLight Shader"; gDeferredSpotLightProgram.mShaderFiles.clear(); gDeferredSpotLightProgram.mShaderFiles.push_back(make_pair("deferred/pointLightV.glsl", GL_VERTEX_SHADER_ARB)); - gDeferredSpotLightProgram.mShaderFiles.push_back(make_pair("deferred/multiSpotLightF.glsl", GL_FRAGMENT_SHADER_ARB)); + gDeferredSpotLightProgram.mShaderFiles.push_back(make_pair("deferred/spotLightF.glsl", GL_FRAGMENT_SHADER_ARB)); gDeferredSpotLightProgram.mShaderLevel = mVertexShaderLevel[SHADER_DEFERRED]; success = gDeferredSpotLightProgram.createShader(NULL, NULL); } @@ -1092,7 +1147,7 @@ BOOL LLViewerShaderMgr::loadShadersDeferred() { gDeferredMultiSpotLightProgram.mName = "Deferred MultiSpotLight Shader"; gDeferredMultiSpotLightProgram.mShaderFiles.clear(); - gDeferredMultiSpotLightProgram.mShaderFiles.push_back(make_pair("deferred/pointLightV.glsl", GL_VERTEX_SHADER_ARB)); + gDeferredMultiSpotLightProgram.mShaderFiles.push_back(make_pair("deferred/multiPointLightV.glsl", GL_VERTEX_SHADER_ARB)); gDeferredMultiSpotLightProgram.mShaderFiles.push_back(make_pair("deferred/multiSpotLightF.glsl", GL_FRAGMENT_SHADER_ARB)); gDeferredMultiSpotLightProgram.mShaderLevel = mVertexShaderLevel[SHADER_DEFERRED]; success = gDeferredMultiSpotLightProgram.createShader(NULL, NULL); @@ -1235,6 +1290,16 @@ BOOL LLViewerShaderMgr::loadShadersDeferred() success = gDeferredShadowProgram.createShader(NULL, NULL); } + if (success) + { + gDeferredShadowCubeProgram.mName = "Deferred Shadow Cube Shader"; + gDeferredShadowCubeProgram.mShaderFiles.clear(); + gDeferredShadowCubeProgram.mShaderFiles.push_back(make_pair("deferred/shadowCubeV.glsl", GL_VERTEX_SHADER_ARB)); + gDeferredShadowCubeProgram.mShaderFiles.push_back(make_pair("deferred/shadowF.glsl", GL_FRAGMENT_SHADER_ARB)); + gDeferredShadowCubeProgram.mShaderLevel = mVertexShaderLevel[SHADER_DEFERRED]; + success = gDeferredShadowCubeProgram.createShader(NULL, NULL); + } + if (success) { gDeferredShadowAlphaMaskProgram.mName = "Deferred Shadow Alpha Mask Shader"; @@ -2230,7 +2295,7 @@ BOOL LLViewerShaderMgr::loadShadersAvatar() if (mVertexShaderLevel[SHADER_AVATAR] == 0) { unloadShaderClass(SHADER_AVATAR); - return FALSE; + return TRUE; } if (success) @@ -2324,7 +2389,7 @@ BOOL LLViewerShaderMgr::loadShadersInterface() if (mVertexShaderLevel[SHADER_INTERFACE] == 0) { unloadShaderClass(SHADER_INTERFACE); - return FALSE; + return TRUE; } if (success) @@ -2465,6 +2530,16 @@ BOOL LLViewerShaderMgr::loadShadersInterface() success = gOcclusionProgram.createShader(NULL, NULL); } + if (success) + { + gOcclusionCubeProgram.mName = "Occlusion Cube Shader"; + gOcclusionCubeProgram.mShaderFiles.clear(); + gOcclusionCubeProgram.mShaderFiles.push_back(make_pair("interface/occlusionCubeV.glsl", GL_VERTEX_SHADER_ARB)); + gOcclusionCubeProgram.mShaderFiles.push_back(make_pair("interface/occlusionF.glsl", GL_FRAGMENT_SHADER_ARB)); + gOcclusionCubeProgram.mShaderLevel = mVertexShaderLevel[SHADER_INTERFACE]; + success = gOcclusionCubeProgram.createShader(NULL, NULL); + } + if (success) { gDebugProgram.mName = "Debug Shader"; @@ -2511,7 +2586,7 @@ BOOL LLViewerShaderMgr::loadShadersWindLight() if (mVertexShaderLevel[SHADER_WINDLIGHT] < 2) { unloadShaderClass(SHADER_WINDLIGHT); - return FALSE; + return TRUE; } if (success) @@ -2541,6 +2616,91 @@ BOOL LLViewerShaderMgr::loadShadersWindLight() return success; } +BOOL LLViewerShaderMgr::loadTransformShaders() +{ + BOOL success = TRUE; + + if (mVertexShaderLevel[SHADER_TRANSFORM] < 1) + { + unloadShaderClass(SHADER_TRANSFORM); + return TRUE; + } + + if (success) + { + gTransformPositionProgram.mName = "Position Transform Shader"; + gTransformPositionProgram.mShaderFiles.clear(); + gTransformPositionProgram.mShaderFiles.push_back(make_pair("transform/positionV.glsl", GL_VERTEX_SHADER_ARB)); + gTransformPositionProgram.mShaderLevel = mVertexShaderLevel[SHADER_TRANSFORM]; + + const char* varyings[] = { + "position_out", + "texture_index_out", + }; + + success = gTransformPositionProgram.createShader(NULL, NULL, 2, varyings); + } + + if (success) + { + gTransformTexCoordProgram.mName = "TexCoord Transform Shader"; + gTransformTexCoordProgram.mShaderFiles.clear(); + gTransformTexCoordProgram.mShaderFiles.push_back(make_pair("transform/texcoordV.glsl", GL_VERTEX_SHADER_ARB)); + gTransformTexCoordProgram.mShaderLevel = mVertexShaderLevel[SHADER_TRANSFORM]; + + const char* varyings[] = { + "texcoord_out", + }; + + success = gTransformTexCoordProgram.createShader(NULL, NULL, 1, varyings); + } + + if (success) + { + gTransformNormalProgram.mName = "Normal Transform Shader"; + gTransformNormalProgram.mShaderFiles.clear(); + gTransformNormalProgram.mShaderFiles.push_back(make_pair("transform/normalV.glsl", GL_VERTEX_SHADER_ARB)); + gTransformNormalProgram.mShaderLevel = mVertexShaderLevel[SHADER_TRANSFORM]; + + const char* varyings[] = { + "normal_out", + }; + + success = gTransformNormalProgram.createShader(NULL, NULL, 1, varyings); + } + + if (success) + { + gTransformColorProgram.mName = "Color Transform Shader"; + gTransformColorProgram.mShaderFiles.clear(); + gTransformColorProgram.mShaderFiles.push_back(make_pair("transform/colorV.glsl", GL_VERTEX_SHADER_ARB)); + gTransformColorProgram.mShaderLevel = mVertexShaderLevel[SHADER_TRANSFORM]; + + const char* varyings[] = { + "color_out", + }; + + success = gTransformColorProgram.createShader(NULL, NULL, 1, varyings); + } + + if (success) + { + gTransformBinormalProgram.mName = "Binormal Transform Shader"; + gTransformBinormalProgram.mShaderFiles.clear(); + gTransformBinormalProgram.mShaderFiles.push_back(make_pair("transform/binormalV.glsl", GL_VERTEX_SHADER_ARB)); + gTransformBinormalProgram.mShaderLevel = mVertexShaderLevel[SHADER_TRANSFORM]; + + const char* varyings[] = { + "binormal_out", + }; + + success = gTransformBinormalProgram.createShader(NULL, NULL, 1, varyings); + } + + + return success; +} + std::string LLViewerShaderMgr::getShaderDirPrefix(void) { return gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "shaders/class"); diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h index dffe2a3dc..d41fb5f78 100644 --- a/indra/newview/llviewershadermgr.h +++ b/indra/newview/llviewershadermgr.h @@ -60,6 +60,7 @@ public: BOOL loadShadersWater(); BOOL loadShadersInterface(); BOOL loadShadersWindLight(); + BOOL loadTransformShaders(); std::vector mVertexShaderLevel; S32 mMaxAvatarShaderLevel; @@ -75,6 +76,7 @@ public: SHADER_WINDLIGHT, SHADER_WATER, SHADER_DEFERRED, + SHADER_TRANSFORM, SHADER_COUNT }; @@ -227,8 +229,15 @@ inline bool operator != (LLViewerShaderMgr::shader_iter const & a, LLViewerShade extern LLVector4 gShinyOrigin; +//transform shaders +extern LLGLSLShader gTransformPositionProgram; +extern LLGLSLShader gTransformTexCoordProgram; +extern LLGLSLShader gTransformNormalProgram; +extern LLGLSLShader gTransformColorProgram; +extern LLGLSLShader gTransformBinormalProgram; //utility shaders extern LLGLSLShader gOcclusionProgram; +extern LLGLSLShader gOcclusionCubeProgram; extern LLGLSLShader gCustomAlphaProgram; extern LLGLSLShader gGlowCombineProgram; extern LLGLSLShader gSplatTextureRectProgram; @@ -348,6 +357,7 @@ extern LLGLSLShader gDeferredBlurLightProgram; extern LLGLSLShader gDeferredAvatarProgram; extern LLGLSLShader gDeferredSoftenProgram; extern LLGLSLShader gDeferredShadowProgram; +extern LLGLSLShader gDeferredShadowCubeProgram; extern LLGLSLShader gDeferredShadowAlphaMaskProgram; extern LLGLSLShader gDeferredPostProgram; extern LLGLSLShader gDeferredCoFProgram; diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 5e6bb2bc0..833d6412d 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -178,6 +178,7 @@ #include "llviewershadermgr.h" #include "llviewerstats.h" #include "llvoavatarself.h" +#include "llvopartgroup.h" #include "llvovolume.h" #include "llworld.h" #include "llworldmapview.h" @@ -4824,6 +4825,8 @@ void LLViewerWindow::stopGL(BOOL save_state) LLVOAvatar::destroyGL(); stop_glerror(); + LLVOPartGroup::destroyGL(); + LLViewerDynamicTexture::destroyGL(); stop_glerror(); @@ -4876,6 +4879,7 @@ void LLViewerWindow::restoreGL(const std::string& progress_message) gBumpImageList.restoreGL(); LLViewerDynamicTexture::restoreGL(); LLVOAvatar::restoreGL(); + LLVOPartGroup::restoreGL(); gResizeScreenTexture = TRUE; gWindowResized = TRUE; @@ -4903,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"), @@ -5515,8 +5521,10 @@ void LLPickInfo::getSurfaceInfo() if (objectp->mDrawable.notNull() && mObjectFace > -1) { LLFace* facep = objectp->mDrawable->getFace(mObjectFace); - - mUVCoords = facep->surfaceToTexture(mSTCoords, mIntersection, mNormal); + if (facep) + { + mUVCoords = facep->surfaceToTexture(mSTCoords, mIntersection, mNormal); + } } // and XY coords: diff --git a/indra/newview/llvlmanager.cpp b/indra/newview/llvlmanager.cpp index 07ef26266..b586ab673 100644 --- a/indra/newview/llvlmanager.cpp +++ b/indra/newview/llvlmanager.cpp @@ -100,7 +100,9 @@ void LLVLManager::unpackData(const S32 num_packets) } else if (CLOUD_LAYER_CODE == datap->mType) { +#if ENABLE_CLASSIC_CLOUDS datap->mRegionp->mCloudLayer.decompress(bit_pack, &goph); +#endif } } diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 2d854a0d9..5c4d540ea 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -618,6 +618,10 @@ SHClientTagMgr::SHClientTagMgr() gSavedSettings.getControl("AscentFriendColor")->getSignal()->connect(boost::bind(&LLVOAvatar::invalidateNameTags)); gSavedSettings.getControl("AscentMutedColor")->getSignal()->connect(boost::bind(&LLVOAvatar::invalidateNameTags)); + gSavedSettings.getControl("AscentUseCustomTag")->getSignal()->connect(boost::bind(&SHClientTagMgr::updateAgentAvatarTag, this)); + gSavedSettings.getControl("AscentCustomTagColor")->getSignal()->connect(boost::bind(&SHClientTagMgr::updateAgentAvatarTag, this)); + gSavedSettings.getControl("AscentCustomTagLabel")->getSignal()->connect(boost::bind(&SHClientTagMgr::updateAgentAvatarTag, this)); + if(!getIsEnabled()) return; @@ -627,9 +631,6 @@ SHClientTagMgr::SHClientTagMgr() //These only matter to the agent avatar. Don't iterate over everything. gSavedSettings.getControl("AscentUseTag")->getSignal()->connect(boost::bind(&SHClientTagMgr::updateAgentAvatarTag, this)); - gSavedSettings.getControl("AscentUseCustomTag")->getSignal()->connect(boost::bind(&SHClientTagMgr::updateAgentAvatarTag, this)); - gSavedSettings.getControl("AscentCustomTagColor")->getSignal()->connect(boost::bind(&SHClientTagMgr::updateAgentAvatarTag, this)); - gSavedSettings.getControl("AscentCustomTagLabel")->getSignal()->connect(boost::bind(&SHClientTagMgr::updateAgentAvatarTag, this)); gSavedSettings.getControl("AscentReportClientUUID")->getSignal()->connect(boost::bind(&SHClientTagMgr::updateAgentAvatarTag, this)); //Fire off a AgentSetAppearance update if these change. @@ -727,9 +728,6 @@ void SHClientTagMgr::updateAgentAvatarTag() } const LLSD SHClientTagMgr::generateClientTag(const LLVOAvatar* pAvatar) const { - if(!getIsEnabled()) - return LLSD(); - static const LLCachedControl avatar_name_color(gColors,"AvatarNameColor",LLColor4(LLColor4U(251, 175, 93, 255)) ); LLUUID id; @@ -748,6 +746,10 @@ const LLSD SHClientTagMgr::generateClientTag(const LLVOAvatar* pAvatar) const info.insert("color", ascent_custom_tag_color.get().getValue()); return info; } + else if(!getIsEnabled()) + { + return LLSD(); + } else if (ascent_use_tag) { id.set(ascent_report_client_uuid,false); @@ -755,6 +757,9 @@ const LLSD SHClientTagMgr::generateClientTag(const LLVOAvatar* pAvatar) const } else { + if(!getIsEnabled()) + return LLSD(); + LLTextureEntry* pTextureEntry = pAvatar->getTE(TEX_HEAD_BODYPAINT); if (!pTextureEntry) return LLSD(); @@ -1318,7 +1323,7 @@ void LLVOAvatar::deleteLayerSetCaches(bool clearAll) } if (mBakedTextureDatas[i].mMaskTexName) { - glDeleteTextures(1, (GLuint*)&(mBakedTextureDatas[i].mMaskTexName)); + LLImageGL::deleteTextures(LLTexUnit::TT_TEXTURE, 0, -1, 1, (GLuint*)&(mBakedTextureDatas[i].mMaskTexName)); mBakedTextureDatas[i].mMaskTexName = 0 ; } } @@ -2501,11 +2506,17 @@ void LLVOAvatar::releaseMeshData() if (mDrawable.notNull()) { LLFace* facep = mDrawable->getFace(0); - facep->setSize(0, 0); - for(S32 i = mNumInitFaces ; i < mDrawable->getNumFaces(); i++) + if (facep) { - facep = mDrawable->getFace(i); facep->setSize(0, 0); + for(S32 i = mNumInitFaces ; i < mDrawable->getNumFaces(); i++) + { + facep = mDrawable->getFace(i); + if (facep) + { + facep->setSize(0, 0); + } + } } } @@ -2590,15 +2601,20 @@ void LLVOAvatar::updateMeshData() part_index-- ; } - LLFace* facep ; - if(f_num < mDrawable->getNumFaces()) + LLFace* facep = NULL; + if(f_num < mDrawable->getNumFaces()) { facep = mDrawable->getFace(f_num); } else { - facep = mDrawable->addFace(mDrawable->getFace(0)->getPool(), mDrawable->getFace(0)->getTexture()) ; + facep = mDrawable->getFace(0); + if (facep) + { + facep = mDrawable->addFace(facep->getPool(), facep->getTexture()) ; + } } + if (!facep) continue; // resize immediately facep->setSize(num_vertices, num_indices); @@ -2937,6 +2953,7 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) idleUpdateNameTag( root_pos_last ); idleUpdateRenderCost(); + return TRUE; } @@ -4835,10 +4852,14 @@ U32 LLVOAvatar::renderSkinned(EAvatarRenderPass pass) mNeedsSkin = FALSE; mLastSkinTime = gFrameTimeSeconds; - LLVertexBuffer* vb = mDrawable->getFace(0)->getVertexBuffer(); - if (vb) + LLFace * face = mDrawable->getFace(0); + if (face) { - vb->flush(); + LLVertexBuffer* vb = face->getVertexBuffer(); + if (vb) + { + vb->flush(); + } } } } @@ -8301,7 +8322,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys ) // (isTextureDefined(TEX_HAIR_BAKED) ? "HAIR" : "hair " ) << (getTEImage(TEX_HAIR_BAKED)->getID()) << std::endl << // (isTextureDefined(TEX_EYES_BAKED) ? "EYES" : "eyes" ) << (getTEImage(TEX_EYES_BAKED)->getID()) << llendl ; - if( !is_first_appearance_message ) + if( is_first_appearance_message ) { onFirstTEMessageReceived(); } @@ -8483,12 +8504,12 @@ 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; } U32 gl_name; - LLImageGL::generateTextures(1, &gl_name ); + LLImageGL::generateTextures(LLTexUnit::TT_TEXTURE, GL_ALPHA8, 1, &gl_name ); stop_glerror(); gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, gl_name); @@ -8525,7 +8546,7 @@ void LLVOAvatar::onBakedTextureMasksLoaded( BOOL success, LLViewerFetchedTexture maskData->mLastDiscardLevel = discard_level; if (self->mBakedTextureDatas[baked_index].mMaskTexName) { - LLImageGL::deleteTextures(1, &(self->mBakedTextureDatas[baked_index].mMaskTexName)); + LLImageGL::deleteTextures(LLTexUnit::TT_TEXTURE, 0, -1, 1, &(self->mBakedTextureDatas[baked_index].mMaskTexName)); } self->mBakedTextureDatas[baked_index].mMaskTexName = gl_name; found_texture_id = true; @@ -9379,7 +9400,7 @@ BOOL LLVOAvatar::updateLOD() BOOL res = updateJointLODs(); LLFace* facep = mDrawable->getFace(0); - if (!facep->getVertexBuffer()) + if (!facep || !facep->getVertexBuffer()) { dirtyMesh(2); } diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index ff0eed918..fdfc565e3 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -2696,7 +2696,7 @@ void LLVOAvatarSelf::deleteScratchTextures() namep; namep = sScratchTexNames.getNextData() ) { - LLImageGL::deleteTextures(1, (U32 *)namep ); + LLImageGL::deleteTextures(LLTexUnit::TT_TEXTURE, 0, -1, 1, (U32 *)namep ); stop_glerror(); } diff --git a/indra/newview/llvoclouds.cpp b/indra/newview/llvoclouds.cpp index 18e597b15..b63103acb 100644 --- a/indra/newview/llvoclouds.cpp +++ b/indra/newview/llvoclouds.cpp @@ -52,6 +52,7 @@ #include "pipeline.h" #include "llspatialpartition.h" +#if ENABLE_CLASSIC_CLOUDS LLUUID gCloudTextureID = IMG_CLOUD_POOF; @@ -119,29 +120,48 @@ static LLFastTimer::DeclareTimer FTM_UPDATE_CLOUDS("Cloud Update"); BOOL LLVOClouds::updateGeometry(LLDrawable *drawable) { LLFastTimer ftm(FTM_UPDATE_CLOUDS); - if (!(gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS))) - { - return TRUE; - } - if (drawable->isVisible()) + dirtySpatialGroup(); + + S32 num_parts = mCloudGroupp->getNumPuffs(); + LLFace *facep; + LLSpatialGroup* group = drawable->getSpatialGroup(); + if (!group && num_parts) + { + drawable->movePartition(); + group = drawable->getSpatialGroup(); + } + + if (group && group->isVisible()) { dirtySpatialGroup(TRUE); } - LLFace *facep; - - S32 num_faces = mCloudGroupp->getNumPuffs(); - - if (num_faces > drawable->getNumFaces()) + if (!num_parts) { - drawable->setNumFacesFast(num_faces, NULL, getTEImage(0)); + if (group && drawable->getNumFaces()) + { + group->setState(LLSpatialGroup::GEOM_DIRTY); + } + drawable->setNumFaces(0, NULL, getTEImage(0)); + LLPipeline::sCompiles++; + return TRUE; + } + + if (!(gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS))) + { + return TRUE; + } + + if (num_parts > drawable->getNumFaces()) + { + drawable->setNumFacesFast(num_parts+num_parts/4, NULL, getTEImage(0)); } mDepth = (getPositionAgent()-LLViewerCamera::getInstance()->getOrigin())*LLViewerCamera::getInstance()->getAtAxis(); S32 face_indx = 0; - for ( ; face_indx < num_faces; face_indx++) + for ( ; face_indx < num_parts; face_indx++) { facep = drawable->getFace(face_indx); if (!facep) @@ -150,16 +170,18 @@ BOOL LLVOClouds::updateGeometry(LLDrawable *drawable) continue; } + facep->setTEOffset(face_indx); facep->setSize(4, 6); - facep->setTEOffset(face_indx); - facep->setTexture(getTEImage(0)); + facep->setViewerObject(this); + const LLCloudPuff &puff = mCloudGroupp->getPuff(face_indx); const LLVector3 puff_pos_agent = gAgent.getPosAgentFromGlobal(puff.getPositionGlobal()); facep->mCenterLocal = puff_pos_agent; /// Update cloud color based on sun color. LLColor4 float_color(LLColor3(gSky.getSunDiffuseColor() + gSky.getSunAmbientColor()),puff.getAlpha()); facep->setFaceColor(float_color); + facep->setTexture(getTEImage(0)); } for ( ; face_indx < drawable->getNumFaces(); face_indx++) { @@ -174,8 +196,8 @@ BOOL LLVOClouds::updateGeometry(LLDrawable *drawable) facep->setSize(0,0); } - drawable->movePartition(); - + mDrawable->movePartition(); + LLPipeline::sCompiles++; return TRUE; } @@ -212,8 +234,6 @@ void LLVOClouds::getGeometry(S32 idx, color.setVec(float_color); facep->setFaceColor(float_color); - U32 vert_offset = facep->getGeomIndex(); - LLVector4a part_pos_agent; part_pos_agent.load3(facep->mCenterLocal.mV); LLVector4a at; @@ -250,33 +270,15 @@ void LLVOClouds::getGeometry(S32 idx, verticesp->setAdd(ppamu, right); (*verticesp++).getF32ptr()[3] = 0.f; - // *verticesp++ = puff_pos_agent - right + up; - // *verticesp++ = puff_pos_agent - right - up; - // *verticesp++ = puff_pos_agent + right + up; - // *verticesp++ = puff_pos_agent + right - up; - *colorsp++ = color; *colorsp++ = color; *colorsp++ = color; *colorsp++ = color; - *texcoordsp++ = LLVector2(0.f, 1.f); - *texcoordsp++ = LLVector2(0.f, 0.f); - *texcoordsp++ = LLVector2(1.f, 1.f); - *texcoordsp++ = LLVector2(1.f, 0.f); - *normalsp++ = normal; *normalsp++ = normal; *normalsp++ = normal; *normalsp++ = normal; - - *indicesp++ = vert_offset + 0; - *indicesp++ = vert_offset + 1; - *indicesp++ = vert_offset + 2; - - *indicesp++ = vert_offset + 1; - *indicesp++ = vert_offset + 3; - *indicesp++ = vert_offset + 2; } U32 LLVOClouds::getPartitionType() const @@ -302,3 +304,4 @@ LLCloudPartition::LLCloudPartition() mPartitionType = LLViewerRegion::PARTITION_CLOUD; } +#endif diff --git a/indra/newview/llvoclouds.h b/indra/newview/llvoclouds.h index dfe664beb..685400f32 100644 --- a/indra/newview/llvoclouds.h +++ b/indra/newview/llvoclouds.h @@ -42,7 +42,7 @@ class LLViewerCloudGroup; class LLCloudGroup; - +#if ENABLE_CLASSIC_CLOUDS class LLVOClouds : public LLAlphaObject { public: @@ -82,4 +82,5 @@ protected: extern LLUUID gCloudTextureID; +#endif #endif // LL_VO_CLOUDS_H diff --git a/indra/newview/llvograss.cpp b/indra/newview/llvograss.cpp index 1fa3fcac6..5a58ae770 100644 --- a/indra/newview/llvograss.cpp +++ b/indra/newview/llvograss.cpp @@ -41,6 +41,7 @@ #include "llnotificationsutil.h" #include "llviewerwindow.h" #include "lldrawable.h" +#include "lldrawpoolalpha.h" #include "llface.h" #include "llsky.h" #include "llsurface.h" @@ -403,8 +404,10 @@ BOOL LLVOGrass::updateLOD() { mNumBlades <<= 1; } - - face->setSize(mNumBlades*8, mNumBlades*12); + if (face) + { + face->setSize(mNumBlades*8, mNumBlades*12); + } gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL, TRUE); } else if (num_blades <= (mNumBlades >> 1)) @@ -414,7 +417,10 @@ BOOL LLVOGrass::updateLOD() mNumBlades >>=1; } - face->setSize(mNumBlades*8, mNumBlades*12); + if (face) + { + face->setSize(mNumBlades*8, mNumBlades*12); + } gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL, TRUE); return TRUE; } @@ -472,14 +478,16 @@ void LLVOGrass::plantBlades() } LLFace *face = mDrawable->getFace(0); + if (face) + { + face->setTexture(getTEImage(0)); + face->setState(LLFace::GLOBAL); + face->setSize(mNumBlades * 8, mNumBlades * 12); + face->setVertexBuffer(NULL); + face->setTEOffset(0); + face->mCenterLocal = mPosition + mRegionp->getOriginAgent(); + } - face->setTexture(getTEImage(0)); - face->setState(LLFace::GLOBAL); - face->setSize(mNumBlades * 8, mNumBlades * 12); - face->setVertexBuffer(NULL); - face->setTEOffset(0); - face->mCenterLocal = mPosition + mRegionp->getOriginAgent(); - mDepth = (face->mCenterLocal - LLViewerCamera::getInstance()->getOrigin())*LLViewerCamera::getInstance()->getAtAxis(); mDrawable->setPosition(face->mCenterLocal); mDrawable->movePartition(); @@ -509,6 +517,8 @@ void LLVOGrass::getGeometry(S32 idx, LLColor4U color(255,255,255,255); LLFace *face = mDrawable->getFace(idx); + if (!face) + return; F32 width = sSpeciesTable[mSpecies]->mBladeSizeX; F32 height = sSpeciesTable[mSpecies]->mBladeSizeY; @@ -617,6 +627,7 @@ U32 LLVOGrass::getPartitionType() const } LLGrassPartition::LLGrassPartition() +: LLSpatialPartition(LLDrawPoolAlpha::VERTEX_DATA_MASK | LLVertexBuffer::MAP_TEXTURE_INDEX, TRUE, GL_STREAM_DRAW_ARB) { mDrawableType = LLPipeline::RENDER_TYPE_GRASS; mPartitionType = LLViewerRegion::PARTITION_GRASS; @@ -627,6 +638,143 @@ LLGrassPartition::LLGrassPartition() mBufferUsage = GL_DYNAMIC_DRAW_ARB; } +void LLGrassPartition::addGeometryCount(LLSpatialGroup* group, U32& vertex_count, U32& index_count) +{ + group->mBufferUsage = mBufferUsage; + + mFaceList.clear(); + + LLViewerCamera* camera = LLViewerCamera::getInstance(); + for (LLSpatialGroup::element_iter i = group->getData().begin(); i != group->getData().end(); ++i) + { + LLDrawable* drawablep = *i; + + if (drawablep->isDead()) + { + continue; + } + + LLAlphaObject* obj = (LLAlphaObject*) drawablep->getVObj().get(); + obj->mDepth = 0.f; + + if (drawablep->isAnimating()) + { + group->mBufferUsage = GL_STREAM_DRAW_ARB; + } + + U32 count = 0; + for (S32 j = 0; j < drawablep->getNumFaces(); ++j) + { + drawablep->updateFaceSize(j); + + LLFace* facep = drawablep->getFace(j); + if ( !facep || !facep->hasGeometry()) + { + continue; + } + + if ((facep->getGeomCount() + vertex_count) <= 65536) + { + count++; + facep->mDistance = (facep->mCenterLocal - camera->getOrigin()) * camera->getAtAxis(); + obj->mDepth += facep->mDistance; + + mFaceList.push_back(facep); + vertex_count += facep->getGeomCount(); + index_count += facep->getIndicesCount(); + llassert(facep->getIndicesCount() < 65536); + } + else + { + facep->clearVertexBuffer(); + } + } + + obj->mDepth /= count; + } +} + +static LLFastTimer::DeclareTimer FTM_REBUILD_GRASS_VB("Grass VB"); + +void LLGrassPartition::getGeometry(LLSpatialGroup* group) +{ + LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); + LLFastTimer ftm(FTM_REBUILD_GRASS_VB); + + std::sort(mFaceList.begin(), mFaceList.end(), LLFace::CompareDistanceGreater()); + + U32 index_count = 0; + U32 vertex_count = 0; + + group->clearDrawMap(); + + LLVertexBuffer* buffer = group->mVertexBuffer; + + LLStrider indicesp; + LLStrider verticesp; + LLStrider normalsp; + LLStrider texcoordsp; + LLStrider colorsp; + + buffer->getVertexStrider(verticesp); + buffer->getNormalStrider(normalsp); + buffer->getColorStrider(colorsp); + buffer->getTexCoord0Strider(texcoordsp); + buffer->getIndexStrider(indicesp); + + LLSpatialGroup::drawmap_elem_t& draw_vec = group->mDrawMap[mRenderPass]; + + for (std::vector::iterator i = mFaceList.begin(); i != mFaceList.end(); ++i) + { + LLFace* facep = *i; + LLAlphaObject* object = (LLAlphaObject*) facep->getViewerObject(); + facep->setGeomIndex(vertex_count); + facep->setIndicesIndex(index_count); + facep->setVertexBuffer(buffer); + facep->setPoolType(LLDrawPool::POOL_ALPHA); + object->getGeometry(facep->getTEOffset(), verticesp, normalsp, texcoordsp, colorsp, indicesp); + + vertex_count += facep->getGeomCount(); + index_count += facep->getIndicesCount(); + + S32 idx = draw_vec.size()-1; + + BOOL fullbright = facep->isState(LLFace::FULLBRIGHT); + F32 vsize = facep->getVirtualSize(); + + if (idx >= 0 && draw_vec[idx]->mEnd == facep->getGeomIndex()-1 && + draw_vec[idx]->mTexture == facep->getTexture() && + (U16) (draw_vec[idx]->mEnd - draw_vec[idx]->mStart + facep->getGeomCount()) <= (U32) gGLManager.mGLMaxVertexRange && + //draw_vec[idx]->mCount + facep->getIndicesCount() <= (U32) gGLManager.mGLMaxIndexRange && + draw_vec[idx]->mEnd - draw_vec[idx]->mStart + facep->getGeomCount() < 4096 && + draw_vec[idx]->mFullbright == fullbright) + { + draw_vec[idx]->mCount += facep->getIndicesCount(); + draw_vec[idx]->mEnd += facep->getGeomCount(); + draw_vec[idx]->mVSize = llmax(draw_vec[idx]->mVSize, vsize); + } + else + { + U32 start = facep->getGeomIndex(); + U32 end = start + facep->getGeomCount()-1; + U32 offset = facep->getIndicesStart(); + U32 count = facep->getIndicesCount(); + LLDrawInfo* info = new LLDrawInfo(start,end,count,offset,facep->getTexture(), + //facep->getTexture(), + buffer, fullbright); + info->mExtents[0] = group->mObjectExtents[0]; + info->mExtents[1] = group->mObjectExtents[1]; + info->mVSize = vsize; + draw_vec.push_back(info); + //for alpha sorting + facep->setDrawInfo(info); + } + } + + buffer->flush(); + mFaceList.clear(); +} + // virtual void LLVOGrass::updateDrawable(BOOL force_damped) { @@ -713,7 +861,6 @@ BOOL LLVOGrass::lineSegmentIntersect(const LLVector3& start, const LLVector3& en position.mV[2] += blade_height; v[3] = v1 = position + mRegionp->getOriginAgent(); - F32 a,b,t; BOOL hit = FALSE; diff --git a/indra/newview/llvoground.cpp b/indra/newview/llvoground.cpp index ebb7bfda7..3300cb697 100644 --- a/indra/newview/llvoground.cpp +++ b/indra/newview/llvoground.cpp @@ -88,6 +88,7 @@ LLDrawable *LLVOGround::createDrawable(LLPipeline *pipeline) return mDrawable; } +// TO DO - this always returns TRUE, BOOL LLVOGround::updateGeometry(LLDrawable *drawable) { LLStrider verticesp; @@ -102,6 +103,8 @@ BOOL LLVOGround::updateGeometry(LLDrawable *drawable) if (drawable->getNumFaces() < 1) drawable->addFace(poolp, NULL); face = drawable->getFace(0); + if (!face) + return TRUE; if (!face->getVertexBuffer()) { diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp index c6a50207f..434c8ca64 100644 --- a/indra/newview/llvopartgroup.cpp +++ b/indra/newview/llvopartgroup.cpp @@ -49,11 +49,149 @@ #include "llviewerregion.h" #include "pipeline.h" #include "llspatialpartition.h" +#include "llviewerobjectlist.h" const F32 MAX_PART_LIFETIME = 120.f; extern U64 gFrameTime; +LLPointer LLVOPartGroup::sVB = NULL; +S32 LLVOPartGroup::sVBSlotFree[]; +S32* LLVOPartGroup::sVBSlotCursor = NULL; + +//static +void LLVOPartGroup::restoreGL() +{ + for (S32 i = 0; i < LL_MAX_PARTICLE_COUNT; ++i) + { + sVBSlotFree[i] = i; + } + + sVBSlotCursor = sVBSlotFree; + + sVB = new LLVertexBuffer(VERTEX_DATA_MASK, GL_STREAM_DRAW_ARB); + U32 count = LL_MAX_PARTICLE_COUNT; + sVB->allocateBuffer(count*4, count*6, true); + + //indices and texcoords are always the same, set once + LLStrider indicesp; + + LLStrider verticesp; + + sVB->getIndexStrider(indicesp); + sVB->getVertexStrider(verticesp); + + LLVector4a v; + v.set(0,0,0,0); + + + U16 vert_offset = 0; + + for (U32 i = 0; i < LL_MAX_PARTICLE_COUNT; i++) + { + *indicesp++ = vert_offset + 0; + *indicesp++ = vert_offset + 1; + *indicesp++ = vert_offset + 2; + + *indicesp++ = vert_offset + 1; + *indicesp++ = vert_offset + 3; + *indicesp++ = vert_offset + 2; + + *verticesp++ = v; + + vert_offset += 4; + } + + LLStrider texcoordsp; + sVB->getTexCoord0Strider(texcoordsp); + + for (U32 i = 0; i < LL_MAX_PARTICLE_COUNT; i++) + { + *texcoordsp++ = LLVector2(0.f, 1.f); + *texcoordsp++ = LLVector2(0.f, 0.f); + *texcoordsp++ = LLVector2(1.f, 1.f); + *texcoordsp++ = LLVector2(1.f, 0.f); + } + + sVB->flush(); + +} + +//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; +} + +//static +S32 LLVOPartGroup::findAvailableVBSlot() +{ + if (sVBSlotCursor >= sVBSlotFree+LL_MAX_PARTICLE_COUNT) + { //no more available slots + return -1; + } + + S32 ret = *sVBSlotCursor; + sVBSlotCursor++; + + + return ret; +} + +bool ll_is_part_idx_allocated(S32 idx, S32* start, S32* end) +{ + while (start < end) + { + if (*start == idx) + { //not allocated (in free list) + return false; + } + ++start; + } + + //allocated (not in free list) + return true; +} + +//static +void LLVOPartGroup::freeVBSlot(S32 idx) +{ + llassert(idx < LL_MAX_PARTICLE_COUNT && idx >= 0); + llassert(sVBSlotCursor > sVBSlotFree); + llassert(ll_is_part_idx_allocated(idx, sVBSlotCursor, sVBSlotFree+LL_MAX_PARTICLE_COUNT)); + + if (sVBSlotCursor > sVBSlotFree) + { + sVBSlotCursor--; + *sVBSlotCursor = idx; + } +} LLVOPartGroup::LLVOPartGroup(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp) : LLAlphaObject(id, pcode, regionp), mViewerPartGroupp(NULL) @@ -287,9 +425,6 @@ void LLVOPartGroup::getGeometry(S32 idx, const LLViewerPart &part = *((LLViewerPart*) (mViewerPartGroupp->mParticles[idx])); - U32 vert_offset = mDrawable->getFace(idx)->getGeomIndex(); - - LLVector4a part_pos_agent; part_pos_agent.load3(part.mPosAgent.mV); LLVector4a camera_agent; @@ -361,33 +496,18 @@ void LLVOPartGroup::getGeometry(S32 idx, verticesp->setAdd(ppamu, right); (*verticesp++).getF32ptr()[3] = 0.f; - // *verticesp++ = part_pos_agent + up - right; - // *verticesp++ = part_pos_agent - up - right; - // *verticesp++ = part_pos_agent + up + right; - // *verticesp++ = part_pos_agent - up + right; - *colorsp++ = part.mColor; *colorsp++ = part.mColor; *colorsp++ = part.mColor; *colorsp++ = part.mColor; - *texcoordsp++ = LLVector2(0.f, 1.f); - *texcoordsp++ = LLVector2(0.f, 0.f); - *texcoordsp++ = LLVector2(1.f, 1.f); - *texcoordsp++ = LLVector2(1.f, 0.f); - - *normalsp++ = normal; - *normalsp++ = normal; - *normalsp++ = normal; - *normalsp++ = normal; - - *indicesp++ = vert_offset + 0; - *indicesp++ = vert_offset + 1; - *indicesp++ = vert_offset + 2; - - *indicesp++ = vert_offset + 1; - *indicesp++ = vert_offset + 3; - *indicesp++ = vert_offset + 2; + if (!(part.mFlags & LLPartData::LL_PART_EMISSIVE_MASK)) + { //not fullbright, needs normal + *normalsp++ = normal; + *normalsp++ = normal; + *normalsp++ = normal; + *normalsp++ = normal; + } } U32 LLVOPartGroup::getPartitionType() const @@ -412,6 +532,49 @@ LLHUDParticlePartition::LLHUDParticlePartition() : mPartitionType = LLViewerRegion::PARTITION_HUD_PARTICLE; } +static LLFastTimer::DeclareTimer FTM_REBUILD_PARTICLE_VBO("Particle VBO"); + +void LLParticlePartition::rebuildGeom(LLSpatialGroup* group) +{ + if (group->isDead() || !group->isState(LLSpatialGroup::GEOM_DIRTY)) + { + return; + } + + if (group->changeLOD()) + { + group->mLastUpdateDistance = group->mDistance; + group->mLastUpdateViewAngle = group->mViewAngle; + } + + LLFastTimer ftm(FTM_REBUILD_PARTICLE_VBO); + + group->clearDrawMap(); + + //get geometry count + U32 index_count = 0; + U32 vertex_count = 0; + + addGeometryCount(group, vertex_count, index_count); + + + if (vertex_count > 0 && index_count > 0) + { + group->mBuilt = 1.f; + //use one vertex buffer for all groups + group->mVertexBuffer = LLVOPartGroup::sVB; + getGeometry(group); + } + else + { + group->mVertexBuffer = NULL; + group->mBufferMap.clear(); + } + + group->mLastUpdateTime = gFrameTimeSeconds; + group->clearState(LLSpatialGroup::GEOM_DIRTY); +} + void LLParticlePartition::addGeometryCount(LLSpatialGroup* group, U32& vertex_count, U32& index_count) { group->mBufferUsage = mBufferUsage; @@ -431,11 +594,6 @@ void LLParticlePartition::addGeometryCount(LLSpatialGroup* group, U32& vertex_co LLAlphaObject* obj = (LLAlphaObject*) drawablep->getVObj().get(); obj->mDepth = 0.f; - if (drawablep->isAnimating()) - { - group->mBufferUsage = GL_STREAM_DRAW_ARB; - } - U32 count = 0; for (S32 j = 0; j < drawablep->getNumFaces(); ++j) { @@ -447,36 +605,28 @@ void LLParticlePartition::addGeometryCount(LLSpatialGroup* group, U32& vertex_co continue; } - if ((facep->getGeomCount() + vertex_count) <= 65536) - { - count++; - facep->mDistance = (facep->mCenterLocal - camera->getOrigin()) * camera->getAtAxis(); - obj->mDepth += facep->mDistance; + vertex_count += facep->getGeomCount(); + index_count += facep->getIndicesCount(); + + count++; + facep->mDistance = (facep->mCenterLocal - camera->getOrigin()) * camera->getAtAxis(); + obj->mDepth += facep->mDistance; - mFaceList.push_back(facep); - vertex_count += facep->getGeomCount(); - index_count += facep->getIndicesCount(); - llassert(facep->getIndicesCount() < 65536); - } - else - { - facep->clearVertexBuffer(); - } + mFaceList.push_back(facep); + llassert(facep->getIndicesCount() < 65536); } obj->mDepth /= count; } } -static LLFastTimer::DeclareTimer FTM_REBUILD_GRASS_VB("Grass VB"); -static LLFastTimer::DeclareTimer FTM_REBUILD_PARTICLE_VB("Particle VB"); + +static LLFastTimer::DeclareTimer FTM_REBUILD_PARTICLE_GEOM("Particle Geom"); void LLParticlePartition::getGeometry(LLSpatialGroup* group) { LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); - LLFastTimer ftm(mDrawableType == LLPipeline::RENDER_TYPE_GRASS ? - FTM_REBUILD_GRASS_VB : - FTM_REBUILD_PARTICLE_VB); + LLFastTimer ftm(FTM_REBUILD_PARTICLE_GEOM); std::sort(mFaceList.begin(), mFaceList.end(), LLFace::CompareDistanceGreater()); @@ -496,21 +646,44 @@ void LLParticlePartition::getGeometry(LLSpatialGroup* group) buffer->getVertexStrider(verticesp); buffer->getNormalStrider(normalsp); buffer->getColorStrider(colorsp); - buffer->getTexCoord0Strider(texcoordsp); - buffer->getIndexStrider(indicesp); - + LLSpatialGroup::drawmap_elem_t& draw_vec = group->mDrawMap[mRenderPass]; for (std::vector::iterator i = mFaceList.begin(); i != mFaceList.end(); ++i) { LLFace* facep = *i; LLAlphaObject* object = (LLAlphaObject*) facep->getViewerObject(); - facep->setGeomIndex(vertex_count); - facep->setIndicesIndex(index_count); - facep->setVertexBuffer(buffer); - facep->setPoolType(LLDrawPool::POOL_ALPHA); - object->getGeometry(facep->getTEOffset(), verticesp, normalsp, texcoordsp, colorsp, indicesp); + + if (facep->getIndicesStart() == 0xFFFFFFFF) + { //set the indices of this face + S32 idx = LLVOPartGroup::findAvailableVBSlot(); + if (idx >= 0) + { + facep->setGeomIndex(idx*4); + facep->setIndicesIndex(idx*6); + facep->setVertexBuffer(LLVOPartGroup::sVB); + facep->setPoolType(LLDrawPool::POOL_ALPHA); + } + else + { + continue; //out of space in particle buffer + } + } + + S32 geom_idx = (S32) facep->getGeomIndex(); + + LLStrider cur_idx = indicesp + facep->getIndicesStart(); + LLStrider cur_vert = verticesp + geom_idx; + LLStrider cur_norm = normalsp + geom_idx; + LLStrider cur_tc = texcoordsp + geom_idx; + LLStrider cur_col = colorsp + geom_idx; + + object->getGeometry(facep->getTEOffset(), cur_vert, cur_norm, cur_tc, cur_col, cur_idx); + llassert(facep->getGeomCount() == 4); + llassert(facep->getIndicesCount() == 6); + + vertex_count += facep->getGeomCount(); index_count += facep->getIndicesCount(); @@ -519,26 +692,39 @@ void LLParticlePartition::getGeometry(LLSpatialGroup* group) BOOL fullbright = facep->isState(LLFace::FULLBRIGHT); F32 vsize = facep->getVirtualSize(); - if (idx >= 0 && draw_vec[idx]->mEnd == facep->getGeomIndex()-1 && + bool batched = false; + + if (idx >= 0 && draw_vec[idx]->mTexture == facep->getTexture() && - (U16) (draw_vec[idx]->mEnd - draw_vec[idx]->mStart + facep->getGeomCount()) <= (U32) gGLManager.mGLMaxVertexRange && - //draw_vec[idx]->mCount + facep->getIndicesCount() <= (U32) gGLManager.mGLMaxIndexRange && - draw_vec[idx]->mEnd - draw_vec[idx]->mStart + facep->getGeomCount() < 4096 && draw_vec[idx]->mFullbright == fullbright) { - draw_vec[idx]->mCount += facep->getIndicesCount(); - draw_vec[idx]->mEnd += facep->getGeomCount(); - draw_vec[idx]->mVSize = llmax(draw_vec[idx]->mVSize, vsize); + if (draw_vec[idx]->mEnd == facep->getGeomIndex()-1) + { + batched = true; + draw_vec[idx]->mCount += facep->getIndicesCount(); + draw_vec[idx]->mEnd += facep->getGeomCount(); + draw_vec[idx]->mVSize = llmax(draw_vec[idx]->mVSize, vsize); + } + else if (draw_vec[idx]->mStart == facep->getGeomIndex()+facep->getGeomCount()+1) + { + batched = true; + draw_vec[idx]->mCount += facep->getIndicesCount(); + draw_vec[idx]->mStart -= facep->getGeomCount(); + draw_vec[idx]->mOffset = facep->getIndicesStart(); + draw_vec[idx]->mVSize = llmax(draw_vec[idx]->mVSize, vsize); + } } - else + + + if (!batched) { U32 start = facep->getGeomIndex(); U32 end = start + facep->getGeomCount()-1; U32 offset = facep->getIndicesStart(); U32 count = facep->getIndicesCount(); - LLDrawInfo* info = new LLDrawInfo(start,end,count,offset,facep->getTexture(), + LLDrawInfo* info = new LLDrawInfo(start,end,count,offset,facep->getTexture(), //facep->getTexture(), - buffer, fullbright); + buffer, fullbright); info->mExtents[0] = group->mObjectExtents[0]; info->mExtents[1] = group->mObjectExtents[1]; info->mVSize = vsize; @@ -548,7 +734,6 @@ void LLParticlePartition::getGeometry(LLSpatialGroup* group) } } - buffer->flush(); mFaceList.clear(); } diff --git a/indra/newview/llvopartgroup.h b/indra/newview/llvopartgroup.h index f11289365..4c2e073d7 100644 --- a/indra/newview/llvopartgroup.h +++ b/indra/newview/llvopartgroup.h @@ -37,18 +37,32 @@ #include "v3math.h" #include "v3color.h" #include "llframetimer.h" +#include "llviewerpartsim.h" +#include "llvertexbuffer.h" class LLViewerPartGroup; class LLVOPartGroup : public LLAlphaObject { public: + + //vertex buffer for holding all particles + static LLPointer sVB; + static S32 sVBSlotFree[LL_MAX_PARTICLE_COUNT]; + static S32* sVBSlotCursor; + + static void restoreGL(); + static void destroyGL(); + static S32 findAvailableVBSlot(); + static void freeVBSlot(S32 idx); + enum { - VERTEX_DATA_MASK = (1 << LLVertexBuffer::TYPE_VERTEX) | - (1 << LLVertexBuffer::TYPE_NORMAL) | - (1 << LLVertexBuffer::TYPE_TEXCOORD0) | - (1 << LLVertexBuffer::TYPE_COLOR) + VERTEX_DATA_MASK = LLVertexBuffer::MAP_VERTEX | + LLVertexBuffer::MAP_NORMAL | + LLVertexBuffer::MAP_TEXCOORD0 | + LLVertexBuffer::MAP_COLOR | + LLVertexBuffer::MAP_TEXTURE_INDEX }; LLVOPartGroup(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp); diff --git a/indra/newview/llvosurfacepatch.cpp b/indra/newview/llvosurfacepatch.cpp index 610697742..a16b4adc9 100644 --- a/indra/newview/llvosurfacepatch.cpp +++ b/indra/newview/llvosurfacepatch.cpp @@ -302,18 +302,20 @@ void LLVOSurfacePatch::updateFaceSize(S32 idx) } LLFace* facep = mDrawable->getFace(idx); - - S32 num_vertices = 0; - S32 num_indices = 0; - - if (mLastStride) + if (facep) { - getGeomSizesMain(mLastStride, num_vertices, num_indices); - getGeomSizesNorth(mLastStride, mLastNorthStride, num_vertices, num_indices); - getGeomSizesEast(mLastStride, mLastEastStride, num_vertices, num_indices); - } + S32 num_vertices = 0; + S32 num_indices = 0; + + if (mLastStride) + { + getGeomSizesMain(mLastStride, num_vertices, num_indices); + getGeomSizesNorth(mLastStride, mLastNorthStride, num_vertices, num_indices); + getGeomSizesEast(mLastStride, mLastEastStride, num_vertices, num_indices); + } - facep->setSize(num_vertices, num_indices); + facep->setSize(num_vertices, num_indices); + } } BOOL LLVOSurfacePatch::updateLOD() @@ -328,30 +330,32 @@ void LLVOSurfacePatch::getGeometry(LLStrider &verticesp, LLStrider &indicesp) { LLFace* facep = mDrawable->getFace(0); + if (facep) + { + U32 index_offset = facep->getGeomIndex(); - U32 index_offset = facep->getGeomIndex(); - - updateMainGeometry(facep, - verticesp, - normalsp, - texCoords0p, - texCoords1p, - indicesp, - index_offset); - updateNorthGeometry(facep, - verticesp, - normalsp, - texCoords0p, - texCoords1p, - indicesp, - index_offset); - updateEastGeometry(facep, + updateMainGeometry(facep, verticesp, normalsp, texCoords0p, texCoords1p, indicesp, index_offset); + updateNorthGeometry(facep, + verticesp, + normalsp, + texCoords0p, + texCoords1p, + indicesp, + index_offset); + updateEastGeometry(facep, + verticesp, + normalsp, + texCoords0p, + texCoords1p, + indicesp, + index_offset); + } } void LLVOSurfacePatch::updateMainGeometry(LLFace *facep, @@ -870,7 +874,11 @@ void LLVOSurfacePatch::dirtyGeom() if (mDrawable) { gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL, TRUE); - mDrawable->getFace(0)->setVertexBuffer(NULL); + LLFace* facep = mDrawable->getFace(0); + if (facep) + { + facep->setVertexBuffer(NULL); + } mDrawable->movePartition(); } } diff --git a/indra/newview/llvotree.cpp b/indra/newview/llvotree.cpp index 39886e8fb..e50c11ced 100644 --- a/indra/newview/llvotree.cpp +++ b/indra/newview/llvotree.cpp @@ -58,7 +58,8 @@ #include "pipeline.h" #include "llspatialpartition.h" #include "llnotificationsutil.h" -#include "llviewerwindow.h" +#include "raytrace.h" +#include "llglslshader.h" extern LLPipeline gPipeline; @@ -504,11 +505,16 @@ BOOL LLVOTree::updateGeometry(LLDrawable *drawable) if(mTrunkLOD >= sMAX_NUM_TREE_LOD_LEVELS) //do not display the tree. { mReferenceBuffer = NULL ; - mDrawable->getFace(0)->setVertexBuffer(NULL); + LLFace * facep = drawable->getFace(0); + if (facep) + { + facep->setVertexBuffer(NULL); + } return TRUE ; } - if (mReferenceBuffer.isNull() || !mDrawable->getFace(0)->getVertexBuffer()) + if (mDrawable->getFace(0) && + (mReferenceBuffer.isNull() || !mDrawable->getFace(0)->getVertexBuffer())) { const F32 SRR3 = 0.577350269f; // sqrt(1/3) const F32 SRR2 = 0.707106781f; // sqrt(1/2) @@ -521,6 +527,7 @@ BOOL LLVOTree::updateGeometry(LLDrawable *drawable) S32 lod; LLFace *face = drawable->getFace(0); + if (!face) return TRUE; face->mCenterAgent = getPositionAgent(); face->mCenterLocal = face->mCenterAgent; @@ -894,6 +901,7 @@ void LLVOTree::updateMesh() calcNumVerts(vert_count, index_count, mTrunkLOD, stop_depth, mDepth, mTrunkDepth, mBranches); LLFace* facep = mDrawable->getFace(0); + if (!facep) return; LLVertexBuffer* buff = new LLVertexBuffer(LLDrawPoolTree::VERTEX_DATA_MASK, GL_STATIC_DRAW_ARB); buff->allocateBuffer(vert_count, index_count, TRUE); facep->setVertexBuffer(buff); diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 15489ce9b..d8b34bd30 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -39,6 +39,7 @@ #include "llviewercontrol.h" #include "lldir.h" #include "llflexibleobject.h" +#include "llfloatertools.h" #include "llmaterialtable.h" #include "llprimitive.h" #include "llvolume.h" @@ -50,6 +51,7 @@ #include "object_flags.h" #include "llagentconstants.h" #include "lldrawable.h" +#include "lldrawpoolavatar.h" #include "lldrawpoolbump.h" #include "llface.h" #include "llspatialpartition.h" @@ -68,13 +70,11 @@ #include "pipeline.h" #include "llsdutil.h" #include "llmatrix4a.h" -#include "llagent.h" -#include "lldrawpoolavatar.h" #include "llmeshrepository.h" +#include "llagent.h" #include "lldatapacker.h" #include "llviewershadermgr.h" #include "llvoavatar.h" -#include "llfloatertools.h" #include "llvocache.h" // [RLVa:KB] - Checked: 2010-04-04 (RLVa-1.2.0d) @@ -131,7 +131,7 @@ void LLVOVolume::markDead() { if (!mDead) { - + if (mSculptTexture.notNull()) { mSculptTexture->removeVolume(this); @@ -310,7 +310,7 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys, } } } - + return retval; } @@ -338,6 +338,7 @@ void LLVOVolume::animateTextures() for (S32 i = start; i <= end; i++) { LLFace* facep = mDrawable->getFace(i); + if (!facep) continue; if(facep->getVirtualSize() <= MIN_TEX_ANIM_SIZE && facep->mTextureMatrix) continue; const LLTextureEntry* te = facep->getTextureEntry(); @@ -429,7 +430,7 @@ BOOL LLVOVolume::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) { LLViewerObject::idleUpdate(agent, world, time); - static LLFastTimer::DeclareTimer ftm("Volume"); + static LLFastTimer::DeclareTimer ftm("Volume Idle"); LLFastTimer t(ftm); if (mDead || mDrawable.isNull()) @@ -474,6 +475,20 @@ void LLVOVolume::updateTextures() if (mTextureUpdateTimer.getElapsedTimeF32() > TEXTURE_AREA_REFRESH_TIME) { updateTextureVirtualSize(); + + if (mDrawable.notNull() && !isVisible() && !mDrawable->isActive()) + { //delete vertex buffer to free up some VRAM + LLSpatialGroup* group = mDrawable->getSpatialGroup(); + if (group) + { + group->destroyGL(true); + + //flag the group as having changed geometry so it gets a rebuild next time + //it becomes visible + group->setState(LLSpatialGroup::GEOM_DIRTY | LLSpatialGroup::MESH_DIRTY | LLSpatialGroup::NEW_DRAWINFO); + } + } + } } @@ -508,8 +523,19 @@ void LLVOVolume::updateTextureVirtualSize(bool forced) if(!forced) { if(!isVisible()) - { - return; + { //don't load textures for non-visible faces + const S32 num_faces = mDrawable->getNumFaces(); + for (S32 i = 0; i < num_faces; i++) + { + LLFace* face = mDrawable->getFace(i); + if (face) + { + face->setPixelArea(0.f); + face->setVirtualSize(0.f); + } + } + + return ; } if (!gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_SIMPLE)) @@ -536,6 +562,7 @@ void LLVOVolume::updateTextureVirtualSize(bool forced) for (S32 i = 0; i < num_faces; i++) { LLFace* face = mDrawable->getFace(i); + if (!face) continue; const LLTextureEntry *te = face->getTextureEntry(); LLViewerTexture *imagep = face->getTexture(); if (!imagep || !te || @@ -568,19 +595,9 @@ void LLVOVolume::updateTextureVirtualSize(bool forced) } mPixelArea = llmax(mPixelArea, face->getPixelArea()); - + if (face->mTextureMatrix != NULL) { - // Animating textures also rez badly in Snowglobe because the - // actual displayed area is only a fraction (corresponding to one - // frame) of the animating texture. Let's fix that here: - /* if (mTextureAnimp && mTextureAnimp->mScaleS > 0.0f && mTextureAnimp->mScaleT > 0.0f) - { - // Adjust to take into account the actual frame size which is only a - // portion of the animating texture - vsize = vsize / mTextureAnimp->mScaleS / mTextureAnimp->mScaleT; - }*/ - if ((vsize < MIN_TEX_ANIM_SIZE && old_size > MIN_TEX_ANIM_SIZE) || (vsize > MIN_TEX_ANIM_SIZE && old_size < MIN_TEX_ANIM_SIZE)) { @@ -656,6 +673,7 @@ void LLVOVolume::updateTextureVirtualSize(bool forced) mSculptTexture->getHeight(), mSculptTexture->getWidth())); } } + } if (getLightTextureID().notNull()) @@ -836,7 +854,7 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams ¶ms_in, const S32 detail, bo { mVolumeImpl->onSetVolume(volume_params, mLOD); //detail ? } - + updateSculptTexture(); if (isSculpted()) @@ -866,6 +884,27 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams ¶ms_in, const S32 detail, bo } } + + static LLCachedControl use_transform_feedback("RenderUseTransformFeedback", false); + + bool cache_in_vram = use_transform_feedback && gTransformPositionProgram.mProgramObject && + (!mVolumeImpl || !mVolumeImpl->isVolumeUnique()); + + if (cache_in_vram) + { //this volume might be used as source data for a transform object, put it in vram + LLVolume* volume = getVolume(); + for (S32 i = 0; i < volume->getNumFaces(); ++i) + { + const LLVolumeFace& face = volume->getVolumeFace(i); + if (face.mVertexBuffer.notNull()) + { //already cached + break; + } + volume->genBinormals(i); + LLFace::cacheFaceInVRAM(face); + } + } + return TRUE; } return FALSE; @@ -950,6 +989,7 @@ void LLVOVolume::sculpt() if(!raw_image) { llassert(discard_level < 0) ; + sculpt_width = 0; sculpt_height = 0; sculpt_data = NULL ; @@ -1018,7 +1058,7 @@ BOOL LLVOVolume::calcLOD() distance *= sDistanceFactor; - + F32 rampDist = LLVOVolume::sLODFactor * 2; if (distance < rampDist) @@ -1034,7 +1074,8 @@ BOOL LLVOVolume::calcLOD() llround(radius, 0.01f)); - if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_LOD_INFO)) + if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_LOD_INFO) && + mDrawable->getFace(0)) { //setDebugText(llformat("%.2f:%.2f, %d", debug_distance, radius, cur_detail)); @@ -1113,25 +1154,23 @@ void LLVOVolume::updateFaceFlags() for (S32 i = 0; i < getVolume()->getNumFaces(); i++) { LLFace *face = mDrawable->getFace(i); - if (!face) + if (face) { - return; - } + BOOL fullbright = getTE(i)->getFullbright(); + face->clearState(LLFace::FULLBRIGHT | LLFace::HUD_RENDER | LLFace::LIGHT); - BOOL fullbright = getTE(i)->getFullbright(); - face->clearState(LLFace::FULLBRIGHT | LLFace::HUD_RENDER | LLFace::LIGHT); - - if (fullbright || (mMaterial == LL_MCODE_LIGHT)) - { - face->setState(LLFace::FULLBRIGHT); - } - if (mDrawable->isLight()) - { - face->setState(LLFace::LIGHT); - } - if (isHUDAttachment()) - { - face->setState(LLFace::HUD_RENDER); + if (fullbright || (mMaterial == LL_MCODE_LIGHT)) + { + face->setState(LLFace::FULLBRIGHT); + } + if (mDrawable->isLight()) + { + face->setState(LLFace::LIGHT); + } + if (isHUDAttachment()) + { + face->setState(LLFace::HUD_RENDER); + } } } } @@ -1168,6 +1207,8 @@ void LLVOVolume::regenFaces() for (S32 i = 0; i < mNumFaces; i++) { LLFace* facep = count_changed ? addFace(i) : mDrawable->getFace(i); + if (!facep) continue; + facep->setTEOffset(i); facep->setTexture(getTEImage(i)); facep->setViewerObject(this); @@ -1190,7 +1231,7 @@ BOOL LLVOVolume::genBBoxes(BOOL force_global) BOOL rebuild = mDrawable->isState(LLDrawable::REBUILD_VOLUME | LLDrawable::REBUILD_POSITION | LLDrawable::REBUILD_RIGGED); -// bool rigged = false; + // bool rigged = false; LLVolume* volume = mRiggedVolume; if (!volume) { @@ -1245,11 +1286,11 @@ void LLVOVolume::preRebuild() } } -void LLVOVolume::updateRelativeXform() +void LLVOVolume::updateRelativeXform(bool force_identity) { if (mVolumeImpl) { - mVolumeImpl->updateRelativeXform(); + mVolumeImpl->updateRelativeXform(force_identity); return; } @@ -1269,15 +1310,16 @@ void LLVOVolume::updateRelativeXform() mRelativeXform.invert(); mRelativeXformInvTrans.transpose(); } - else if (drawable->isActive()) + else if (drawable->isActive() || force_identity) { // setup relative transforms LLQuaternion delta_rot; LLVector3 delta_pos, delta_scale; //matrix from local space to parent relative/global space - delta_rot = drawable->isSpatialRoot() ? LLQuaternion() : mDrawable->getRotation(); - delta_pos = drawable->isSpatialRoot() ? LLVector3(0,0,0) : mDrawable->getPosition(); + bool use_identity = force_identity || drawable->isSpatialRoot(); + delta_rot = use_identity ? LLQuaternion() : mDrawable->getRotation(); + delta_pos = use_identity ? LLVector3(0,0,0) : mDrawable->getPosition(); delta_scale = mDrawable->getScale(); // Vertex transform (4x4) @@ -1378,7 +1420,11 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable) return res; } - dirtySpatialGroup(drawable->isState(LLDrawable::IN_REBUILD_Q1)); + LLSpatialGroup* group = drawable->getSpatialGroup(); + if (group) + { + group->dirtyMesh(); + } BOOL compiled = FALSE; @@ -1389,8 +1435,10 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable) return TRUE; // No update to complete } - if (mVolumeChanged || mFaceMappingChanged ) + if (mVolumeChanged || mFaceMappingChanged) { + dirtySpatialGroup(drawable->isState(LLDrawable::IN_REBUILD_Q1)); + compiled = TRUE; if (mVolumeChanged) @@ -1409,6 +1457,8 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable) } else if ((mLODChanged) || (mSculptChanged)) { + dirtySpatialGroup(drawable->isState(LLDrawable::IN_REBUILD_Q1)); + LLVolume *old_volumep, *new_volumep; F32 old_lod, new_lod; S32 old_num_faces, new_num_faces ; @@ -1490,16 +1540,19 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable) void LLVOVolume::updateFaceSize(S32 idx) { LLFace* facep = mDrawable->getFace(idx); - if (idx >= getVolume()->getNumVolumeFaces()) + if (facep) { - facep->setSize(0,0, true); - } - else - { - const LLVolumeFace& vol_face = getVolume()->getVolumeFace(idx); - facep->setSize(vol_face.mNumVertices, vol_face.mNumIndices, - true); // <--- volume faces should be padded for 16-byte alignment + if (idx >= getVolume()->getNumVolumeFaces()) + { + facep->setSize(0,0, true); + } + else + { + const LLVolumeFace& vol_face = getVolume()->getVolumeFace(idx); + facep->setSize(vol_face.mNumVertices, vol_face.mNumIndices, + true); // <--- volume faces should be padded for 16-byte alignment + } } } @@ -2038,7 +2091,7 @@ BOOL LLVOVolume::isSculpted() const } BOOL LLVOVolume::isMesh() const -{ +{ if (isSculpted()) { LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT); @@ -2337,9 +2390,10 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const produces_light = 1; } - for (U32 i = 0; i < num_faces; ++i) + for (S32 i = 0; i < num_faces; ++i) { const LLFace* face = drawablep->getFace(i); + if (!face) continue; const LLTextureEntry* te = face->getTextureEntry(); const LLViewerTexture* img = face->getTexture(); @@ -2615,6 +2669,7 @@ F32 LLVOVolume::getBinRadius() for (S32 i = 0; i < mDrawable->getNumFaces(); i++) { LLFace* face = mDrawable->getFace(i); + if (!face) continue; if (face->getPoolType() == LLDrawPool::POOL_ALPHA && !face->canRenderAsMask()) { @@ -2696,9 +2751,12 @@ LLVector3 LLVOVolume::agentPositionToVolume(const LLVector3& pos) const { LLVector3 ret = pos - getRenderPosition(); ret = ret * ~getRenderRotation(); - LLVector3 objScale = isVolumeGlobal() ? LLVector3(1,1,1) : getScale(); - LLVector3 invObjScale(1.f / objScale.mV[VX], 1.f / objScale.mV[VY], 1.f / objScale.mV[VZ]); - ret.scaleVec(invObjScale); + if (!isVolumeGlobal()) + { + LLVector3 objScale = getScale(); + LLVector3 invObjScale(1.f / objScale.mV[VX], 1.f / objScale.mV[VY], 1.f / objScale.mV[VZ]); + ret.scaleVec(invObjScale); + } return ret; } @@ -2716,8 +2774,12 @@ LLVector3 LLVOVolume::agentDirectionToVolume(const LLVector3& dir) const LLVector3 LLVOVolume::volumePositionToAgent(const LLVector3& dir) const { LLVector3 ret = dir; - LLVector3 objScale = isVolumeGlobal() ? LLVector3(1,1,1) : getScale(); - ret.scaleVec(objScale); + if (!isVolumeGlobal()) + { + LLVector3 objScale = getScale(); + ret.scaleVec(objScale); + } + ret = ret * getRenderRotation(); ret += getRenderPosition(); @@ -2845,7 +2907,8 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e { LLFace* face = mDrawable->getFace(face_hit); - if (pick_transparent || !face->getTexture() || !face->getTexture()->hasGLTexture() || face->getTexture()->getMask(face->surfaceToTexture(tc, p, n))) + if (face && + (pick_transparent || !face->getTexture() || !face->getTexture()->hasGLTexture() || face->getTexture()->getMask(face->surfaceToTexture(tc, p, n)))) { v_end = p; if (face_hitp != NULL) @@ -3155,8 +3218,11 @@ bool can_batch_texture(LLFace* facep) return true; } +static LLFastTimer::DeclareTimer FTM_REGISTER_FACE("Register Face"); + void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, U32 type) { + LLFastTimer t(FTM_REGISTER_FACE); LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); // if (facep->getViewerObject()->isSelected() && gHideSelectedObjects) @@ -3195,9 +3261,14 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, const LLMatrix4* model_mat = NULL; LLDrawable* drawable = facep->getDrawable(); - if (drawable->isActive()) + + if (drawable->isState(LLDrawable::ANIMATED_CHILD)) { - model_mat = &(drawable->getRenderMatrix()); + model_mat = &drawable->getWorldMatrix(); + } + else if (drawable->isActive()) + { + model_mat = &drawable->getRenderMatrix(); } else { @@ -3208,6 +3279,8 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, } } + //drawable->getVObj()->setDebugText(llformat("%d", drawable->isState(LLDrawable::ANIMATED_CHILD))); + U8 bump = (type == LLRenderPass::PASS_BUMP || type == LLRenderPass::PASS_POST_BUMP) ? facep->getTextureEntry()->getBumpmap() : 0; LLViewerTexture* tex = facep->getTexture(); @@ -3296,8 +3369,9 @@ void LLVolumeGeometryManager::getGeometry(LLSpatialGroup* group) } -static LLFastTimer::DeclareTimer FTM_REBUILD_VOLUME_VB("Volume"); -static LLFastTimer::DeclareTimer FTM_REBUILD_VBO("VBO Rebuilt"); +static LLFastTimer::DeclareTimer FTM_REBUILD_VOLUME_VB("Volume VB"); +static LLFastTimer::DeclareTimer FTM_REBUILD_VOLUME_FACE_LIST("Build Face List"); +static LLFastTimer::DeclareTimer FTM_REBUILD_VOLUME_GEN_DRAW_INFO("Gen Draw Info"); static LLDrawPoolAvatar* get_avatar_drawpool(LLViewerObject* vobj) { @@ -3344,19 +3418,15 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) { if (group->isState(LLSpatialGroup::MESH_DIRTY) && !LLPipeline::sDelayVBUpdate) { - LLFastTimer ftm(FTM_REBUILD_VBO); - LLFastTimer ftm2(FTM_REBUILD_VOLUME_VB); - rebuildMesh(group); } return; } + LLFastTimer ftm(FTM_REBUILD_VOLUME_VB); + group->mBuilt = 1.f; - LLFastTimer ftm(FTM_REBUILD_VBO); - - LLFastTimer ftm2(FTM_REBUILD_VOLUME_VB); - + LLVOAvatar* pAvatarVO = NULL; LLSpatialBridge* bridge = group->mSpatialPartition->asBridge(); @@ -3407,359 +3477,375 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) bool emissive = false; - //get all the faces into a list - for (LLSpatialGroup::element_iter drawable_iter = group->getData().begin(); drawable_iter != group->getData().end(); ++drawable_iter) { - LLDrawable* drawablep = *drawable_iter; + LLFastTimer t(FTM_REBUILD_VOLUME_FACE_LIST); + + //get all the faces into a list + for (LLSpatialGroup::element_iter drawable_iter = group->getData().begin(); drawable_iter != group->getData().end(); ++drawable_iter) + { + LLDrawable* drawablep = *drawable_iter; - if (drawablep->isDead() || drawablep->isState(LLDrawable::FORCE_INVISIBLE) ) - { - continue; - } - - if (drawablep->isAnimating()) - { //fall back to stream draw for animating verts - useage = GL_STREAM_DRAW_ARB; - } - - LLVOVolume* vobj = drawablep->getVOVolume(); - - if (!vobj) - { - continue; - } - - if (vobj->isMesh() && - (vobj->getVolume() && !vobj->getVolume()->isMeshAssetLoaded() || !gMeshRepo.meshRezEnabled())) - { - continue; - } - - LLVolume* volume = vobj->getVolume(); - if (volume) - { - const LLVector3& scale = vobj->getScale(); - group->mSurfaceArea += volume->getSurfaceArea() * llmax(llmax(scale.mV[0], scale.mV[1]), scale.mV[2]); - } - - llassert_always(vobj); - vobj->updateTextureVirtualSize(true); - vobj->preRebuild(); - - drawablep->clearState(LLDrawable::HAS_ALPHA); - - bool rigged = vobj->isAttachment() && - vobj->isMesh() && - gMeshRepo.getSkinInfo(vobj->getVolume()->getParams().getSculptID(), vobj); - - bool bake_sunlight = LLPipeline::sBakeSunlight && drawablep->isStatic(); - - bool is_rigged = false; - - //for each face - for (S32 i = 0; i < drawablep->getNumFaces(); i++) - { - LLFace* facep = drawablep->getFace(i); - - //ALWAYS null out vertex buffer on rebuild -- if the face lands in a render - // batch, it will recover its vertex buffer reference from the spatial group - facep->setVertexBuffer(NULL); - - //sum up face verts and indices - drawablep->updateFaceSize(i); - - - - if (rigged) + if (drawablep->isDead() || drawablep->isState(LLDrawable::FORCE_INVISIBLE) ) { - if (!facep->isState(LLFace::RIGGED)) - { //completely reset vertex buffer - facep->clearVertexBuffer(); - } - - facep->setState(LLFace::RIGGED); - is_rigged = true; - - //get drawpool of avatar with rigged face - LLDrawPoolAvatar* pool = get_avatar_drawpool(vobj); - - //Determine if we've received skininfo that contains an - //alternate bind matrix - if it does then apply the translational component - //to the joints of the avatar. - bool pelvisGotSet = false; + continue; + } + + if (drawablep->isAnimating()) + { //fall back to stream draw for animating verts + useage = GL_STREAM_DRAW_ARB; + } - if ( pAvatarVO ) + LLVOVolume* vobj = drawablep->getVOVolume(); + + if (!vobj) + { + continue; + } + + if ((vobj->isMesh() && + (vobj->getVolume() && !vobj->getVolume()->isMeshAssetLoaded()) || !gMeshRepo.meshRezEnabled())) + { + continue; + } + + LLVolume* volume = vobj->getVolume(); + if (volume) + { + const LLVector3& scale = vobj->getScale(); + group->mSurfaceArea += volume->getSurfaceArea() * llmax(llmax(scale.mV[0], scale.mV[1]), scale.mV[2]); + } + + llassert_always(vobj); + vobj->updateTextureVirtualSize(true); + vobj->preRebuild(); + + drawablep->clearState(LLDrawable::HAS_ALPHA); + + bool rigged = vobj->isAttachment() && + vobj->isMesh() && + gMeshRepo.getSkinInfo(vobj->getVolume()->getParams().getSculptID(), vobj); + + bool bake_sunlight = LLPipeline::sBakeSunlight && drawablep->isStatic(); + + bool is_rigged = false; + + //for each face + for (S32 i = 0; i < drawablep->getNumFaces(); i++) + { + LLFace* facep = drawablep->getFace(i); + if (!facep) { - LLUUID currentId = vobj->getVolume()->getParams().getSculptID(); - const LLMeshSkinInfo* pSkinData = gMeshRepo.getSkinInfo( currentId, vobj ); - - if ( pSkinData ) + continue; + } + + //ALWAYS null out vertex buffer on rebuild -- if the face lands in a render + // batch, it will recover its vertex buffer reference from the spatial group + facep->setVertexBuffer(NULL); + + //sum up face verts and indices + drawablep->updateFaceSize(i); + + + + if (rigged) + { + if (!facep->isState(LLFace::RIGGED)) + { //completely reset vertex buffer + facep->clearVertexBuffer(); + } + + facep->setState(LLFace::RIGGED); + is_rigged = true; + + //get drawpool of avatar with rigged face + LLDrawPoolAvatar* pool = get_avatar_drawpool(vobj); + + //Determine if we've received skininfo that contains an + //alternate bind matrix - if it does then apply the translational component + //to the joints of the avatar. + bool pelvisGotSet = false; + + if ( pAvatarVO ) { - const int bindCnt = pSkinData->mAlternateBindMatrix.size(); - if ( bindCnt > 0 ) - { - const int jointCnt = pSkinData->mJointNames.size(); - const F32 pelvisZOffset = pSkinData->mPelvisOffset; - bool fullRig = (jointCnt>=20) ? true : false; - if ( fullRig ) - { - for ( int i=0; igetVolume()->getParams().getSculptID(); + const LLMeshSkinInfo* pSkinData = gMeshRepo.getSkinInfo( currentId, vobj ); + + if ( pSkinData ) + { + const int bindCnt = pSkinData->mAlternateBindMatrix.size(); + if ( bindCnt > 0 ) + { + const int jointCnt = pSkinData->mJointNames.size(); + const F32 pelvisZOffset = pSkinData->mPelvisOffset; + bool fullRig = (jointCnt>=20) ? true : false; + if ( fullRig ) { - std::string lookingForJoint = pSkinData->mJointNames[i].c_str(); - //llinfos<<"joint name "<getJoint( lookingForJoint ); - if ( pJoint && pJoint->getId() != currentId ) - { - pJoint->setId( currentId ); - const LLVector3& jointPos = pSkinData->mAlternateBindMatrix[i].getTranslation(); - //Set the joint position - pJoint->storeCurrentXform( jointPos ); - //If joint is a pelvis then handle old/new pelvis to foot values - if ( lookingForJoint == "mPelvis" ) - { + for ( int i=0; imJointNames[i].c_str(); + //llinfos<<"joint name "<getJoint( lookingForJoint ); + if ( pJoint && pJoint->getId() != currentId ) + { + pJoint->setId( currentId ); + const LLVector3& jointPos = pSkinData->mAlternateBindMatrix[i].getTranslation(); + //Set the joint position pJoint->storeCurrentXform( jointPos ); - if ( !pAvatarVO->hasPelvisOffset() ) - { - pAvatarVO->setPelvisOffset( true, jointPos, pelvisZOffset ); - //Trigger to rebuild viewer AV - pelvisGotSet = true; + //If joint is a pelvis then handle old/new pelvis to foot values + if ( lookingForJoint == "mPelvis" ) + { + pJoint->storeCurrentXform( jointPos ); + if ( !pAvatarVO->hasPelvisOffset() ) + { + pAvatarVO->setPelvisOffset( true, jointPos, pelvisZOffset ); + //Trigger to rebuild viewer AV + pelvisGotSet = true; + } } - } + } } - } - } + } + } } } - } - //If we've set the pelvis to a new position we need to also rebuild some information that the - //viewer does at launch (e.g. body size etc.) - if ( pelvisGotSet ) - { - pAvatarVO->postPelvisSetRecalc(); - } - - if (pool) - { - const LLTextureEntry* te = facep->getTextureEntry(); - - //remove face from old pool if it exists - LLDrawPool* old_pool = facep->getPool(); - if (old_pool && old_pool->getType() == LLDrawPool::POOL_AVATAR) + //If we've set the pelvis to a new position we need to also rebuild some information that the + //viewer does at launch (e.g. body size etc.) + if ( pelvisGotSet ) { - ((LLDrawPoolAvatar*) old_pool)->removeRiggedFace(facep); + pAvatarVO->postPelvisSetRecalc(); } - //add face to new pool - LLViewerTexture* tex = facep->getTexture(); - U32 type = gPipeline.getPoolTypeFromTE(te, tex); - - if (type == LLDrawPool::POOL_ALPHA) + if (pool) { - if (te->getColor().mV[3] > 0.f) + const LLTextureEntry* te = facep->getTextureEntry(); + + //remove face from old pool if it exists + LLDrawPool* old_pool = facep->getPool(); + if (old_pool && old_pool->getType() == LLDrawPool::POOL_AVATAR) + { + ((LLDrawPoolAvatar*) old_pool)->removeRiggedFace(facep); + } + + //add face to new pool + LLViewerTexture* tex = facep->getTexture(); + U32 type = gPipeline.getPoolTypeFromTE(te, tex); + + if (type == LLDrawPool::POOL_ALPHA) + { + if (te->getColor().mV[3] > 0.f) + { + if (te->getFullbright()) + { + pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_FULLBRIGHT_ALPHA); + } + else + { + pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_ALPHA); + } + } + } + else if (te->getShiny()) { if (te->getFullbright()) { - pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_FULLBRIGHT_ALPHA); + pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_FULLBRIGHT_SHINY); } else { - pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_ALPHA); + if (LLPipeline::sRenderDeferred) + { + pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_SIMPLE); + } + else + { + pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_SHINY); + } } } - } - else if (te->getShiny()) - { - if (te->getFullbright()) - { - pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_FULLBRIGHT_SHINY); - } else { - if (LLPipeline::sRenderDeferred) + if (te->getFullbright()) + { + pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_FULLBRIGHT); + } + else { pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_SIMPLE); } - else + } + + if (te->getGlow()) + { + pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_GLOW); + } + + if (LLPipeline::sRenderDeferred) + { + if (type != LLDrawPool::POOL_ALPHA && !te->getFullbright()) { - pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_SHINY); + if (te->getBumpmap()) + { + pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_DEFERRED_BUMP); + } + else + { + pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_DEFERRED_SIMPLE); + } } } } - else - { - if (te->getFullbright()) - { - pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_FULLBRIGHT); - } - else - { - pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_SIMPLE); - } - } - if (te->getGlow()) - { - pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_GLOW); - } - - if (LLPipeline::sRenderDeferred) - { - if (type != LLDrawPool::POOL_ALPHA && !te->getFullbright()) - { - if (te->getBumpmap()) - { - pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_DEFERRED_BUMP); - } - else - { - pool->addRiggedFace(facep, LLDrawPoolAvatar::RIGGED_DEFERRED_SIMPLE); - } - } - } - } - - continue; - } - else - { - if (facep->isState(LLFace::RIGGED)) - { //face is not rigged but used to be, remove from rigged face pool - LLDrawPoolAvatar* pool = (LLDrawPoolAvatar*) facep->getPool(); - if (pool) - { - pool->removeRiggedFace(facep); - } - facep->clearState(LLFace::RIGGED); - } - } - - - if (cur_total > max_total || facep->getIndicesCount() <= 0 || facep->getGeomCount() <= 0) - { - facep->clearVertexBuffer(); - continue; - } - - cur_total += facep->getGeomCount(); - - if (facep->hasGeometry() && facep->getPixelArea() > FORCE_CULL_AREA) - { - const LLTextureEntry* te = facep->getTextureEntry(); - LLViewerTexture* tex = facep->getTexture(); - - if (te->getGlow() >= 1.f/255.f) - { - emissive = true; - } - - if (facep->isState(LLFace::TEXTURE_ANIM)) - { - if (!vobj->mTexAnimMode) - { - facep->clearState(LLFace::TEXTURE_ANIM); - } - } - - BOOL force_simple = (facep->getPixelArea() < FORCE_SIMPLE_RENDER_AREA); - U32 type = gPipeline.getPoolTypeFromTE(te, tex); - if (type != LLDrawPool::POOL_ALPHA && force_simple) - { - type = LLDrawPool::POOL_SIMPLE; - } - facep->setPoolType(type); - - if (vobj->isHUDAttachment()) - { - facep->setState(LLFace::FULLBRIGHT); - } - - if (vobj->mTextureAnimp && vobj->mTexAnimMode) - { - if (vobj->mTextureAnimp->mFace <= -1) - { - S32 face; - for (face = 0; face < vobj->getNumTEs(); face++) - { - drawablep->getFace(face)->setState(LLFace::TEXTURE_ANIM); - } - } - else if (vobj->mTextureAnimp->mFace < vobj->getNumTEs()) - { - drawablep->getFace(vobj->mTextureAnimp->mFace)->setState(LLFace::TEXTURE_ANIM); - } - } - - if (type == LLDrawPool::POOL_ALPHA) - { - if (facep->canRenderAsMask()) - { //can be treated as alpha mask - simple_faces.push_back(facep); - } - else - { - if (te->getColor().mV[3] > 0.f) - { //only treat as alpha in the pipeline if < 100% transparent - drawablep->setState(LLDrawable::HAS_ALPHA); - } - alpha_faces.push_back(facep); - } + continue; } else { - if (drawablep->isState(LLDrawable::REBUILD_VOLUME)) + if (facep->isState(LLFace::RIGGED)) + { //face is not rigged but used to be, remove from rigged face pool + LLDrawPoolAvatar* pool = (LLDrawPoolAvatar*) facep->getPool(); + if (pool) + { + pool->removeRiggedFace(facep); + } + facep->clearState(LLFace::RIGGED); + } + } + + + if (cur_total > max_total || facep->getIndicesCount() <= 0 || facep->getGeomCount() <= 0) + { + facep->clearVertexBuffer(); + continue; + } + + cur_total += facep->getGeomCount(); + + if (facep->hasGeometry() && facep->getPixelArea() > FORCE_CULL_AREA) + { + const LLTextureEntry* te = facep->getTextureEntry(); + LLViewerTexture* tex = facep->getTexture(); + + if (te->getGlow() >= 1.f/255.f) { - facep->mLastUpdateTime = gFrameTimeSeconds; + emissive = true; } - if (gPipeline.canUseWindLightShadersOnObjects() - && LLPipeline::sRenderBump) + if (facep->isState(LLFace::TEXTURE_ANIM)) { - if (te->getBumpmap()) - { //needs normal + binormal - bump_faces.push_back(facep); + if (!vobj->mTexAnimMode) + { + facep->clearState(LLFace::TEXTURE_ANIM); } - else if (te->getShiny() || !te->getFullbright()) - { //needs normal + } + + BOOL force_simple = (facep->getPixelArea() < FORCE_SIMPLE_RENDER_AREA); + U32 type = gPipeline.getPoolTypeFromTE(te, tex); + if (type != LLDrawPool::POOL_ALPHA && force_simple) + { + type = LLDrawPool::POOL_SIMPLE; + } + facep->setPoolType(type); + + if (vobj->isHUDAttachment()) + { + facep->setState(LLFace::FULLBRIGHT); + } + + if (vobj->mTextureAnimp && vobj->mTexAnimMode) + { + if (vobj->mTextureAnimp->mFace <= -1) + { + S32 face; + for (face = 0; face < vobj->getNumTEs(); face++) + { + LLFace * facep = drawablep->getFace(face); + if (facep) + { + facep->setState(LLFace::TEXTURE_ANIM); + } + } + } + else if (vobj->mTextureAnimp->mFace < vobj->getNumTEs()) + { + LLFace * facep = drawablep->getFace(vobj->mTextureAnimp->mFace); + if (facep) + { + facep->setState(LLFace::TEXTURE_ANIM); + } + } + } + + if (type == LLDrawPool::POOL_ALPHA) + { + if (facep->canRenderAsMask()) + { //can be treated as alpha mask simple_faces.push_back(facep); } - else - { //doesn't need normal - facep->setState(LLFace::FULLBRIGHT); - fullbright_faces.push_back(facep); + else + { + if (te->getColor().mV[3] > 0.f) + { //only treat as alpha in the pipeline if < 100% transparent + drawablep->setState(LLDrawable::HAS_ALPHA); + } + alpha_faces.push_back(facep); } } else { - if (te->getBumpmap() && LLPipeline::sRenderBump) - { //needs normal + binormal - bump_faces.push_back(facep); + if (drawablep->isState(LLDrawable::REBUILD_VOLUME)) + { + facep->mLastUpdateTime = gFrameTimeSeconds; } - else if ((te->getShiny() && LLPipeline::sRenderBump) || - !(te->getFullbright() || bake_sunlight)) - { //needs normal - simple_faces.push_back(facep); + + if (gPipeline.canUseWindLightShadersOnObjects() + && LLPipeline::sRenderBump) + { + if (te->getBumpmap()) + { //needs normal + binormal + bump_faces.push_back(facep); + } + else if (te->getShiny() || !te->getFullbright()) + { //needs normal + simple_faces.push_back(facep); + } + else + { //doesn't need normal + facep->setState(LLFace::FULLBRIGHT); + fullbright_faces.push_back(facep); + } } - else - { //doesn't need normal - facep->setState(LLFace::FULLBRIGHT); - fullbright_faces.push_back(facep); + else + { + if (te->getBumpmap() && LLPipeline::sRenderBump) + { //needs normal + binormal + bump_faces.push_back(facep); + } + else if ((te->getShiny() && LLPipeline::sRenderBump) || + !(te->getFullbright() || bake_sunlight)) + { //needs normal + simple_faces.push_back(facep); + } + else + { //doesn't need normal + facep->setState(LLFace::FULLBRIGHT); + fullbright_faces.push_back(facep); + } } } } + else + { //face has no renderable geometry + facep->clearVertexBuffer(); + } + } + + if (is_rigged) + { + drawablep->setState(LLDrawable::RIGGED); } else - { //face has no renderable geometry - facep->clearVertexBuffer(); - } - } - - if (is_rigged) - { - drawablep->setState(LLDrawable::RIGGED); - } - else - { - drawablep->clearState(LLDrawable::RIGGED); + { + drawablep->clearState(LLDrawable::RIGGED); + } } } @@ -3826,15 +3912,15 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) } } -static LLFastTimer::DeclareTimer FTM_VOLUME_GEOM("Volume Geometry"); -static LLFastTimer::DeclareTimer FTM_VOLUME_GEOM_PARTIAL("Terse Rebuild"); + void LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup* group) { llassert(group); static int warningsCount = 20; if (group && group->isState(LLSpatialGroup::MESH_DIRTY) && !group->isState(LLSpatialGroup::GEOM_DIRTY)) { - LLFastTimer tm(FTM_VOLUME_GEOM); + LLFastTimer ftm(FTM_REBUILD_VOLUME_VB); + LLFastTimer t(FTM_REBUILD_VOLUME_GEN_DRAW_INFO); //make sure getgeometryvolume shows up in the right place in timers S32 num_mapped_vertex_buffer = LLVertexBuffer::sMappedCount ; group->mBuilt = 1.f; @@ -3843,19 +3929,18 @@ void LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup* group) for (LLSpatialGroup::element_iter drawable_iter = group->getData().begin(); drawable_iter != group->getData().end(); ++drawable_iter) { - LLFastTimer t(FTM_VOLUME_GEOM_PARTIAL); LLDrawable* drawablep = *drawable_iter; - /*if (drawablep->isState(LLDrawable::FORCE_INVISIBLE) ) - { - continue; - }*/ - - if (!drawablep->isDead() && drawablep->isState(LLDrawable::REBUILD_ALL) ) + if (!drawablep->isDead() && drawablep->isState(LLDrawable::REBUILD_ALL) && !drawablep->isState(LLDrawable::RIGGED) ) { LLVOVolume* vobj = drawablep->getVOVolume(); vobj->preRebuild(); + if (drawablep->isState(LLDrawable::ANIMATED_CHILD)) + { + vobj->updateRelativeXform(true); + } + LLVolume* volume = vobj->getVolume(); for (S32 i = 0; i < drawablep->getNumFaces(); ++i) { @@ -3865,6 +3950,7 @@ void LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup* group) LLVertexBuffer* buff = face->getVertexBuffer(); if (buff) { + llassert(!face->isState(LLFace::RIGGED)); face->getGeometryVolume(*volume, face->getTEOffset(), vobj->getRelativeXform(), vobj->getRelativeXformInvTrans(), face->getGeomIndex()); @@ -3875,6 +3961,12 @@ void LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup* group) } } } + + if (drawablep->isState(LLDrawable::ANIMATED_CHILD)) + { + vobj->updateRelativeXform(); + } + drawablep->clearState(LLDrawable::REBUILD_ALL); } @@ -3907,10 +3999,13 @@ void LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup* group) for (S32 i = 0; i < drawablep->getNumFaces(); ++i) { LLFace* face = drawablep->getFace(i); - LLVertexBuffer* buff = face ? face->getVertexBuffer() : NULL; - if (buff && buff->isLocked()) + if (face) { - buff->flush(); + LLVertexBuffer* buff = face->getVertexBuffer(); + if (buff && buff->isLocked()) + { + buff->flush(); + } } } } @@ -3919,7 +4014,7 @@ void LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup* group) group->clearState(LLSpatialGroup::MESH_DIRTY | LLSpatialGroup::NEW_DRAWINFO); } - llassert(!group || !group->isState(LLSpatialGroup::NEW_DRAWINFO)); +// llassert(!group || !group->isState(LLSpatialGroup::NEW_DRAWINFO)); } struct CompareBatchBreakerModified @@ -3945,10 +4040,22 @@ struct CompareBatchBreakerModified } }; +static LLFastTimer::DeclareTimer FTM_GEN_DRAW_INFO_SORT("Draw Info Face Sort"); +static LLFastTimer::DeclareTimer FTM_GEN_DRAW_INFO_FACE_SIZE("Face Sizing"); +static LLFastTimer::DeclareTimer FTM_GEN_DRAW_INFO_ALLOCATE("Allocate VB"); +static LLFastTimer::DeclareTimer FTM_GEN_DRAW_INFO_FIND_VB("Find VB"); +static LLFastTimer::DeclareTimer FTM_GEN_DRAW_INFO_RESIZE_VB("Resize VB"); + + + + + void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std::vector& faces, BOOL distance_sort, BOOL batch_textures) { - U32 buffer_usage = group->mBufferUsage; + LLFastTimer t(FTM_REBUILD_VOLUME_GEN_DRAW_INFO); + U32 buffer_usage = group->mBufferUsage; + #if LL_DARWIN // HACK from Leslie: // Disable VBO usage for alpha on Mac OS X because it kills the framerate @@ -3965,15 +4072,18 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std:: U32 max_vertices = (render_max_vbo_size*1024)/LLVertexBuffer::calcVertexSize(group->mSpatialPartition->mVertexDataMask); max_vertices = llmin(max_vertices, (U32) 65535); - if (!distance_sort) { - //sort faces by things that break batches - std::sort(faces.begin(), faces.end(), CompareBatchBreakerModified()); - } - else - { - //sort faces by distance - std::sort(faces.begin(), faces.end(), LLFace::CompareDistanceGreater()); + LLFastTimer t(FTM_GEN_DRAW_INFO_SORT); + if (!distance_sort) + { + //sort faces by things that break batches + std::sort(faces.begin(), faces.end(), CompareBatchBreakerModified()); + } + else + { + //sort faces by distance + std::sort(faces.begin(), faces.end(), LLFace::CompareDistanceGreater()); + } } bool hud_group = group->isHUDGroup() ; @@ -3989,12 +4099,13 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std:: buffer_index = -1; } - S32 texture_index_channels = LLGLSLShader::sIndexedTextureChannels-1; //always reserve one for shiny for now just for simplicity + S32 texture_index_channels = 1; - static const LLCachedControl no_texture_indexing("ShyotlUseLegacyTextureBatching",false); - if (gGLManager.mGLVersion < 3.1f || no_texture_indexing) + if (gGLManager.mGLSLVersionMajor > 1 || gGLManager.mGLSLVersionMinor >= 30) { - texture_index_channels = 1; + static const LLCachedControl no_texture_indexing("ShyotlUseLegacyTextureBatching",false); + if(!no_texture_indexing) + texture_index_channels = LLGLSLShader::sIndexedTextureChannels-1; //always reserve one for shiny for now just for simplicity; } if (LLPipeline::sRenderDeferred && distance_sort) @@ -4040,57 +4151,86 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std:: std::vector texture_list; - if (batch_textures) { - U8 cur_tex = 0; - facep->setTextureIndex(cur_tex); - texture_list.push_back(tex); - - //if (can_batch_texture(facep)) + LLFastTimer t(FTM_GEN_DRAW_INFO_FACE_SIZE); + if (batch_textures) { - while (i != faces.end()) + U8 cur_tex = 0; + facep->setTextureIndex(cur_tex); + texture_list.push_back(tex); + + //if (can_batch_texture(facep)) { - facep = *i; - if (facep->getTexture() != tex) + while (i != faces.end()) { - if (distance_sort) - { //textures might be out of order, see if texture exists in current batch - bool found = false; - for (U32 tex_idx = 0; tex_idx < texture_list.size(); ++tex_idx) - { - if (facep->getTexture() == texture_list[tex_idx]) + facep = *i; + if (facep->getTexture() != tex) + { + if (distance_sort) + { //textures might be out of order, see if texture exists in current batch + bool found = false; + for (U32 tex_idx = 0; tex_idx < texture_list.size(); ++tex_idx) { - cur_tex = tex_idx; - found = true; - break; + if (facep->getTexture() == texture_list[tex_idx]) + { + cur_tex = tex_idx; + found = true; + break; + } + } + + if (!found) + { + cur_tex = texture_list.size(); } } - - if (!found) + else { - cur_tex = texture_list.size(); + cur_tex++; } - } - else - { - cur_tex++; + + if (!can_batch_texture(facep)) + { //face is bump mapped or has an animated texture matrix -- can't + //batch more than 1 texture at a time + break; + } + + if (cur_tex >= texture_index_channels) + { //cut batches when index channels are depleted + break; + } + + tex = facep->getTexture(); + + texture_list.push_back(tex); } - if (!can_batch_texture(facep)) - { //face is bump mapped or has an animated texture matrix -- can't - //batch more than 1 texture at a time + if (geom_count + facep->getGeomCount() > max_vertices) + { //cut batches on geom count too big break; } - if (cur_tex >= texture_index_channels) - { //cut batches when index channels are depleted - break; - } + ++i; + index_count += facep->getIndicesCount(); + geom_count += facep->getGeomCount(); - tex = facep->getTexture(); - - texture_list.push_back(tex); + facep->setTextureIndex(cur_tex); } + } + + tex = texture_list[0]; + } + else + { + while (i != faces.end() && + (LLPipeline::sTextureBindTest || (distance_sort || (*i)->getTexture() == tex))) + { + facep = *i; + + + //face has no texture index + facep->mDrawInfo = NULL; + facep->setTextureIndex(255); if (geom_count + facep->getGeomCount() > max_vertices) { //cut batches on geom count too big @@ -4100,69 +4240,18 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std:: ++i; index_count += facep->getIndicesCount(); geom_count += facep->getGeomCount(); - - facep->setTextureIndex(cur_tex); } } - - tex = texture_list[0]; } - else - { - while (i != faces.end() && - (LLPipeline::sTextureBindTest || (distance_sort || (*i)->getTexture() == tex))) - { - facep = *i; - - //face has no texture index - facep->mDrawInfo = NULL; - facep->setTextureIndex(255); - - if (geom_count + facep->getGeomCount() > max_vertices) - { //cut batches on geom count too big - break; - } - - ++i; - index_count += facep->getIndicesCount(); - geom_count += facep->getGeomCount(); - } - } - - //create/delete/resize vertex buffer if needed + //create vertex buffer LLVertexBuffer* buffer = NULL; - { //try to find a buffer to reuse - LLSpatialGroup::buffer_texture_map_t::iterator found_iter = group->mBufferMap[mask].find(*face_iter); - - if (found_iter != group->mBufferMap[mask].end()) - { - if ((U32) buffer_index < found_iter->second.size()) - { - buffer = found_iter->second[buffer_index]; - } - } - } - - if (!buffer || !buffer->isWriteable()) - { //create new buffer if needed + { + LLFastTimer t(FTM_GEN_DRAW_INFO_ALLOCATE); buffer = createVertexBuffer(mask, buffer_usage); buffer->allocateBuffer(geom_count, index_count, TRUE); } - else - { //resize pre-existing buffer - if (LLVertexBuffer::sEnableVBOs && buffer->getUsage() != buffer_usage || - buffer->getTypeMask() != mask) - { - buffer = createVertexBuffer(mask, buffer_usage); - buffer->allocateBuffer(geom_count, index_count, TRUE); - } - else - { - buffer->resizeBuffer(geom_count, index_count); - } - } group->mGeometryBytes += buffer->getSize() + buffer->getIndicesSize(); @@ -4196,10 +4285,22 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std:: LLVOVolume* vobj = drawablep->getVOVolume(); LLVolume* volume = vobj->getVolume(); + if (drawablep->isState(LLDrawable::ANIMATED_CHILD)) + { + vobj->updateRelativeXform(true); + } + U32 te_idx = facep->getTEOffset(); + llassert(!facep->isState(LLFace::RIGGED)); + facep->getGeometryVolume(*volume, te_idx, - vobj->getRelativeXform(), vobj->getRelativeXformInvTrans(), index_offset); + vobj->getRelativeXform(), vobj->getRelativeXformInvTrans(), index_offset,true); + + if (drawablep->isState(LLDrawable::ANIMATED_CHILD)) + { + vobj->updateRelativeXform(false); + } } } @@ -4362,6 +4463,7 @@ void LLGeometryManager::addGeometryCount(LLSpatialGroup* group, U32 &vertex_coun mFaceList.clear(); //for each drawable + for (LLSpatialGroup::element_iter drawable_iter = group->getData().begin(); drawable_iter != group->getData().end(); ++drawable_iter) { LLDrawable* drawablep = *drawable_iter; @@ -4382,17 +4484,21 @@ void LLGeometryManager::addGeometryCount(LLSpatialGroup* group, U32 &vertex_coun //sum up face verts and indices drawablep->updateFaceSize(i); LLFace* facep = drawablep->getFace(i); - if (facep->hasGeometry() && facep->getPixelArea() > FORCE_CULL_AREA) + if (facep) { - vertex_count += facep->getGeomCount(); - index_count += facep->getIndicesCount(); - llassert(facep->getIndicesCount() < 65536); - //remember face (for sorting) - mFaceList.push_back(facep); - } - else - { - facep->clearVertexBuffer(); + if (facep->hasGeometry() && facep->getPixelArea() > FORCE_CULL_AREA && + facep->getGeomCount() + vertex_count <= 65536) + { + vertex_count += facep->getGeomCount(); + index_count += facep->getIndicesCount(); + + //remember face (for sorting) + mFaceList.push_back(facep); + } + else + { + facep->clearVertexBuffer(); + } } } } diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index b4c08b797..cc7b5cf10 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -81,7 +81,7 @@ public: virtual bool isVolumeGlobal() const = 0; // Are we in global space? virtual bool isActive() const = 0; // Is this object currently active? virtual const LLMatrix4& getWorldMatrix(LLXformMatrix* xform) const = 0; - virtual void updateRelativeXform() = 0; + virtual void updateRelativeXform(bool force_identity = false) = 0; virtual U32 getID() const = 0; virtual void preRebuild() = 0; }; @@ -203,7 +203,7 @@ public: LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status); - void updateRelativeXform(); + void updateRelativeXform(bool force_identity = false); /*virtual*/ BOOL updateGeometry(LLDrawable *drawable); /*virtual*/ void updateFaceSize(S32 idx); /*virtual*/ BOOL updateLOD(); diff --git a/indra/newview/llvowater.cpp b/indra/newview/llvowater.cpp index 6614a97d8..05e033392 100644 --- a/indra/newview/llvowater.cpp +++ b/indra/newview/llvowater.cpp @@ -151,6 +151,10 @@ BOOL LLVOWater::updateGeometry(LLDrawable *drawable) drawable->addFace(poolp, NULL); } face = drawable->getFace(0); + if (!face) + { + return TRUE; + } // LLVector2 uvs[4]; // LLVector3 vtx[4]; @@ -166,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/llworld.cpp b/indra/newview/llworld.cpp index 7de47258e..6f92bedf9 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -200,9 +200,11 @@ LLViewerRegion* LLWorld::addRegion(const U64 ®ion_handle, const LLHost &host) } //Classic clouds +#if ENABLE_CLASSIC_CLOUDS regionp->mCloudLayer.create(regionp); regionp->mCloudLayer.setWidth((F32)mWidth); regionp->mCloudLayer.setWindPointer(®ionp->mWind); +#endif mRegionList.push_back(regionp); mActiveRegionList.push_back(regionp); @@ -682,6 +684,7 @@ void LLWorld::updateParticles() LLViewerPartSim::getInstance()->updateSimulation(); } +#if ENABLE_CLASSIC_CLOUDS void LLWorld::updateClouds(const F32 dt) { static const LLCachedControl freeze_time("FreezeTime",false); @@ -740,6 +743,7 @@ LLCloudGroup* LLWorld::findCloudGroup(const LLCloudPuff &puff) } return NULL; } +#endif void LLWorld::renderPropertyLines() diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h index 760934d5b..a9b3f3b53 100644 --- a/indra/newview/llworld.h +++ b/indra/newview/llworld.h @@ -124,8 +124,10 @@ public: void updateRegions(F32 max_update_time); void updateVisibilities(); void updateParticles(); +#if ENABLE_CLASSIC_CLOUDS void updateClouds(const F32 dt); LLCloudGroup * findCloudGroup(const LLCloudPuff &puff); +#endif void renderPropertyLines(); diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 567be4dcd..bd2424294 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -222,6 +222,7 @@ std::string gPoolNames[] = void drawBox(const LLVector3& c, const LLVector3& r); void drawBoxOutline(const LLVector3& pos, const LLVector3& size); U32 nhpo2(U32 v); +LLVertexBuffer* ll_create_cube_vb(U32 type_mask, U32 usage); glh::matrix4f glh_copy_matrix(F32* src) { @@ -360,9 +361,11 @@ LLPipeline::LLPipeline() : mInitialized(FALSE), mVertexShadersEnabled(FALSE), mVertexShadersLoaded(0), + mTransformFeedbackPrimitives(0), mRenderDebugFeatureMask(0), mRenderDebugMask(0), mOldRenderDebugMask(0), + mMeshDirtyQueryObject(0), mGroupQ1Locked(false), mGroupQ2Locked(false), mResetVertexBuffers(false), @@ -397,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"); @@ -450,15 +453,24 @@ void LLPipeline::init() mSpotLightFade[i] = 1.f; } - mDeferredVB = new LLVertexBuffer(DEFERRED_VB_MASK, 0); - mDeferredVB->allocateBuffer(8, 0, true); + if (mCubeVB.isNull()) + { + mCubeVB = ll_create_cube_vb(LLVertexBuffer::MAP_VERTEX, GL_STATIC_DRAW_ARB); + } + 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)); gSavedSettings.getControl("RenderUseFarClip")->getCommitSignal()->connect(boost::bind(&LLPipeline::refreshCachedSettings)); gSavedSettings.getControl("RenderAvatarMaxVisible")->getCommitSignal()->connect(boost::bind(&LLPipeline::refreshCachedSettings)); //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() @@ -562,6 +574,12 @@ void LLPipeline::destroyGL() sDelayedVBOEnable = 30; LLVertexBuffer::sEnableVBOs = FALSE; } + + } + if (mMeshDirtyQueryObject) + { + glDeleteQueriesARB(1, &mMeshDirtyQueryObject); + mMeshDirtyQueryObject = 0; } } @@ -826,6 +844,7 @@ void LLPipeline::refreshCachedSettings() LLPipeline::sUseOcclusion = (!gUseWireframe + && LLGLSLShader::sNoFixedFunction && LLFeatureManager::getInstance()->isFeatureAvailable("UseOcclusion") && gSavedSettings.getBOOL("UseOcclusion") && gGLManager.mHasOcclusionQuery) ? 2 : 0; @@ -837,13 +856,13 @@ void LLPipeline::releaseGLBuffers() if (mNoiseMap) { - LLImageGL::deleteTextures(1, &mNoiseMap); + LLImageGL::deleteTextures(LLTexUnit::TT_TEXTURE, GL_RGB16F_ARB, 0, 1, &mNoiseMap); mNoiseMap = 0; } if (mTrueNoiseMap) { - LLImageGL::deleteTextures(1, &mTrueNoiseMap); + LLImageGL::deleteTextures(LLTexUnit::TT_TEXTURE, GL_RGB16F_ARB, 0, 1, &mTrueNoiseMap); mTrueNoiseMap = 0; } @@ -867,7 +886,7 @@ void LLPipeline::releaseLUTBuffers() { if (mLightFunc) { - LLImageGL::deleteTextures(1, &mLightFunc); + LLImageGL::deleteTextures(LLTexUnit::TT_TEXTURE, GL_R8, 0, 1, &mLightFunc); mLightFunc = 0; } } @@ -942,7 +961,7 @@ void LLPipeline::createGLBuffers() noise[i].mV[2] = ll_frand()*scaler+1.f-scaler/2.f; } - LLImageGL::generateTextures(1, &mNoiseMap); + LLImageGL::generateTextures(LLTexUnit::TT_TEXTURE, GL_RGB16F_ARB, 1, &mNoiseMap); gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, mNoiseMap); LLImageGL::setManualImage(LLTexUnit::getInternalType(LLTexUnit::TT_TEXTURE), 0, GL_RGB16F_ARB, noiseRes, noiseRes, GL_RGB, GL_FLOAT, noise, false); @@ -958,7 +977,7 @@ void LLPipeline::createGLBuffers() noise[i] = ll_frand()*2.0-1.0; } - LLImageGL::generateTextures(1, &mTrueNoiseMap); + LLImageGL::generateTextures(LLTexUnit::TT_TEXTURE, GL_RGB16F_ARB, 1, &mTrueNoiseMap); gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, mTrueNoiseMap); LLImageGL::setManualImage(LLTexUnit::getInternalType(LLTexUnit::TT_TEXTURE), 0, GL_RGB16F_ARB, noiseRes, noiseRes, GL_RGB,GL_FLOAT, noise, false); gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_POINT); @@ -1014,7 +1033,7 @@ void LLPipeline::createLUTBuffers() } } - LLImageGL::generateTextures(1, &mLightFunc); + LLImageGL::generateTextures(LLTexUnit::TT_TEXTURE, GL_R8, 1, &mLightFunc); gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, mLightFunc); LLImageGL::setManualImage(LLTexUnit::getInternalType(LLTexUnit::TT_TEXTURE), 0, GL_R8, lightResX, lightResY, GL_RED, GL_UNSIGNED_BYTE, ls, false); gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_CLAMP); @@ -1631,6 +1650,16 @@ void LLPipeline::updateMovedList(LLDrawable::drawable_vector_t& moved_list) if (done) { drawablep->clearState(LLDrawable::ON_MOVE_LIST); + if (drawablep->isState(LLDrawable::ANIMATED_CHILD)) + { //will likely not receive any future world matrix updates + // -- this keeps attachments from getting stuck in space and falling off your avatar + drawablep->clearState(LLDrawable::ANIMATED_CHILD); + markRebuild(drawablep, LLDrawable::REBUILD_VOLUME, TRUE); + if (drawablep->getVObj()) + { + drawablep->getVObj()->dirtySpatialGroup(TRUE); + } + } iter = moved_list.erase(curiter); } } @@ -2026,8 +2055,6 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl gGLLastMatrix = NULL; gGL.loadMatrix(gGLLastModelView); - - LLVertexBuffer::unbind(); LLGLDisable blend(GL_BLEND); LLGLDisable test(GL_ALPHA_TEST); gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); @@ -2071,7 +2098,16 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl { //if no shader is currently bound, use the occlusion shader instead of fixed function if we can // (shadow render uses a special shader that clamps to clip planes) bound_shader = true; - gOcclusionProgram.bind(); + gOcclusionCubeProgram.bind(); + } + + if (sUseOcclusion > 1) + { + if (mCubeVB.isNull()) + { //cube VB will be used for issuing occlusion queries + mCubeVB = ll_create_cube_vb(LLVertexBuffer::MAP_VERTEX, GL_STATIC_DRAW_ARB); + } + mCubeVB->setBuffer(LLVertexBuffer::MAP_VERTEX); } for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); @@ -2103,7 +2139,7 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl if (bound_shader) { - gOcclusionProgram.unbind(); + gOcclusionCubeProgram.unbind(); } camera.disableUserClipPlane(); @@ -2143,10 +2179,6 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl { mScreen.flush(); } - /*else if (LLPipeline::sUseOcclusion > 1) - { - glFlush(); - }*/ } void LLPipeline::markNotCulled(LLSpatialGroup* group, LLCamera& camera) @@ -2215,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(); @@ -2240,14 +2272,20 @@ void LLPipeline::doOcclusion(LLCamera& camera) { if (LLPipeline::sShadowRender) { - gDeferredShadowProgram.bind(); + gDeferredShadowCubeProgram.bind(); } else { - gOcclusionProgram.bind(); + gOcclusionCubeProgram.bind(); } } + if (mCubeVB.isNull()) + { //cube VB will be used for issuing occlusion queries + mCubeVB = ll_create_cube_vb(LLVertexBuffer::MAP_VERTEX, GL_STATIC_DRAW_ARB); + } + mCubeVB->setBuffer(LLVertexBuffer::MAP_VERTEX); + for (LLCullResult::sg_list_t::iterator iter = sCull->beginOcclusionGroups(); iter != sCull->endOcclusionGroups(); ++iter) { LLSpatialGroup* group = *iter; @@ -2259,11 +2297,11 @@ void LLPipeline::doOcclusion(LLCamera& camera) { if (LLPipeline::sShadowRender) { - gDeferredShadowProgram.unbind(); + gDeferredShadowCubeProgram.unbind(); } else { - gOcclusionProgram.unbind(); + gOcclusionCubeProgram.unbind(); } } @@ -2282,6 +2320,8 @@ BOOL LLPipeline::updateDrawableGeom(LLDrawable* drawablep, BOOL priority) return update_complete; } +static LLFastTimer::DeclareTimer FTM_SEED_VBO_POOLS("Seed VBO Pool"); + void LLPipeline::updateGL() { while (!LLGLUpdate::sGLQ.empty()) @@ -2291,6 +2331,11 @@ void LLPipeline::updateGL() glu->mInQ = FALSE; LLGLUpdate::sGLQ.pop_front(); } + + /*{ //seed VBO Pools + LLFastTimer t(FTM_SEED_VBO_POOLS); + LLVertexBuffer::seedPools(); + }*/ } void LLPipeline::rebuildPriorityGroups() @@ -2668,11 +2713,16 @@ void LLPipeline::processPartitionQ() mPartitionQ.clear(); } + +void LLPipeline::markMeshDirty(LLSpatialGroup* group) +{ + mMeshDirtyGroup.push_back(group); +} + void LLPipeline::markRebuild(LLSpatialGroup* group, BOOL priority) { LLMemType mt(LLMemType::MTYPE_PIPELINE); - //llassert(is_main_thread()); - + if (group && !group->isDead() && group->mSpatialPartition) { if (group->mSpatialPartition->mPartitionType == LLViewerRegion::PARTITION_HUD) @@ -3039,7 +3089,11 @@ void renderScriptedBeacons(LLDrawable* drawablep) S32 count = drawablep->getNumFaces(); for (face_id = 0; face_id < count; face_id++) { - gPipeline.mHighlightFaces.push_back(drawablep->getFace(face_id) ); + LLFace * facep = drawablep->getFace(face_id); + if (facep) + { + gPipeline.mHighlightFaces.push_back(facep); + } } } } @@ -3066,7 +3120,11 @@ void renderScriptedTouchBeacons(LLDrawable* drawablep) S32 count = drawablep->getNumFaces(); for (face_id = 0; face_id < count; face_id++) { - gPipeline.mHighlightFaces.push_back(drawablep->getFace(face_id) ); + LLFace * facep = drawablep->getFace(face_id); + if (facep) + { + gPipeline.mHighlightFaces.push_back(facep); + } } } } @@ -3092,7 +3150,11 @@ void renderPhysicalBeacons(LLDrawable* drawablep) S32 count = drawablep->getNumFaces(); for (face_id = 0; face_id < count; face_id++) { - gPipeline.mHighlightFaces.push_back(drawablep->getFace(face_id) ); + LLFace * facep = drawablep->getFace(face_id); + if (facep) + { + gPipeline.mHighlightFaces.push_back(facep); + } } } } @@ -3118,7 +3180,11 @@ void renderParticleBeacons(LLDrawable* drawablep) S32 count = drawablep->getNumFaces(); for (face_id = 0; face_id < count; face_id++) { - gPipeline.mHighlightFaces.push_back(drawablep->getFace(face_id) ); + LLFace * facep = drawablep->getFace(face_id); + if (facep) + { + gPipeline.mHighlightFaces.push_back(facep); + } } } } @@ -3136,7 +3202,11 @@ void renderSoundHighlights(LLDrawable* drawablep) S32 count = drawablep->getNumFaces(); for (face_id = 0; face_id < count; face_id++) { - gPipeline.mHighlightFaces.push_back(drawablep->getFace(face_id) ); + LLFace * facep = drawablep->getFace(face_id); + if (facep) + { + gPipeline.mHighlightFaces.push_back(facep); + } } } } @@ -3166,39 +3236,10 @@ void LLPipeline::postSort(LLCamera& camera) //rebuild groups sCull->assertDrawMapsEmpty(); - /*LLSpatialGroup::sNoDelete = FALSE; - for (LLCullResult::sg_list_t::iterator i = sCull->beginVisibleGroups(); i != sCull->endVisibleGroups(); ++i) - { - LLSpatialGroup* group = *i; - if (sUseOcclusion && - group->isState(LLSpatialGroup::OCCLUDED)) - { - continue; - } - - group->rebuildGeom(); - } - LLSpatialGroup::sNoDelete = TRUE;*/ - - rebuildPriorityGroups(); llpushcallstacks ; - const S32 bin_count = 1024*8; - - static LLCullResult::drawinfo_list_t alpha_bins[bin_count]; - static U32 bin_size[bin_count]; - - //clear one bin per frame to avoid memory bloat - static S32 clear_idx = 0; - clear_idx = (1+clear_idx)%bin_count; - alpha_bins[clear_idx].clear(); - - for (U32 j = 0; j < bin_count; j++) - { - bin_size[j] = 0; - } - + //build render map for (LLCullResult::sg_list_t::iterator i = sCull->beginVisibleGroups(); i != sCull->endVisibleGroups(); ++i) { @@ -3272,11 +3313,41 @@ void LLPipeline::postSort(LLCamera& camera) } } } + + //flush particle VB + LLVOPartGroup::sVB->flush(); + + /*bool use_transform_feedback = gTransformPositionProgram.mProgramObject && !mMeshDirtyGroup.empty(); + + if (use_transform_feedback) + { //place a query around potential transform feedback code for synchronization + mTransformFeedbackPrimitives = 0; + + if (!mMeshDirtyQueryObject) + { + glGenQueriesARB(1, &mMeshDirtyQueryObject); + } + + glBeginQueryARB(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, mMeshDirtyQueryObject); + }*/ + + //pack vertex buffers for groups that chose to delay their updates + for (LLSpatialGroup::sg_vector_t::iterator iter = mMeshDirtyGroup.begin(); iter != mMeshDirtyGroup.end(); ++iter) + { + (*iter)->rebuildMesh(); + } + + /*if (use_transform_feedback) + }*/ + + mMeshDirtyGroup.clear(); + if (!sShadowRender) { std::sort(sCull->beginAlphaGroups(), sCull->endAlphaGroups(), LLSpatialGroup::CompareDepthGreater()); } + llpushcallstacks ; forAllVisibleDrawables(updateParticleActivity); //for llfloateravatarlist @@ -3377,7 +3448,11 @@ void LLPipeline::postSort(LLCamera& camera) { if (object->mDrawable) { - gPipeline.mSelectedFaces.push_back(object->mDrawable->getFace(te)); + LLFace * facep = object->mDrawable->getFace(te); + if (facep) + { + gPipeline.mSelectedFaces.push_back(facep); + } } return true; } @@ -5998,7 +6073,6 @@ LLSpatialPartition* LLPipeline::getSpatialPartition(LLViewerObject* vobj) return NULL; } - void LLPipeline::resetVertexBuffers(LLDrawable* drawable) { if (!drawable) @@ -6009,13 +6083,15 @@ void LLPipeline::resetVertexBuffers(LLDrawable* drawable) for (S32 i = 0; i < drawable->getNumFaces(); i++) { LLFace* facep = drawable->getFace(i); - facep->clearVertexBuffer(); + if (facep) + { + facep->clearVertexBuffer(); + } } } void LLPipeline::resetVertexBuffers() -{ - mResetVertexBuffers = true; +{ mResetVertexBuffers = true; } void LLPipeline::doResetVertexBuffers() @@ -6024,9 +6100,12 @@ void LLPipeline::doResetVertexBuffers() { return; } - + mResetVertexBuffers = false; + mCubeVB = NULL; + mDeferredVB = NULL; + for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); iter != LLWorld::getInstance()->getRegionList().end(); ++iter) { @@ -6045,11 +6124,14 @@ void LLPipeline::doResetVertexBuffers() gSky.resetVertexBuffers(); + LLVOPartGroup::destroyGL(); + LLVertexBuffer::cleanupClass(); //delete all name pool caches LLGLNamePool::cleanupPools(); + if (LLVertexBuffer::sGLCount > 0) { llwarns << "VBO wipe failed -- " << LLVertexBuffer::sGLCount << " buffers remaining." << llendl; @@ -6059,15 +6141,17 @@ 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"); LLVertexBuffer::initClass(LLVertexBuffer::sEnableVBOs, LLVertexBuffer::sDisableVBOMapping); + + LLVOPartGroup::restoreGL(); } void LLPipeline::renderObjects(U32 type, U32 mask, BOOL texture, BOOL batch_texture) @@ -7160,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; @@ -7372,12 +7461,17 @@ void LLPipeline::renderDeferredLighting() std::list light_colors; LLVertexBuffer::unbind(); - LLVector4a* v = (LLVector4a*) vert.get(); { bindDeferredShader(gDeferredLightProgram); - mDeferredVB->setBuffer(LLVertexBuffer::MAP_VERTEX); + + if (mCubeVB.isNull()) + { + mCubeVB = ll_create_cube_vb(LLVertexBuffer::MAP_VERTEX, GL_STATIC_DRAW_ARB); + } + mCubeVB->setBuffer(LLVertexBuffer::MAP_VERTEX); + LLGLDepthTest depth(GL_TRUE, GL_FALSE); for (LLDrawable::drawable_set_t::iterator iter = mLights.begin(); iter != mLights.end(); ++iter) { @@ -7423,25 +7517,7 @@ void LLPipeline::renderDeferredLighting() } sVisibleLightCount++; - - glh::vec3f tc(c); - mat.mult_matrix_vec(tc); - - //vertex positions are encoded so the 3 bits of their vertex index - //correspond to their axis facing, with bit position 3,2,1 matching - //axis facing x,y,z, bit set meaning positive facing, bit clear - //meaning negative facing - mDeferredVB->getVertexStrider(vert); - v[0].set(c[0]-s,c[1]-s,c[2]-s); // 0 - 0000 - v[1].set(c[0]-s,c[1]-s,c[2]+s); // 1 - 0001 - v[2].set(c[0]-s,c[1]+s,c[2]-s); // 2 - 0010 - v[3].set(c[0]-s,c[1]+s,c[2]+s); // 3 - 0011 - - v[4].set(c[0]+s,c[1]-s,c[2]-s); // 4 - 0100 - v[5].set(c[0]+s,c[1]-s,c[2]+s); // 5 - 0101 - v[6].set(c[0]+s,c[1]+s,c[2]-s); // 6 - 0110 - v[7].set(c[0]+s,c[1]+s,c[2]+s); // 7 - 0111 - + if (camera->getOrigin().mV[0] > c[0] + s + 0.2f || camera->getOrigin().mV[0] < c[0] - s - 0.2f || camera->getOrigin().mV[1] > c[1] + s + 0.2f || @@ -7459,16 +7535,13 @@ void LLPipeline::renderDeferredLighting() } LLFastTimer ftm(FTM_LOCAL_LIGHTS); - //glTexCoord4f(tc.v[0], tc.v[1], tc.v[2], s*s); - gDeferredLightProgram.uniform3fv(LLShaderMgr::LIGHT_CENTER, 1, tc.v); + gDeferredLightProgram.uniform3fv(LLShaderMgr::LIGHT_CENTER, 1, c); gDeferredLightProgram.uniform1f(LLShaderMgr::LIGHT_SIZE, s*s); gDeferredLightProgram.uniform3fv(LLShaderMgr::DIFFUSE_COLOR, 1, col.mV); gDeferredLightProgram.uniform1f(LLShaderMgr::LIGHT_FALLOFF, volume->getLightFalloff()*0.5f); - //gGL.diffuseColor4f(col.mV[0], col.mV[1], col.mV[2], volume->getLightFalloff()*0.5f); gGL.syncMatrices(); - mDeferredVB->setBuffer(LLVertexBuffer::MAP_VERTEX); - glDrawRangeElements(GL_TRIANGLE_FAN, 0, 7, 8, - GL_UNSIGNED_SHORT, get_box_fan_indices_ptr(camera, center)); + + mCubeVB->drawRange(LLRender::TRIANGLE_FAN, 0, 7, 8, get_box_fan_indices(camera, center)); stop_glerror(); } } @@ -7481,6 +7554,9 @@ void LLPipeline::renderDeferredLighting() continue; } + glh::vec3f tc(c); + mat.mult_matrix_vec(tc); + fullscreen_lights.push_back(LLVector4(tc.v[0], tc.v[1], tc.v[2], s*s)); light_colors.push_back(LLVector4(col.mV[0], col.mV[1], col.mV[2], volume->getLightFalloff()*0.5f)); } @@ -7493,7 +7569,7 @@ void LLPipeline::renderDeferredLighting() LLGLDepthTest depth(GL_TRUE, GL_FALSE); bindDeferredShader(gDeferredSpotLightProgram); - mDeferredVB->setBuffer(LLVertexBuffer::MAP_VERTEX); + mCubeVB->setBuffer(LLVertexBuffer::MAP_VERTEX); gDeferredSpotLightProgram.enableTexture(LLShaderMgr::DEFERRED_PROJECTION); @@ -7511,36 +7587,17 @@ void LLPipeline::renderDeferredLighting() sVisibleLightCount++; - glh::vec3f tc(c); - mat.mult_matrix_vec(tc); - setupSpotLight(gDeferredSpotLightProgram, drawablep); LLColor3 col = volume->getLightColor(); - - //vertex positions are encoded so the 3 bits of their vertex index - //correspond to their axis facing, with bit position 3,2,1 matching - //axis facing x,y,z, bit set meaning positive facing, bit clear - //meaning negative facing - mDeferredVB->getVertexStrider(vert); - v[0].set(c[0]-s,c[1]-s,c[2]-s); // 0 - 0000 - v[1].set(c[0]-s,c[1]-s,c[2]+s); // 1 - 0001 - v[2].set(c[0]-s,c[1]+s,c[2]-s); // 2 - 0010 - v[3].set(c[0]-s,c[1]+s,c[2]+s); // 3 - 0011 - - v[4].set(c[0]+s,c[1]-s,c[2]-s); // 4 - 0100 - v[5].set(c[0]+s,c[1]-s,c[2]+s); // 5 - 0101 - v[6].set(c[0]+s,c[1]+s,c[2]-s); // 6 - 0110 - v[7].set(c[0]+s,c[1]+s,c[2]+s); // 7 - 0111 - gDeferredSpotLightProgram.uniform3fv(LLShaderMgr::LIGHT_CENTER, 1, tc.v); + gDeferredSpotLightProgram.uniform3fv(LLShaderMgr::LIGHT_CENTER, 1, c); gDeferredSpotLightProgram.uniform1f(LLShaderMgr::LIGHT_SIZE, s*s); gDeferredSpotLightProgram.uniform3fv(LLShaderMgr::DIFFUSE_COLOR, 1, col.mV); gDeferredSpotLightProgram.uniform1f(LLShaderMgr::LIGHT_FALLOFF, volume->getLightFalloff()*0.5f); gGL.syncMatrices(); - mDeferredVB->setBuffer(LLVertexBuffer::MAP_VERTEX); - glDrawRangeElements(GL_TRIANGLE_FAN, 0, 7, 8, - GL_UNSIGNED_SHORT, get_box_fan_indices_ptr(camera, center)); + + mCubeVB->drawRange(LLRender::TRIANGLE_FAN, 0, 7, 8, get_box_fan_indices(camera, center)); } gDeferredSpotLightProgram.disableTexture(LLShaderMgr::DEFERRED_PROJECTION); unbindDeferredShader(gDeferredSpotLightProgram); @@ -7572,8 +7629,6 @@ void LLPipeline::renderDeferredLighting() LLVector4 light[max_count]; LLVector4 col[max_count]; -// glVertexPointer(2, GL_FLOAT, 0, vert); - F32 far_z = 0.f; while (!fullscreen_lights.empty()) @@ -8011,7 +8066,11 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) gPipeline.pushRenderTypeMask(); if (detail < 4) { +#if ENABLE_CLASSIC_CLOUDS clearRenderTypeMask(LLPipeline::RENDER_TYPE_PARTICLES, LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS, END_RENDER_TYPES); +#else + clearRenderTypeMask(LLPipeline::RENDER_TYPE_PARTICLES, END_RENDER_TYPES); +#endif if (detail < 3) { clearRenderTypeMask(LLPipeline::RENDER_TYPE_AVATAR, END_RENDER_TYPES); @@ -8068,7 +8127,9 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) { clearRenderTypeMask(LLPipeline::RENDER_TYPE_GROUND, LLPipeline::RENDER_TYPE_SKY, +#if ENABLE_CLASSIC_CLOUDS LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS, +#endif LLPipeline::RENDER_TYPE_WL_CLOUDS, LLPipeline::RENDER_TYPE_WL_SKY, END_RENDER_TYPES); @@ -8226,7 +8287,7 @@ void LLPipeline::renderShadow(glh::matrix4f& view, glh::matrix4f& proj, LLCamera if (use_shader) { - gDeferredShadowProgram.bind(); + gDeferredShadowCubeProgram.bind(); } updateCull(shadow_cam, result); @@ -8243,17 +8304,10 @@ void LLPipeline::renderShadow(glh::matrix4f& view, glh::matrix4f& proj, LLCamera stop_glerror(); gGLLastMatrix = NULL; - { - //LLGLDepthTest depth(GL_TRUE); - //glClear(GL_DEPTH_BUFFER_BIT); - } - gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); stop_glerror(); - //glCullFace(GL_FRONT); - LLVertexBuffer::unbind(); { @@ -8261,10 +8315,14 @@ void LLPipeline::renderShadow(glh::matrix4f& view, glh::matrix4f& proj, LLCamera { //occlusion program is general purpose depth-only no-textures gOcclusionProgram.bind(); } + else + { + gDeferredShadowProgram.bind(); + } gGL.diffuseColor4f(1,1,1,1); gGL.setColorMask(false, false); - + LLFastTimer ftm(FTM_SHADOW_SIMPLE); gGL.getTexUnit(0)->disable(); for (U32 i = 0; i < sizeof(types)/sizeof(U32); ++i) @@ -8310,7 +8368,7 @@ void LLPipeline::renderShadow(glh::matrix4f& view, glh::matrix4f& proj, LLCamera //glCullFace(GL_BACK); - gDeferredShadowProgram.bind(); + gDeferredShadowCubeProgram.bind(); gGLLastMatrix = NULL; gGL.loadMatrix(gGLModelView); doOcclusion(shadow_cam); diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index cfc897c41..4ad8a5e19 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -167,6 +167,7 @@ public: void markRebuild(LLSpatialGroup* group, BOOL priority = FALSE); void markRebuild(LLDrawable *drawablep, LLDrawable::EDrawableFlags flag = LLDrawable::REBUILD_ALL, BOOL priority = FALSE); void markPartitionMove(LLDrawable* drawablep); + void markMeshDirty(LLSpatialGroup* group); //get the object between start and end that's closest to start. LLViewerObject* lineSegmentIntersectInWorld(const LLVector3& start, const LLVector3& end, @@ -371,7 +372,7 @@ private: void removeFromQuickLookup( LLDrawPool* poolp ); BOOL updateDrawableGeom(LLDrawable* drawable, BOOL priority); void assertInitializedDoError(); - bool assertInitialized() { const bool is_init = isInit(); if (!is_init) assertInitializedDoError(); return is_init; } + bool assertInitialized() { const bool is_init = isInit(); if (!is_init) assertInitializedDoError(); return is_init; }; public: enum {GPU_CLASS_MAX = 3 }; @@ -412,7 +413,9 @@ public: RENDER_TYPE_VOLUME, RENDER_TYPE_PARTICLES, RENDER_TYPE_WL_CLOUDS, +#if ENABLE_CLASSIC_CLOUDS RENDER_TYPE_CLASSIC_CLOUDS, +#endif RENDER_TYPE_HUD_PARTICLES, NUM_RENDER_TYPES, END_RENDER_TYPES = NUM_RENDER_TYPES @@ -538,6 +541,9 @@ public: //utility buffer for rendering post effects, gets abused by renderDeferredLighting LLPointer mDeferredVB; + //utility buffer for rendering cubes, 8 vertices are corners of a cube [-1, 1] + LLPointer mCubeVB; + //sun shadow map LLRenderTarget mShadow[6]; std::vector mShadowFrustPoints[4]; @@ -589,6 +595,7 @@ public: BOOL mVertexShadersEnabled; S32 mVertexShadersLoaded; // 0 = no, 1 = yes, -1 = failed + U32 mTransformFeedbackPrimitives; //number of primitives expected to be generated by transform feedback protected: BOOL mRenderTypeEnabled[NUM_RENDER_TYPES]; std::stack mRenderTypeEnableStack; @@ -646,6 +653,9 @@ protected: LLSpatialGroup::sg_vector_t mGroupQ1; //priority LLSpatialGroup::sg_vector_t mGroupQ2; // non-priority + LLSpatialGroup::sg_vector_t mMeshDirtyGroup; //groups that need rebuildMesh called + U32 mMeshDirtyQueryObject; + LLDrawable::drawable_list_t mPartitionQ; //drawables that need to update their spatial partition radius bool mGroupQ2Locked; 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 @@ - - - -