Starting linux64 support

This reverts commit 803011582c.

.gitignore

@@ -1,4 +1,5 @@
 /installed.xml
+/indra/llcommon/llversionviewer.h
 /indra/build-*
 /indra/tools/vstool/obj/
 *.aps
@@ -11,11 +12,13 @@
 /indra/viewer-*
 /indra/newview/vivox-runtime/
 /libraries/
+/lib/
 *.pyc
 *.orig
 *.rej
 *.bak
 *~
+*.DS_Store
 /LICENSES/
 /edited-files.txt
 qtcreator-build/

LICENSES/GL.txt

@@ -1,22 +0,0 @@
-Mesa 3-D graphics library
-Version:  6.2
-
-Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
-
-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
-BRIAN PAUL 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.
-

LICENSES/SDL.txt

@@ -1,22 +0,0 @@
-SDL - Simple DirectMedia Layer
-Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002  Sam Lantinga
-
-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
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Sam Lantinga
-slouken@libsdl.org
-
-The GNU Library GPL is available at http://www.gnu.org/copyleft/lesser.html
-

LICENSES/apr_suite.txt

@@ -1,14 +0,0 @@
-Copyright 2000-2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-

LICENSES/boost-coroutine-linden.patch

@@ -1,62 +0,0 @@
-diff -rc ../boost-coroutine/boost/coroutine/coroutine.hpp boost-coroutine/boost/coroutine/coroutine.hpp
-*** ../boost-coroutine/boost/coroutine/coroutine.hpp	Wed Apr 29 14:41:05 2009
---- boost-coroutine/boost/coroutine/coroutine.hpp	Wed Apr 22 09:35:22 2009
-***************
-*** 28,33 ****
---- 28,36 ----
-  
-  #ifndef BOOST_COROUTINE_COROUTINE_HPP_20060512
-  #define BOOST_COROUTINE_COROUTINE_HPP_20060512
-+ // On Linux systems, use native swapcontext() et al. rather than
-+ // Boost.Coroutine homebrew assembler
-+ #define BOOST_COROUTINE_NO_ASM
-  // default_context_impl.hpp must be first for weird Apple bug
-  #include <boost/coroutine/detail/default_context_impl.hpp>
-  #include <cstddef>
-diff -rc ../boost-coroutine/boost/coroutine/future.hpp boost-coroutine/boost/coroutine/future.hpp
-*** ../boost-coroutine/boost/coroutine/future.hpp	Wed Apr 29 14:41:05 2009
---- boost-coroutine/boost/coroutine/future.hpp	Wed Apr 22 09:35:26 2009
-***************
-*** 33,38 ****
---- 33,41 ----
-  #ifndef BOOST_COROUTINE_WAIT_MAX
-  #define BOOST_COROUTINE_WAIT_MAX 10
-  #endif
-+ // On Linux systems, use native swapcontext() et al. rather than
-+ // Boost.Coroutine homebrew assembler
-+ #define BOOST_COROUTINE_NO_ASM
-  // default_context_impl.hpp must be first for weird Apple bug
-  #include <boost/coroutine/detail/default_context_impl.hpp>
-  #include <boost/none.hpp>
-diff -u -r old/boost/coroutine/detail/coroutine_impl.hpp new/boost/coroutine/detail/coroutine_impl.hpp
---- old/boost/coroutine/detail/coroutine_impl.hpp	2009-10-20 17:10:02.000000000 +0100
-+++ new/boost/coroutine/detail/coroutine_impl.hpp	2009-10-20 19:22:11.000000000 +0100
-@@ -56,7 +56,7 @@
-     typedef ContextImpl context_impl;
-     typedef CoroutineType coroutine_type;
-     typedef coroutine_impl<coroutine_type, context_impl> type;
--    typedef context_base<context_impl> context_base;
-+    typedef context_base<context_impl> context_base_type;
-     typedef typename coroutine_type::arg_slot_type arg_slot_type;
-     typedef typename coroutine_type::result_type result_type;
-     typedef typename coroutine_type::result_slot_type result_slot_type;
-@@ -65,7 +65,7 @@
-   
-     template<typename DerivedType>
- 	coroutine_impl(DerivedType * this_, std::ptrdiff_t stack_size) :
--      context_base(*this_, stack_size),
-+      context_base_type(*this_, stack_size),
- 	m_arg(0),
- 	m_result(0){}
-                 
-diff -u -r old/boost/coroutine/detail/posix_utility.hpp new/boost/coroutine/detail/posix_utility.hpp
---- old/boost/coroutine/detail/posix_utility.hpp	2009-04-24 21:30:44.000000000 +0100
-+++ new/boost/coroutine/detail/posix_utility.hpp	2009-10-20 19:21:27.000000000 +0100
-@@ -39,6 +39,7 @@
- #include <cstddef>
- #include <cstdlib>
- #include <iostream>
-+#include <cstring>
- #include <boost/type_traits.hpp>
- #if defined(_POSIX_MAPPED_FILES) && _POSIX_MAPPED_FILES > 0
- #include <sys/mman.h>

LICENSES/expat.txt

@@ -1,21 +0,0 @@
-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.
-

LICENSES/fontconfig.txt

@@ -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.
-

LICENSES/freetype.txt

@@ -1,3 +0,0 @@
-Portions of this software are copyright (c) 2003 The FreeType
-Project (www.freetype.org). All rights reserved.
-

LICENSES/gstreamer.txt

@@ -1,68 +0,0 @@
-http://www.gnu.org/copyleft/lgpl.html
-
-GNU LESSER GENERAL PUBLIC LICENSE
-
-Version 3, 29 June 2007
-
-Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below.
-0. Additional Definitions.
-
-As used herein, .this License. refers to version 3 of the GNU Lesser General Public License, and the .GNU GPL. refers to version 3 of the GNU General Public License.
-
-.The Library. refers to a covered work governed by this License, other than an Application or a Combined Work as defined below.
-
-An .Application. is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library.
-
-A .Combined Work. is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the .Linked Version..
-
-The .Minimal Corresponding Source. for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version.
-
-The .Corresponding Application Code. for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work.
-1. Exception to Section 3 of the GNU GPL.
-
-You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL.
-2. Conveying Modified Versions.
-
-If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version:
-
-    * a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or
-	    * b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy.
-
-		3. Object Code Incorporating Material from Library Header Files.
-
-		The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following:
-
-		    * a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License.
-			    * b) Accompany the object code with a copy of the GNU GPL and this license document.
-
-				4. Combined Works.
-
-				You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following:
-
-				    * a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License.
-					    * b) Accompany the Combined Work with a copy of the GNU GPL and this license document.
-						    * c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document.
-							    * d) Do one of the following:
-								          o 0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.
-										            o 1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version.
-													    * e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.)
-
-														5. Combined Libraries.
-
-														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 that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following:
-
-														    * a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License.
-															    * b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
-
-																6. Revised Versions of the GNU Lesser General Public License.
-
-																The Free Software Foundation may publish revised and/or new versions of the GNU Lesser 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 as you received it specifies that a certain numbered version of the GNU Lesser General Public License .or any later version. applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation.
-
-																If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library.
-

LICENSES/gtk-atk-pango-glib.txt

@@ -1,182 +0,0 @@
-http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
-
-LGPL v 2.1
-
-Version 2.1, February 1999
-
-Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  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 Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
-  the version number 2.1.]
-
-  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 Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use, 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 and use pieces of it in new free programs; and that you are informed that you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these 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 other code 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.
-
-  We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library.
-
-  We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances.
-
-  For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system.
-
-  Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library.
-
-  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, whereas the latter must be combined with the library in order to run.
-
-  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser 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 combine 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) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with.
-    * c) 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.
-    * d) 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.
-    * e) 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 materials to be 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 with 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 Lesser 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
-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.
-
-one line to give the library's name and an idea of what it does.
-Copyright (C) year  name of author
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  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.
-
-signature of Ty Coon, 1 April 1990
-Ty Coon, President of Vice
-
-That's all there is to it! 
-

LICENSES/jpeglib.txt

@@ -1,16 +0,0 @@
-http://nyctergatis.com/jpeglib/
-
-The license below is known as the modified BSD license, with an additional reference to the Independent JPEG Group to comply with its terms. It applies to the source code written specifically for the Palm, not to the work of the Independent JPEG Group (see the remark below).
-
-Copyright (c) 2003, Yves Piguet.
-All rights reserved.
-Based on the work of the Independent JPEG Group.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    * Neither the name of Yves Piguet nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

LICENSES/jsoncpp.txt

@@ -1,2 +0,0 @@
-The json-cpp library and this documentation are in Public Domain.  
-Retrieved from http://jsoncpp.sourceforge.net/ on 2009-09-04.

LICENSES/libpng.txt

@@ -1,109 +0,0 @@
-
-This copy of the libpng notices is provided for your convenience.  In case of
-any discrepancy between this copy and the notices in the file png.h that is
-included in the libpng distribution, the latter shall prevail.
-
-COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
-
-If you modify libpng you may insert additional notices immediately following
-this sentence.
-
-libpng versions 1.2.6, August 15, 2004, through 1.2.35, February 14, 2009, are
-Copyright (c) 2004, 2006-2008 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-1.2.5
-with the following individual added to the list of Contributing Authors
-
-   Cosmin Truta
-
-libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
-Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-1.0.6
-with the following individuals added to the list of Contributing Authors
-
-   Simon-Pierre Cadieux
-   Eric S. Raymond
-   Gilles Vollant
-
-and with the following additions to the disclaimer:
-
-   There is no warranty against interference with your enjoyment of the
-   library or against infringement.  There is no warranty that our
-   efforts or the library will fulfill any of your particular purposes
-   or needs.  This library is provided with all faults, and the entire
-   risk of satisfactory quality, performance, accuracy, and effort is with
-   the user.
-
-libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
-Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-0.96,
-with the following individuals added to the list of Contributing Authors:
-
-   Tom Lane
-   Glenn Randers-Pehrson
-   Willem van Schaik
-
-libpng versions 0.89, June 1996, through 0.96, May 1997, are
-Copyright (c) 1996, 1997 Andreas Dilger
-Distributed according to the same disclaimer and license as libpng-0.88,
-with the following individuals added to the list of Contributing Authors:
-
-   John Bowler
-   Kevin Bracey
-   Sam Bushell
-   Magnus Holmgren
-   Greg Roelofs
-   Tom Tanner
-
-libpng versions 0.5, May 1995, through 0.88, January 1996, are
-Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
-
-For the purposes of this copyright and license, "Contributing Authors"
-is defined as the following set of individuals:
-
-   Andreas Dilger
-   Dave Martindale
-   Guy Eric Schalnat
-   Paul Schmidt
-   Tim Wegner
-
-The PNG Reference Library is supplied "AS IS".  The Contributing Authors
-and Group 42, Inc. disclaim all warranties, expressed or implied,
-including, without limitation, the warranties of merchantability and of
-fitness for any purpose.  The Contributing Authors and Group 42, Inc.
-assume no liability for direct, indirect, incidental, special, exemplary,
-or consequential damages, which may result from the use of the PNG
-Reference Library, even if advised of the possibility of such damage.
-
-Permission is hereby granted to use, copy, modify, and distribute this
-source code, or portions hereof, for any purpose, without fee, subject
-to the following restrictions:
-
-1. The origin of this source code must not be misrepresented.
-
-2. Altered versions must be plainly marked as such and must not
-   be misrepresented as being the original source.
-
-3. This Copyright notice may not be removed or altered from any
-   source or altered source distribution.
-
-The Contributing Authors and Group 42, Inc. specifically permit, without
-fee, and encourage the use of this source code as a component to
-supporting the PNG file format in commercial products.  If you use this
-source code in a product, acknowledgment is not required but would be
-appreciated.
-
-
-A "png_get_copyright" function is available, for convenient use in "about"
-boxes and the like:
-
-   printf("%s",png_get_copyright(NULL));
-
-Also, the PNG logo (in PNG format, of course) is supplied in the
-files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
-
-Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
-certification mark of the Open Source Initiative.
-
-Glenn Randers-Pehrson
-glennrp at users.sourceforge.net
-February 14, 2009

LICENSES/mesa.txt

@@ -1,58 +0,0 @@
-http://www.mesa3d.org/license.html
-
-License / Copyright Information
-
-The Mesa distribution consists of several components. Different copyrights and licenses apply to different components. For example, GLUT is copyrighted by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa device drivers are copyrighted by their authors. See below for a list of Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license. This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
-
-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
-BRIAN PAUL 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.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms of the component to which you're contributing. The following section lists the primary components of the Mesa distribution and their respective licenses.
-Mesa Component Licenses
-
-Component         Location               Primary Author      License
-----------------------------------------------------------------------------
-Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
-
-Device drivers    src/mesa/drivers/*     See drivers         See drivers
-
-Ext headers       include/GL/glext.h     SGI                 SGI Free B
-                  include/GL/glxext.h
-
-GLUT              src/glut/              Mark Kilgard        Mark's copyright
-
-Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
-
-SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
-
-demo programs     progs/demos/           various             see source files
-
-X demos           progs/xdemos/          Brian Paul          see source files
-
-SGI demos         progs/samples/         SGI                 SGI copyright
-
-RedBook demos     progs/redbook/         SGI                 SGI copyright
-
-

LICENSES/ndofdev.txt

@@ -1,23 +0,0 @@
-* Copyright (c) 2008, Jan Ciger (jan.ciger (at) gmail.com)
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * The name of its contributors may not be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY Jan Ciger ''AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL Jan Ciger BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSES/ogg-vorbis.txt

@@ -1,29 +0,0 @@
-Copyright (c) 2001, Xiphophorus
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-- Neither the name of the Xiphophorus nor the names of its contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

LICENSES/openSSL.txt

@@ -1,116 +0,0 @@
-Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-All rights reserved.
-
-This package is an SSL implementation written
-by Eric Young (eay@cryptsoft.com).
-The implementation was written so as to conform with Netscapes SSL.
-
-This library is free for commercial and non-commercial use as long as
-the following conditions are aheared to.  The following conditions
-apply to all code found in this distribution, be it the RC4, RSA,
-lhash, DES, etc., code; not just the SSL code.  The SSL documentation
-included with this distribution is covered by the same copyright terms
-except that the holder is Tim Hudson (tjh@cryptsoft.com).
-
-Copyright remains Eric Young's, and as such any Copyright notices in
-the code are not to be removed.
-If this package is used in a product, Eric Young should be given attribution
-as the author of the parts of the library used.
-This can be in the form of a textual message at program startup or
-in documentation (online or textual) provided with the package.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-   "This product includes cryptographic software written by
-   Eric Young (eay@cryptsoft.com)"
-   The word 'cryptographic' can be left out if the rouines from the library
-   being used are not cryptographic related :-).
-4. If you include any Windows specific code (or a derivative thereof) from
-   the apps directory (application code) you must include an acknowledgement:
-   "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
-
-THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-The licence and distribution terms for any publically available version or
-derivative of this code cannot be changed.  i.e. this code cannot simply be
-copied and put under another distribution licence
-[including the GNU Public Licence.]
-
-****************
-* SSLeay
-****************
-
-Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-All rights reserved.
-
-This package is an SSL implementation written
-by Eric Young (eay@cryptsoft.com).
-The implementation was written so as to conform with Netscapes SSL.
-
-This library is free for commercial and non-commercial use as long as
-the following conditions are aheared to.  The following conditions
-apply to all code found in this distribution, be it the RC4, RSA,
-lhash, DES, etc., code; not just the SSL code.  The SSL documentation
-included with this distribution is covered by the same copyright terms
-except that the holder is Tim Hudson (tjh@cryptsoft.com).
-
-Copyright remains Eric Young's, and as such any Copyright notices in
-the code are not to be removed.
-If this package is used in a product, Eric Young should be given attribution
-as the author of the parts of the library used.
-This can be in the form of a textual message at program startup or
-in documentation (online or textual) provided with the package.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-   "This product includes cryptographic software written by
-   Eric Young (eay@cryptsoft.com)"
-   The word 'cryptographic' can be left out if the rouines from the library
-   being used are not cryptographic related :-).
-4. If you include any Windows specific code (or a derivative thereof) from
-   the apps directory (application code) you must include an acknowledgement:
-   "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
-
-THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-The licence and distribution terms for any publically available version or
-derivative of this code cannot be changed.  i.e. this code cannot simply be
-copied and put under another distribution licence
-[including the GNU Public Licence.]
-

LICENSES/openal-linden.txt

@@ -1,4 +0,0 @@
-This is a modified version of openal-soft from GIT (56cc03860378e2758370b773b2a6f1b4e086b49a).
-The modified source which this was built from is available here:
-http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/openal-soft-linden-56cc03860378e2758370b773b2a6f1b4e086b49a.tar.bz2
-

LICENSES/tut.txt

@@ -1,10 +0,0 @@
- Copyright 2002-2006 Vladimir Dyuzhev
-Copyright 2007 Denis Kononenko
-Copyright 2008 Micha? Rzechonek
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSES/vivox.txt

@@ -1,180 +0,0 @@
-=================
-Vivox SDK License
-=================
-
-RSA Data Security, Inc. MD5 Message-Digest Algorithm
-
-Audio coding: Polycom<6F> Siren14TM (ITU-T Rec. G.722.1 Annex C)
-
-Open Source Software Licensing
-Each open source software component utilized by this product is subject to its own copyright and licensing terms, as listed below.
-
-
-*************************************************************
-*************************************************************
-
-/**
- * OpenAL cross platform audio library
- * Copyright (C) 1999-2000 by authors.
- * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- * Or go to http://www.gnu.org/copyleft/lgpl.html
- */
-
-*************************************************************
-*************************************************************
-RTP code under Lesser General Public License
-
-/*
-The oRTP library is an RTP (Realtime Transport Protocol - rfc3550) stack.
-Copyright (C) 2001 Simon MORLAT simon.morlat@linphone.org
-
-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 Vovida Software License, Version 1.0
- *
- * Copyright (c) 2000 Vovida Networks, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The names "VOCAL", "Vovida Open Communication Application Library",
- * and "Vovida Open Communication Application Library (VOCAL)" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact vocal@vovida.org.
- *
- * 4. Products derived from this software may not be called "VOCAL", nor
- * may "VOCAL" appear in their name, without prior written
- * permission of Vovida Networks, Inc.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
- * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL VOVIDA
- * NETWORKS, INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT DAMAGES
- * IN EXCESS OF $1,000, NOR FOR ANY INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- *
- * This software consists of voluntary contributions made by Vovida
- * Networks, Inc. and many individuals on behalf of Vovida Networks,
- * Inc. For more information on Vovida Networks, Inc., please see
- *
- *
- */
-*************************************************************
-*************************************************************
-
-Internet Software Consortium code
-
-/* This is from the BIND 4.9.4 release, modified to compile by itself*/
-/* Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-*************************************************************
-
-*************************************************************
-
-************************************************************
-
-http://tinyxpath.sourceforge.net/
-
-TinyXPath is covered by the zlib license :
-
-   www.sourceforge.net/projects/tinyxpath
-   Copyright (c) 2002-2006 Yves Berquin (yvesb@users.sourceforge.net)
-   
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-   
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-   
-   1. The origin of this software must not be misrepresented; you must
-   not claim that you wrote the original software. If you use this
-   software in a product, an acknowledgment in the product documentation
-   would be appreciated but is not required.
-   
-   2. Altered source versions must be plainly marked as such, and
-   must not be misrepresented as being the original software.
-   
-   3. This notice may not be removed or altered from any source distribution.
-
-
-************************************************************
-************************************************************
-
-THE FREE SOFTWARE FOUNDATION
-
-Any customer may request the source code for all open source portions of this product which are covered by the Free Software Foundation's General Public License (GPL), for a period of three years from purchase. Please contact the vendor from whom you obtained this product for instructions. A fee equivalent to the cost of making the code available may be charged. Alternatively, customers may choose to download desired GPL components directly from their original vendors. Specifically, this product contains the following GPL-licensed components:
-
-From Vivox:
-   - Assorted software components. To request source, contact Vivox at:
-     Vivox, Inc.
-     Attn: customer support
-     40 Speen Street Suite 402
-     Framingham, MA 01701
-     

LICENSES/xmlrpc-epi.txt

@@ -1,10 +0,0 @@
-Copyright 2000 Epinions, Inc.
-
-Subject to the following 3 conditions, Epinions, Inc. permits you, free of charge, to (a) use, copy, distribute, modify, perform and display this software and associated documentation files (the "Software"), and (b) permit others to whom the Software is furnished to do so as well.
-
-1) The above copyright notice and this permission notice shall be included without modification in all copies or substantial portions of the Software.
-
-2) THE SOFTWARE IS PROVIDED "AS IS", WITHOUT ANY WARRANTY OR CONDITION OF ANY KIND, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION ANY IMPLIED WARRANTIES OF ACCURACY, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-
-3) IN NO EVENT SHALL EPINIONS, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING NEGLIGENCE), EVEN IF EPINIONS, INC. IS AWARE OF THE POSSIBILITY OF SUCH DAMAGES.
-

LICENSES/zlib.txt

@@ -1,28 +0,0 @@
-'zlib' general purpose compression library version 1.1.4, March 11th, 2002
-
-Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the
-use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-The origin of this software must not be misrepresented; you must not claim
-that you wrote the original software. If you use this software in a product,
-an acknowledgment in the product documentation would be appreciated but is
-not required.
-
-Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
-
-This notice may not be removed or altered from any source distribution.
-
-Jean-loup Gailly
-jloup@gzip.org
-
-Mark Adler
-madler@alumni.caltech.edu
-

doc/contributions.txt

@@ -4,6 +4,10 @@ along with the issue identifier corresponding to the patches we've
 received from them.  To see more about these contributions, visit the
 browsable version: http://wiki.secondlife.com/wiki/Source_contributions
 
+Entries are related to URLs as follows:
+IMP-xxx: http://redmine.kokuaviewer.org/issues/xxx
+Everything else ([VWR|SNOW|CT|SVC|WEB]-xxx): https://jira.secondlife.com/browse/KEY-xxx
+
 Able Whitman
 	VWR-650
 	VWR-1460
@@ -58,12 +62,20 @@ Aimee Trescothick
 Alejandro Rosenthal
 	VWR-1184
 Aleric Inglewood
+	VWR-10579 (IMP-552)
 	VWR-10759
 	VWR-10837
 	VWR-12984
+	VWR-13040 (IMP-575)
 	VWR-13996
 	VWR-14426
 	VWR-14914
+	VWR-24247
+	VWR-24312
+	VWR-24315
+	VWR-24320
+	VWR-24333
+	VWR-24334
 	SNOW-47
 	SNOW-84
 	SNOW-86
@@ -72,18 +84,39 @@ Aleric Inglewood
 	SNOW-129
 	SNOW-196
 	SNOW-203
+	SNOW-240
 	SNOW-408
-	SNOW-415
+	SNOW-415 (IMP-576)
+	SNOW-477 (IMP-577)
 	SNOW-479
 	SNOW-626
-	SNOW-713
+	SNOW-713 (IMP-692)
-	SNOW-744
+	SNOW-744 (IMP-578)
-	SNOW-751
 	SNOW-752
 	SNOW-753
+	SNOW-766 (IMP-553)
 	SNOW-772
 	SNOW-793
+	SNOW-796 (IMP-581)
+	SNOW-800 (IMP-556)
 	SNOW-806
+	IMP-429
+	IMP-561
+	IMP-565
+	IMP-566
+	IMP-567
+	IMP-573
+	IMP-590
+	IMP-660
+	IMP-661
+	IMP-662
+	IMP-663
+	IMP-664
+	IMP-670
+	IMP-701
+	IMP-702
+	IMP-734
+	IMP-735
 Alissa Sabre
 	VWR-81
 	VWR-83
@@ -105,7 +138,7 @@ Alissa Sabre
 	VWR-1351
 	VWR-1353
 	VWR-1410
-        VWR-1843
+	VWR-1843
 	VWR-2116
 	VWR-2826
 	VWR-3290
@@ -113,17 +146,17 @@ Alissa Sabre
 	VWR-3857
 	VWR-4010
 	VWR-5575
-        VWR-5929
+	VWR-5929
-        VWR-6384
+	VWR-6384
-        VWR-6385
+	VWR-6385
 	VWR-6386
-        VWR-6430
+	VWR-6430
 	VWR-6858
-        VWR-6668
+	VWR-6668
-        VWR-7086
+	VWR-7086
-        VWR-7087
+	VWR-7087
-        VWR-7153
+	VWR-7153
-        VWR-7168
+	VWR-7168
 	VWR-9190
 	VWR-10728
 	VWR-12620
@@ -181,6 +214,7 @@ Boroondas Gupte
 	SNOW-201
 	SNOW-396
 	SNOW-589
+	SNOW-623 (IMP-554)
 	SNOW-624
 	VWR-233
 	WEB-262
@@ -549,7 +583,7 @@ Pf Shan
 	CT-321
 princess niven
 	VWR-5733
-        CT-85
+	CT-85
 	CT-320
 	CT-352
 Renault Clio
@@ -590,6 +624,7 @@ Robin Cornelius
 	VWR-11128
 	VWR-12758
 	VWR-12686
+	VWR-12838
 Ryozu Kojima
 	VWR-53
 	VWR-287
@@ -788,4 +823,3 @@ Zi Ree
 Zipherius Turas
 	VWR-76
 	VWR-77
-

etc/message.xml

@@ -670,19 +670,19 @@
 			<key>EstateChangeInfo</key>
 			<boolean>true</boolean>
 		
-			<key>FetchInventoryDescendents</key>
+			<key>FetchInventoryDescendents2</key>
 			<boolean>false</boolean>
-		
+
 			<key>WebFetchInventoryDescendents</key>
+			<boolean>false</boolean>
+
+			<key>FetchInventory2</key>
 			<boolean>true</boolean>
 		
-			<key>FetchInventory</key>
+			<key>FetchLibDescendents2</key>
 			<boolean>true</boolean>
 		
-			<key>FetchLibDescendents</key>
+			<key>FetchLib2</key>
-			<boolean>true</boolean>
-		
-			<key>FetchLib</key>
 			<boolean>true</boolean>
 		</map>
 

indra/CMakeLists.txt

@@ -26,10 +26,12 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 include(Variables)
 
 # Load versions now.  Install locations need them.
-include(Versions)
+include(BuildVersion)
 
 include(UnixInstall)
 
+set (GCC_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)
@@ -44,6 +46,7 @@ endif(NOT STANDALONE)
 add_custom_target(prepare DEPENDS ${prepare_depends})
 
 add_subdirectory(cmake)
+add_subdirectory(${LIBS_OPEN_PREFIX}cwdebug)
 add_subdirectory(${LIBS_OPEN_PREFIX}llaudio)
 add_subdirectory(${LIBS_OPEN_PREFIX}llcharacter)
 add_subdirectory(${LIBS_OPEN_PREFIX}llcommon)
@@ -75,8 +78,8 @@ if (VIEWER)
   add_subdirectory(${LIBS_OPEN_PREFIX}llplugin)
   add_subdirectory(${LIBS_OPEN_PREFIX}llui)
 
-  # viewer media plugins
+  # viewer plugins directory
-  add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins)
+  add_subdirectory(${LIBS_OPEN_PREFIX}plugins)
 
   # llplugin testbed code (is this the right way to include it?)
   #if (NOT LINUX)
@@ -87,7 +90,7 @@ if (VIEWER)
     add_subdirectory(${VIEWER_PREFIX}linux_crash_logger)
     add_dependencies(viewer linux-crash-logger-strip-target)
   elseif (DARWIN)
-    add_subdirectory(${VIEWER_PREFIX}mac_crash_logger)
+	#add_subdirectory(${VIEWER_PREFIX}mac_crash_logger)
 	#add_subdirectory(${VIEWER_PREFIX}mac_updater)
     add_dependencies(viewer mac-crash-logger)
 	#add_dependencies(viewer mac-updater)
@@ -105,6 +108,7 @@ if (VIEWER)
     add_dependencies(viewer solaris-crash-logger)
   endif (LINUX)
 
+  add_subdirectory(${VIEWER_PREFIX}newview/statemachine)
   add_subdirectory(${VIEWER_PREFIX}newview)
   add_dependencies(viewer secondlife-bin)
 endif (VIEWER)
@@ -132,27 +136,25 @@ endif (SERVER)
 
 # Configure prebuilt binary download.  This must be done last so that
 # all subdirectories have a chance to list the packages they need.
-if(NOT STANDALONE)
+# We need scp for proprietary downloads.
-  # We need scp for proprietary downloads.
+if(INSTALL_PROPRIETARY)
-  if(INSTALL_PROPRIETARY)
+  include(FindSCP)
-    include(FindSCP)
+endif(INSTALL_PROPRIETARY)
-  endif(INSTALL_PROPRIETARY)
 
-  # The use_prebuilt_binary macro in cmake/Prebuilt.cmake records
+# The use_prebuilt_binary macro in cmake/Prebuilt.cmake records
-  # packages in the PREBUILT property of the 'prepare' target.
+# packages in the PREBUILT property of the 'prepare' target.
-  get_property(PREBUILT_PACKAGES TARGET prepare PROPERTY PREBUILT)
+get_property(PREBUILT_PACKAGES TARGET prepare PROPERTY PREBUILT)
 
-  # Create a script to download the needed binaries.
+# Create a script to download the needed binaries.
-  configure_file(${CMAKE_SOURCE_DIR}/cmake/DownloadPrebuilt.cmake.in
+configure_file(${CMAKE_SOURCE_DIR}/cmake/DownloadPrebuilt.cmake.in
-                 ${CMAKE_BINARY_DIR}/DownloadPrebuilt.cmake @ONLY)
+               ${CMAKE_BINARY_DIR}/DownloadPrebuilt.cmake @ONLY)
 
-  # Drive the download script at build time.  Depend on 'install.xml'
+# Drive the download script at build time.  Depend on 'install.xml'
-  # to aqcuire new binaries when needed.
+# to aqcuire new binaries when needed.
-  add_custom_command(
+add_custom_command(
-    COMMENT "Obtaining prebuilt binaries..."
+  COMMENT "Obtaining prebuilt binaries..."
-    OUTPUT ${CMAKE_BINARY_DIR}/prepare/prebuilt
+  OUTPUT ${CMAKE_BINARY_DIR}/prepare/prebuilt
-    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/DownloadPrebuilt.cmake
+  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/DownloadPrebuilt.cmake
-    DEPENDS ${CMAKE_SOURCE_DIR}/../install.xml
+  DEPENDS ${CMAKE_SOURCE_DIR}/../install.xml
-            ${CMAKE_BINARY_DIR}/DownloadPrebuilt.cmake
+          ${CMAKE_BINARY_DIR}/DownloadPrebuilt.cmake
-    )
+  )
-endif(NOT STANDALONE)

indra/cmake/00-Common.cmake

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

indra/cmake/AIStateMachine.cmake

@@ -0,0 +1,4 @@
+# -*- cmake -*-
+
+set(AISTATEMACHINE_INCLUDE_DIRS statemachine)
+set(AISTATEMACHINE_LIBRARIES statemachine)

indra/cmake/APR.cmake

@@ -14,25 +14,27 @@ else (STANDALONE)
   use_prebuilt_binary(apr_suite)
   if (WINDOWS)
     set(APR_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/apr-1.lib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.lib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apr-1.lib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.lib
       )
     set(APRICONV_LIBRARIES 
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapriconv-1.lib
       optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapriconv-1.lib
       )
+    # Doesn't need to link with iconv.dll
+    set(APRICONV_LIBRARIES "")
     set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1.lib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.lib ${APRICONV_LIBRARIES}
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.lib ${APRICONV_LIBRARIES}
       )
   elseif (DARWIN)
     set(APR_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.0.3.7.dylib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.0.dylib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.3.7.dylib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.dylib
       )
     set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.0.3.8.dylib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.0.dylib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.3.8.dylib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.dylib
       )
     set(APRICONV_LIBRARIES iconv)
   else (WINDOWS)
@@ -41,9 +43,8 @@ else (STANDALONE)
     set(APRICONV_LIBRARIES iconv)
   endif (WINDOWS)
   set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/apr-1)
-  set(APRUTIL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/apr-1)
 
   if (LINUX AND VIEWER)
-    list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid)
+    list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES})
   endif (LINUX AND VIEWER)
 endif (STANDALONE)

indra/cmake/BasicPluginBase.cmake

@@ -0,0 +1,8 @@
+# -*- cmake -*-
+
+
+set(BASIC_PLUGIN_BASE_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/plugins/base_basic/
+    )
+
+set(BASIC_PLUGIN_BASE_LIBRARIES basic_plugin_base)

indra/cmake/BerkeleyDB.cmake

@@ -6,6 +6,11 @@ set(DB_FIND_REQUIRED ON)
 if (STANDALONE)
   include(FindBerkeleyDB)
 else (STANDALONE)
-  set(DB_LIBRARIES db-4.2)
+  if (LINUX)
+    # Need to add dependency pthread explicitely to support ld.gold.
+    set(DB_LIBRARIES db-4.2 pthread)
+  else (LINUX)
+    set(DB_LIBRARIES db-4.2)
+  endif (LINUX)
   set(DB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)

indra/cmake/Boost.cmake

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

indra/cmake/BuildVersion.cmake

@@ -1,23 +1,45 @@
 # -*- cmake -*-
 
-function (build_version _target)
+# Read version components from the header file.
-  # Read version components from the header file.
+file(STRINGS ${LIBS_OPEN_DIR}/llcommon/llversionviewer.h.in lines
-  file(STRINGS ${LIBS_OPEN_DIR}/llcommon/llversion${_target}.h lines
+   REGEX " LL_VERSION_")
-       REGEX " LL_VERSION_")
+foreach(line ${lines})
-  foreach(line ${lines})
+  string(REGEX REPLACE ".*LL_VERSION_([A-Z]+).*" "\\1" comp "${line}")
-    string(REGEX REPLACE ".*LL_VERSION_([A-Z]+).*" "\\1" comp "${line}")
+  string(REGEX REPLACE ".* = ([0-9]+);.*" "\\1" value "${line}")
-    string(REGEX REPLACE ".* = ([0-9]+);.*" "\\1" value "${line}")
+  set(v${comp} "${value}")
-    set(v${comp} "${value}")
+endforeach(line)
-  endforeach(line)
 
-  # Compose the version.
+execute_process(
-  set(${_target}_VERSION "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}")
+    COMMAND git rev-list HEAD
-  if (${_target}_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
+    OUTPUT_VARIABLE GIT_REV_LIST_STR
-    message(STATUS "Version of ${_target} is ${${_target}_VERSION}")
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  else (${_target}_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
+    OUTPUT_STRIP_TRAILING_WHITESPACE
-    message(FATAL_ERROR "Could not determine ${_target} version (${${_target}_VERSION})")
+)
-  endif (${_target}_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
 
-  # Report version to caller.
+if(GIT_REV_LIST_STR)
-  set(${_target}_VERSION "${${_target}_VERSION}" PARENT_SCOPE)
+  string(REPLACE "\n" ";" GIT_REV_LIST ${GIT_REV_LIST_STR})
-endfunction (build_version)
+else()
+  string(REPLACE "\n" ";" GIT_REV_LIST "")
+endif()
+
+if(GIT_REV_LIST)
+  list(LENGTH GIT_REV_LIST vBUILD)
+else()
+  set(vBUILD 99)
+endif()
+
+configure_file(
+    ${CMAKE_SOURCE_DIR}/llcommon/llversionviewer.h.in
+    ${CMAKE_SOURCE_DIR}/llcommon/llversionviewer.h
+)
+
+# Compose the version.
+set(viewer_VERSION "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}")
+if (viewer_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
+  message(STATUS "Version is ${viewer_VERSION}")
+else (viewer_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
+  message(FATAL_ERROR "Could not determine version (${viewer_VERSION})")
+endif (viewer_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
+
+# Report version to caller.
+#set(viewer_VERSION "${viewer_VERSION}" PARENT_SCOPE)

indra/cmake/CARes.cmake

@@ -19,5 +19,5 @@ else (STANDALONE)
     else (WINDOWS)
         set(CARES_LIBRARIES cares)
     endif (WINDOWS)
-    set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/ares)
+    set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/ares ${LIBS_PREBUILT_DIR}/include/ares )
 endif (STANDALONE)

indra/cmake/CMakeLists.txt

@@ -28,17 +28,18 @@ set(cmake_SOURCE_FILES
     FindCARes.cmake
     FindELFIO.cmake
     FindGooglePerfTools.cmake
+    FindHunSpell.cmake
     FindMono.cmake
     FindMT.cmake
     FindMySQL.cmake
     FindNDOF.cmake
     FindOpenJPEG.cmake
     FindXmlRpcEpi.cmake
-    FindZLIB.cmake
+	FMOD.cmake
-    FMOD.cmake
     FreeType.cmake
     GStreamer010Plugin.cmake
     GooglePerfTools.cmake
+    HUNSPELL.cmake
     JPEG.cmake
     LLAddBuildTest.cmake
     LLAudio.cmake
@@ -78,11 +79,14 @@ set(cmake_SOURCE_FILES
     UI.cmake
     UnixInstall.cmake
     Variables.cmake
-    Versions.cmake
     XmlRpcEpi.cmake
     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

indra/cmake/Cwdebug.cmake

@@ -0,0 +1 @@
+set(CWDEBUG_LIBRARIES cwdebug)

indra/cmake/DirectX.cmake

@@ -3,7 +3,7 @@
 if (VIEWER AND WINDOWS)
   find_path(DIRECTX_INCLUDE_DIR dxdiag.h
             "$ENV{DXSDK_DIR}/Include"
-			"$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Include"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Include"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Include"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Include"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Include"
@@ -25,7 +25,7 @@ if (VIEWER AND WINDOWS)
 
   find_path(DIRECTX_LIBRARY_DIR dxguid.lib
             "$ENV{DXSDK_DIR}/Lib/x86"
-			"$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Lib/x86"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Lib/x86"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Lib/x86"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Lib/x86"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Lib/x86"

indra/cmake/DownloadPrebuilt.cmake.in

@@ -6,6 +6,7 @@ set(install_dir "@CMAKE_SOURCE_DIR@/..")
 set(scp "@SCP_EXECUTABLE@")
 set(scripts_dir "@SCRIPTS_DIR@")
 set(sentinel_dir "@CMAKE_BINARY_DIR@/prepare")
+set(prebuilt_type "@PREBUILT_TYPE@")
 
 # In proprietary mode we use scp for download.
 set(proprietary "@INSTALL_PROPRIETARY@")
@@ -19,7 +20,7 @@ foreach(package ${packages})
     # This package is missing or out of date.
     message(STATUS "Obtaining${proprietary_message} prebuilt '${package}'")
     execute_process(
-      COMMAND ${python} install.py --install-dir=${install_dir} ${scp_option} ${package}
+      COMMAND ${python} install.py -p${prebuilt_type} --install-dir=${install_dir} ${scp_option} ${package}
       WORKING_DIRECTORY ${scripts_dir}
       RESULT_VARIABLE result
       )

indra/cmake/FMOD.cmake

@@ -7,26 +7,13 @@ if(INSTALL_PROPRIETARY)
   use_prebuilt_binary(fmod)
 endif(INSTALL_PROPRIETARY)
 
-find_library(FMOD_LIBRARY_RELEASE
+find_library(FMOD_LIBRARY
              NAMES fmod fmodvc fmod-3.75
              PATHS
-             ${ARCH_PREBUILT_DIRS_RELEASE}
+             optimized ${ARCH_PREBUILT_DIRS_RELEASE}
+             debug ${ARCH_PREBUILT_DIRS_DEBUG}
              )
 
-find_library(FMOD_LIBRARY_DEBUG
-             NAMES fmod fmodvc fmod-3.75
-             PATHS
-             ${ARCH_PREBUILT_DIRS_DEBUG}
-             )
-
-if (FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG)
-  set(FMOD_LIBRARY
-      debug ${FMOD_LIBRARY_DEBUG}
-      optimized ${FMOD_LIBRARY_RELEASE})
-elseif (FMOD_LIBRARY_RELEASE)
-  set(FMOD_LIBRARY ${FMOD_LIBRARY_RELEASE})
-endif (FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG)
-
 if (NOT FMOD_LIBRARY)
   set(FMOD_SDK_DIR CACHE PATH "Path to the FMOD SDK.")
   if (FMOD_SDK_DIR)
@@ -43,6 +30,7 @@ endif (NOT FMOD_LIBRARY)
 
 find_path(FMOD_INCLUDE_DIR fmod.h
           ${LIBS_PREBUILT_DIR}/include
+          ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include
           ${FMOD_SDK_DIR}/api/inc
           ${FMOD_SDK_DIR}/inc
           ${FMOD_SDK_DIR}

indra/cmake/FMODEX.cmake

@@ -0,0 +1,70 @@
+# -*- cmake -*-
+
+include(Linking)
+
+if(INSTALL_PROPRIETARY)
+  include(Prebuilt)
+  use_prebuilt_binary(fmodex)
+endif(INSTALL_PROPRIETARY)
+
+find_library(FMODEX_LIBRARY
+             NAMES fmodex fmodex_vc fmodexL_vc
+             PATHS
+             optimized ${ARCH_PREBUILT_DIRS_RELEASE}
+             debug ${ARCH_PREBUILT_DIRS_DEBUG}
+             )
+
+if (NOT FMODEX_LIBRARY)
+  set(FMODEX_SDK_DIR CACHE PATH "Path to the FMOD Ex SDK.")
+  if (FMODEX_SDK_DIR)
+    find_library(FMODEX_LIBRARY
+                 fmodex fmodex_vc fmodexL_vc
+                 PATHS
+                 ${FMODEX_SDK_DIR}/api/lib
+                 ${FMODEX_SDK_DIR}/api
+                 ${FMODEX_SDK_DIR}/lib
+                 ${FMODEX_SDK_DIR}
+                 )
+
+				 
+  endif(FMODEX_SDK_DIR)
+  if(WINDOWS AND NOT FMODEX_LIBRARY)
+	set(FMODEX_PROG_DIR "$ENV{PROGRAMFILES}/FMOD SoundSystem/FMOD Programmers API Windows")
+	find_library(FMODEX_LIBRARY
+                 fmodex_vc fmodexL_vc 
+                 PATHS
+                 ${FMODEX_PROG_DIR}/api/lib
+				 ${FMODEX_PROG_DIR}/api
+				 ${FMODEX_PROG_DIR}
+                 )
+	if(FMODEX_LIBRARY)
+		message(STATUS "Found fmodex in ${FMODEX_PROG_DIR}")
+		set(FMODEX_SDK_DIR ${FMODEX_PROG_DIR})
+		set(FMODEX_SDK_DIR ${FMODEX_PROG_DIR} CACHE PATH "Path to the FMOD Ex SDK." FORCE)
+	endif(FMODEX_LIBRARY)
+  endif(WINDOWS AND NOT FMODEX_LIBRARY)
+endif (NOT FMODEX_LIBRARY)
+
+find_path(FMODEX_INCLUDE_DIR fmod.h
+          ${LIBS_PREBUILT_DIR}/include/fmodex
+          ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/fmodex
+          ${FMODEX_SDK_DIR}/api/inc
+          ${FMODEX_SDK_DIR}/inc
+          ${FMODEX_SDK_DIR}
+          )
+
+if (FMODEX_LIBRARY AND FMODEX_INCLUDE_DIR)
+  set(FMODEX ON CACHE BOOL "Use closed source FMOD Ex sound library.")
+else (FMODEX_LIBRARY AND FMODEX_INCLUDE_DIR)
+  set(FMODEX_LIBRARY "")
+  set(FMODEX_INCLUDE_DIR "")
+  if (FMODEX)
+    message(STATUS "No support for FMOD Ex audio (need to set FMODEX_SDK_DIR?)")
+  endif (FMODEX)
+  set(FMODEX OFF CACHE BOOL "Use closed source FMOD Ex sound library.")
+  set(FMODEX OFF)
+endif (FMODEX_LIBRARY AND FMODEX_INCLUDE_DIR)
+
+if (FMODEX)
+  message(STATUS "Building with FMOD Ex audio support")
+endif (FMODEX)

indra/cmake/FindHunSpell.cmake

@@ -0,0 +1,34 @@
+FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell.hxx
+  /usr/local/include/hunspell
+  /usr/local/include
+  /usr/include/hunspell
+  /usr/include
+  )
+
+SET(HUNSPELL_NAMES ${HUNSPELL_NAMES} hunspell hunspell-1.2)
+FIND_LIBRARY(HUNSPELL_LIBRARY
+  NAMES ${HUNSPELL_NAMES}
+  PATHS /usr/lib /usr/local/lib
+  )
+
+IF(HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR)
+  SET(HUNSPELL_LIBRARIES ${HUNSPELL_LIBRARY})
+  SET(HUNSPELL_FOUND "YES")
+ELSE(HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR)
+  SET(HUNSPELL_FOUND "NO")
+ENDIF(HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR)
+
+IF(HUNSPELL_FOUND)
+  IF(NOT HUNSPELL_FIND_QUIETLY)
+    MESSAGE(STATUS "Found Hunspell: ${HUNSPELL_LIBRARIES}")
+  ENDIF(NOT HUNSPELL_FIND_QUIETLY)
+ELSE(HUNSPELL_FOUND)
+  IF(HUNSPELL_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "Could not find HunSpell library")
+  ENDIF(HUNSPELL_FIND_REQUIRED)
+ENDIF(HUNSPELL_FOUND)
+
+MARK_AS_ADVANCED(
+  HUNSPELL_LIBRARY
+  HUNSPELL_INCLUDE_DIR
+  )

indra/cmake/FindJsonCpp.cmake

@@ -9,7 +9,7 @@
 #  also defined, but not for general use are
 #  JSONCPP_LIBRARY, where to find the jsoncpp library.
 
-FIND_PATH(JSONCPP_INCLUDE_DIR jsoncpp/json.h
+FIND_PATH(JSONCPP_INCLUDE_DIR json/json.h
 /usr/local/include
 /usr/include
 )

indra/cmake/FindLLQtWebkit.cmake

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

indra/cmake/FindMT.cmake

@@ -1,15 +1,17 @@
-#Find the windows manifest tool.
+#Find the windows manifest tool.
-
+if (MSVC80)
-FIND_PROGRAM(HAVE_MANIFEST_TOOL NAMES mt
+  FIND_PROGRAM(HAVE_MANIFEST_TOOL NAMES mt
-                 PATHS
+                   PATHS
-                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/VC/bin"
+                   "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/VC/bin"
-                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin"
+                   "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin"
-                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin")
+                   "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin")
-IF(HAVE_MANIFEST_TOOL)
+  IF(HAVE_MANIFEST_TOOL)
-    MESSAGE(STATUS "Found Mainfest Tool. Embedding custom manifests.")
+      MESSAGE(STATUS "Found Mainfest Tool. Embedding custom manifests.")
-ELSE(HAVE_MANIFEST_TOOL)
+  ELSE(HAVE_MANIFEST_TOOL)
-    MESSAGE(FATAL_ERROR "Manifest tool, mt.exe, can't be found.")
+      MESSAGE(FATAL_ERROR "Manifest tool, mt.exe, can't be found.")
-ENDIF(HAVE_MANIFEST_TOOL)
+  ENDIF(HAVE_MANIFEST_TOOL)
-
+
-STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS 
+  STRING(REPLACE "/MANIFEST " "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS 
-      ${CMAKE_EXE_LINKER_FLAGS})
+      ${CMAKE_EXE_LINKER_FLAGS})
+
+endif (MSVC80)

indra/cmake/FindZLIB.cmake

@@ -1,46 +0,0 @@
-# -*- cmake -*-
-
-# - Find zlib
-# Find the ZLIB includes and library
-# This module defines
-#  ZLIB_INCLUDE_DIRS, where to find zlib.h, etc.
-#  ZLIB_LIBRARIES, the libraries needed to use zlib.
-#  ZLIB_FOUND, If false, do not try to use zlib.
-#
-# This FindZLIB is about 43 times as fast the one provided with cmake (2.8.x),
-# because it doesn't look up the version of zlib, resulting in a dramatic
-# speed up for configure (from 4 minutes 22 seconds to 6 seconds).
-#
-# Note: Since this file is only used for standalone, the windows
-# specific parts were left out.
-
-FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
-  NO_SYSTEM_ENVIRONMENT_PATH
-  )
-
-FIND_LIBRARY(ZLIB_LIBRARY z)
-
-if (ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
-  SET(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
-  SET(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
-  SET(ZLIB_FOUND "YES")
-else (ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
-  SET(ZLIB_FOUND "NO")
-endif (ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
-
-if (ZLIB_FOUND)
-  if (NOT ZLIB_FIND_QUIETLY)
-	message(STATUS "Found ZLIB: ${ZLIB_LIBRARIES}")
-	SET(ZLIB_FIND_QUIETLY TRUE)
-  endif (NOT ZLIB_FIND_QUIETLY)
-else (ZLIB_FOUND)
-  if (ZLIB_FIND_REQUIRED)
-	message(FATAL_ERROR "Could not find ZLIB library")
-  endif (ZLIB_FIND_REQUIRED)
-endif (ZLIB_FOUND)
-
-mark_as_advanced(
-  ZLIB_LIBRARY
-  ZLIB_INCLUDE_DIR
-  )
-

indra/cmake/GStreamer010Plugin.cmake

@@ -6,11 +6,13 @@ if (STANDALONE)
 
   pkg_check_modules(GSTREAMER010 REQUIRED gstreamer-0.10)
   pkg_check_modules(GSTREAMER010_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10)
-elseif (LINUX)
+
+else (STANDALONE)
+
+  # Possibly libxml and glib should have their own .cmake file instead...
   use_prebuilt_binary(glib)			# gstreamer needs glib
-  use_prebuilt_binary(gstreamer)
-  # possible libxml should have its own .cmake file instead
   use_prebuilt_binary(libxml)
+  use_prebuilt_binary(gstreamer)
   set(GSTREAMER010_FOUND ON FORCE BOOL)
   set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL)
   set(GSTREAMER010_INCLUDE_DIRS
@@ -18,23 +20,47 @@ elseif (LINUX)
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
       )
+
+endif (STANDALONE)
+
+if (WINDOWS)
   # We don't need to explicitly link against gstreamer itself, because
   # LLMediaImplGStreamer probes for the system's copy at runtime.
-  set(GSTREAMER010_LIBRARIES
+    set(GSTREAMER010_LIBRARIES
-      gobject-2.0
+         libgstvideo
-      gmodule-2.0
+         libgstaudio
-      dl
+         libgstbase-0.10
-      gthread-2.0
+         libgstreamer-0.10
-      rt
+         gobject-2.0
-      glib-2.0
+         gmodule-2.0
-      )
+         gthread-2.0
-endif (STANDALONE)
+         glib-2.0
+         )
+else (WINDOWS)
+  # We don't need to explicitly link against gstreamer itself, because
+  # LLMediaImplGStreamer probes for the system's copy at runtime.
+    set(GSTREAMER010_LIBRARIES
+         gstvideo-0.10
+         gstaudio-0.10
+         gstbase-0.10
+         gstreamer-0.10
+         gobject-2.0
+         gmodule-2.0
+         dl
+         gthread-2.0
+         rt
+         glib-2.0
+         )
+
+
+endif (WINDOWS)
+
 
 if (GSTREAMER010_FOUND AND GSTREAMER010_PLUGINS_BASE_FOUND)
   set(GSTREAMER010 ON CACHE BOOL "Build with GStreamer-0.10 streaming media support.")
+  add_definitions(-DLL_GSTREAMER010_ENABLED=1)
 endif (GSTREAMER010_FOUND AND GSTREAMER010_PLUGINS_BASE_FOUND)
 
-if (GSTREAMER010)
+  
-  add_definitions(-DLL_GSTREAMER010_ENABLED=1)
+
-endif (GSTREAMER010)
 

indra/cmake/GooglePerfTools.cmake

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

indra/cmake/HUNSPELL.cmake

@@ -0,0 +1,16 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (STANDALONE)
+	include(FindHunSpell)
+else (STANDALONE)
+    use_prebuilt_binary(hunspell)
+	
+	set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/hunspell)
+
+	if (LINUX OR DARWIN)
+	    set(HUNSPELL_LIBRARY hunspell-1.2)
+	else (LINUX OR DARWIN)
+	    set(HUNSPELL_LIBRARY libhunspell)
+	endif (LINUX OR DARWIN)
+endif (STANDALONE)

indra/cmake/LLAddBuildTest.cmake

@@ -3,6 +3,7 @@
 INCLUDE(APR)
 INCLUDE(LLMath)
 INCLUDE(Tut)
+INCLUDE(Cwdebug)
 
 MACRO(ADD_BUILD_TEST_NO_COMMON name parent)
 #   MESSAGE("${CMAKE_CURRENT_SOURCE_DIR}/tests/${name}_test.cpp")

indra/cmake/LLCommon.cmake

@@ -5,11 +5,30 @@ include(Boost)
 include(EXPAT)
 include(ZLIB)
 
+if (DARWIN)
+  include(CMakeFindFrameworks)
+  find_library(CORESERVICES_LIBRARY CoreServices)
+endif (DARWIN)
+
+
 set(LLCOMMON_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/cwdebug
     ${LIBS_OPEN_DIR}/llcommon
     ${APRUTIL_INCLUDE_DIR}
     ${APR_INCLUDE_DIR}
     ${Boost_INCLUDE_DIRS}
     )
 
-set(LLCOMMON_LIBRARIES llcommon)
+if (LINUX)
+    # In order to support using ld.gold on linux, we need to explicitely
+    # specify all libraries that llcommon uses.
+    # llcommon uses `clock_gettime' which is provided by librt on linux.
+    set(LLCOMMON_LIBRARIES llcommon rt)
+else (LINUX)
+    set(LLCOMMON_LIBRARIES llcommon)
+endif (LINUX)
+
+set(LLCOMMON_LINK_SHARED ON CACHE BOOL "Build the llcommon target as a shared library.")
+if(LLCOMMON_LINK_SHARED)
+  add_definitions(-DLL_COMMON_LINK_SHARED=1)
+endif(LLCOMMON_LINK_SHARED)

indra/cmake/LLPlugin.cmake

@@ -5,4 +5,10 @@ set(LLPLUGIN_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llplugin
     )
 
-set(LLPLUGIN_LIBRARIES llplugin)
+if (LINUX)
+    # In order to support using ld.gold on linux, we need to explicitely
+    # specify all libraries that llplugin uses.
+    set(LLPLUGIN_LIBRARIES llplugin pthread)
+else (LINUX)
+    set(LLPLUGIN_LIBRARIES llplugin)
+endif (LINUX)

indra/cmake/LLVFS.cmake

@@ -1,7 +1,12 @@
 # -*- cmake -*-
 
+include(Boost)
+
 set(LLVFS_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llvfs
     )
 
-set(LLVFS_LIBRARIES llvfs)
+set(LLVFS_LIBRARIES
+    llvfs
+    ${BOOST_REGEX_LIBRARY}
+    )

indra/cmake/LLWindow.cmake

@@ -13,11 +13,11 @@ if (STANDALONE)
       SDL_LIBRARY
       )
 else (STANDALONE)
-  use_prebuilt_binary(SDL)
   if (NOT DARWIN)
     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)

indra/cmake/Linking.cmake

@@ -42,6 +42,7 @@ if (WINDOWS)
       wldap32
       gdi32
       user32
+      dbghelp
       )
 else (WINDOWS)
   set(WINDOWS_LIBRARIES "")

indra/cmake/MediaPluginBase.cmake

@@ -1,8 +1,6 @@
 # -*- cmake -*-
 
+include(BasicPluginBase)
 
-set(MEDIA_PLUGIN_BASE_INCLUDE_DIRS
+set(MEDIA_PLUGIN_BASE_INCLUDE_DIRS ${LIBS_OPEN_DIR}/plugins/base_media ${BASIC_PLUGIN_BASE_INCLUDE_DIRS})
-    ${LIBS_OPEN_DIR}/media_plugins/base/
+set(MEDIA_PLUGIN_BASE_LIBRARIES media_plugin_base ${BASIC_PLUGIN_BASE_LIBRARIES})
-    )
-
-set(MEDIA_PLUGIN_BASE_LIBRARIES media_plugin_base)

indra/cmake/OpenGL.cmake

@@ -1,9 +1,10 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (NOT STANDALONE)
+if (NOT (STANDALONE OR DARWIN))
-  use_prebuilt_binary(GL)
+  use_prebuilt_binary(glext)
   # possible glh_linear should have its own .cmake file instead
-  use_prebuilt_binary(glh_linear)
+  #use_prebuilt_binary(glh_linear)
-  set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  # actually... not any longer, it's now in git -SG
-endif (NOT STANDALONE)
+  set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
+endif ()

indra/cmake/PNG.cmake

@@ -8,6 +8,10 @@ if (STANDALONE)
   include(FindPNG)
 else (STANDALONE)
   use_prebuilt_binary(libpng)
-  set(PNG_LIBRARIES png12)
+  if (WINDOWS)
+    set(PNG_LIBRARIES libpng15)
+  else (WINDOWS)
+    set(PNG_LIBRARIES png12)
+  endif (WINDOWS)
   set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)

indra/cmake/Python.cmake

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

indra/cmake/UI.cmake

@@ -38,10 +38,12 @@ else (STANDALONE)
   if (LINUX)
     set(UI_LIBRARIES
         atk-1.0
+        X11
         gdk-x11-2.0
         gdk_pixbuf-2.0
         Xinerama
         glib-2.0
+        gio-2.0
         gmodule-2.0
         gobject-2.0
         gthread-2.0

indra/cmake/Variables.cmake

@@ -30,7 +30,7 @@ set(LIBS_SERVER_DIR ${CMAKE_SOURCE_DIR}/${LIBS_SERVER_PREFIX})
 set(SCRIPTS_DIR ${CMAKE_SOURCE_DIR}/${SCRIPTS_PREFIX})
 set(SERVER_DIR ${CMAKE_SOURCE_DIR}/${SERVER_PREFIX})
 set(VIEWER_DIR ${CMAKE_SOURCE_DIR}/${VIEWER_PREFIX})
-set(LL_TESTS ON CACHE BOOL "Build and run unit and integration tests (disable for build timing runs to reduce variation)")
+set(LL_TESTS OFF CACHE BOOL "Build and run unit and integration tests (disable for build timing runs to reduce variation)")
 set(VISTA_ICON OFF CACHE BOOL "Allow vista icon with pre 2008 Visual Studio IDEs. (Assumes replacement old rcdll.dll with new rcdll.dll from win sdk 7.0 or later)")
 
 set(LIBS_PREBUILT_DIR ${CMAKE_SOURCE_DIR}/../libraries CACHE PATH
@@ -76,24 +76,16 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(DARWIN 1)
 
-  # NOTE: If specifying a different SDK with CMAKE_OSX_SYSROOT at configure
+  #SDK Compiler and Deployment targets for XCode
-  # time you should also specify CMAKE_OSX_DEPLOYMENT_TARGET explicitly,
+  if (${XCODE_VERSION} VERSION_LESS 4.0.0)
-  # otherwise CMAKE_OSX_SYSROOT will be overridden here. We can't just check
-  # for it being unset, as it gets set to the system default :(
-
-  # Default to building against the 10.5 SDK if no deployment target is
-  # specified.
-  if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-    # NOTE: setting -isysroot is NOT adequate: http://lists.apple.com/archives/Xcode-users/2007/Oct/msg00696.html
-    # see http://public.kitware.com/Bug/view.php?id=9959 + poppy
     set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5)
+    set(CMAKE_XCODE_ATTIBUTE_GCC_VERSION "4.2")
-  endif (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
+  else (${XCODE_VERSION} VERSION_LESS 4.0.0)
+    set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk)
+    set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
+  endif (${XCODE_VERSION} VERSION_LESS 4.0.0)
 
-  # Use GCC 4.2
+  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5)
-  if (${CMAKE_OSX_SYSROOT} MATCHES "10.5")
-    set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.2")
-  endif (${CMAKE_OSX_SYSROOT} MATCHES "10.5")
 
   # NOTE: To attempt an i386/PPC Universal build, add this on the configure line:
   # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc'
@@ -118,6 +110,17 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
 
+if (WINDOWS)
+  set(PREBUILT_TYPE windows)
+elseif(DARWIN)
+  set(PREBUILT_TYPE darwin)
+elseif(LINUX AND WORD_SIZE EQUAL 32)
+  set(PREBUILT_TYPE linux)
+elseif(LINUX AND WORD_SIZE EQUAL 64)
+  set(PREBUILT_TYPE linux64)
+endif(WINDOWS)
+
+
 # Default deploy grid
 set(GRID agni CACHE STRING "Target Grid")
 

indra/cmake/Versions.cmake

@@ -1,9 +0,0 @@
-include(BuildVersion)
-
-if(VIEWER)
-  build_version(viewer)
-endif(VIEWER)
-
-if(SERVER)
-  build_version(server)
-endif(SERVER)

indra/cmake/ViewerMiscLibs.cmake

@@ -3,9 +3,24 @@ include(Prebuilt)
 
 if (NOT STANDALONE)
   use_prebuilt_binary(vivox)
-  if (LINUX)
+  if(LINUX)
-    #use_prebuilt_binary(libuuid)
+	use_prebuilt_binary(libuuid)
+    if (${ARCH} STREQUAL "x86_64")
+     use_prebuilt_binary(32bitcompatibilitylibs)
+	endif (${ARCH} STREQUAL "x86_64")
     use_prebuilt_binary(fontconfig)
-  endif (LINUX)
+  endif(LINUX)
+else (NOT STANDALONE)
+  # Download there even when using standalone.
+  set(STANDALONE OFF)
+  use_prebuilt_binary(vivox)
+  if(LINUX AND ${ARCH} STREQUAL "x86_64")
+    use_prebuilt_binary(32bitcompatibilitylibs)
+  endif(LINUX AND ${ARCH} STREQUAL "x86_64")
+  set(STANDALONE ON)
 endif(NOT STANDALONE)
 
+if (WINDOWS)
+  use_prebuilt_binary(dbghelp)
+endif (WINDOWS)
+

indra/cmake/WebKitLibPlugin.cmake

@@ -3,7 +3,29 @@ include(Linking)
 include(Prebuilt)
 
 if (STANDALONE)
-    find_package(LLQtWebkit REQUIRED)
+    # The minimal version, 4.4.3, is rather arbitrary: it's the version in Debian/Lenny.
+    find_package(Qt4 4.4.3 COMPONENTS QtCore QtGui QtNetwork QtOpenGL QtWebKit REQUIRED)
+    include(${QT_USE_FILE})
+    set(QTDIR $ENV{QTDIR})
+    if (QTDIR AND NOT "${QT_BINARY_DIR}" STREQUAL "${QTDIR}/bin")
+      message(FATAL_ERROR "\"${QT_BINARY_DIR}\" is unequal \"${QTDIR}/bin\"; "
+        "Qt is found by looking for qmake in your PATH. "
+        "Please set your PATH such that 'qmake' is found in \$QTDIR/bin, "
+        "or unset QTDIR if the found Qt is correct.")
+    endif (QTDIR AND NOT "${QT_BINARY_DIR}" STREQUAL "${QTDIR}/bin")
+    find_package(LLQtWebkit REQUIRED QUIET)
+    # Add the plugins.
+	set(QT_PLUGIN_LIBRARIES)
+	foreach(qlibname qgif qjpeg)
+      find_library(QT_PLUGIN_${qlibname} ${qlibname} PATHS ${QT_PLUGINS_DIR}/imageformats NO_DEFAULT_PATH)
+      if (QT_PLUGIN_${qlibname})
+	    list(APPEND QT_PLUGIN_LIBRARIES ${QT_PLUGIN_${qlibname}})
+	  else (QT_PLUGIN_${qtlibname})
+        message(FATAL_ERROR "Could not find the Qt plugin ${qlibname} in \"${QT_PLUGINS_DIR}/imageformats\"!")
+      endif (QT_PLUGIN_${qlibname})
+    endforeach(qlibname)
+    # qjpeg depends on libjpeg
+    list(APPEND QT_PLUGIN_LIBRARIES jpeg)
     set(WEBKITLIBPLUGIN OFF CACHE BOOL
         "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
 else (STANDALONE)
@@ -32,25 +54,32 @@ if (WINDOWS)
 elseif (DARWIN)
     set(WEBKIT_PLUGIN_LIBRARIES
         optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
-        debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libllqtwebkit.dylib
         )
 elseif (LINUX)
-    if (STANDALONE)
+     if (STANDALONE)
-       set(WEBKIT_PLUGIN_LIBRARIES ${LLQTWEBKIT_LIBRARY})
+       set(WEBKIT_PLUGIN_LIBRARIES ${LLQTWEBKIT_LIBRARY} ${QT_LIBRARIES} ${QT_PLUGIN_LIBRARIES})
-    else (STANDALONE)
+     else (STANDALONE)
        set(WEBKIT_PLUGIN_LIBRARIES
-           llqtwebkit
+        llqtwebkit
-           qgif
+        QtWebKit
-           qjpeg
+        QtOpenGL
-           QtWebKit
+        QtNetwork
-           QtOpenGL
+        QtGui
-           QtNetwork
+        QtCore
-           QtGui
+        crypto
-           QtCore
+        ssl
-           fontconfig
+#       qgif
-           X11
+#       qjpeg
-           Xrender
+        jpeg
-           GL
+        fontconfig
-           )
+        X11
-    endif (STANDALONE)
+        Xrender
+        Xext
+        GL
+        )
+      if (WORD_SIZE EQUAL 32)
+        set(WEBKIT_PLUGIN_LIBRARIES ${WEBKIT_PLUGIN_LIBRARIES} jscore)
+      endif (WORD_SIZE EQUAL 32)
+     endif (STANDALONE)
 endif (WINDOWS)

indra/cmake/XmlRpcEpi.cmake

@@ -8,10 +8,6 @@ if (STANDALONE)
   include(FindXmlRpcEpi)
 else (STANDALONE)
     use_prebuilt_binary(xmlrpc-epi)
-    if (WINDOWS)
+    set(XMLRPCEPI_LIBRARIES xmlrpc-epi)
-        set(XMLRPCEPI_LIBRARIES xmlrpcepi)
-    else (WINDOWS)
-        set(XMLRPCEPI_LIBRARIES xmlrpc-epi)
-    endif (WINDOWS)
     set(XMLRPCEPI_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)

indra/cwdebug/CMakeLists.txt

@@ -0,0 +1,39 @@
+# -*- cmake -*-
+
+project(cwdebug)
+
+include(00-Common)
+include(LLCommon)
+include(LLMath)
+include(LLMessage)
+include(LLVFS)
+
+include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+
+set(cwdebug_SOURCE_FILES
+    debug.cc
+    )
+
+set(cwdebug_HEADER_FILES
+    CMakeLists.txt
+
+    cwdebug.h
+    sys.h
+    debug.h
+    debug_ostream_operators.h
+    )
+
+set_source_files_properties(${cwdebug_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+if(NOT WORD_SIZE EQUAL 32)
+	if(WINDOWS)
+		add_definitions(/FIXED:NO)
+	else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
+		add_definitions(-fPIC)
+	endif(WINDOWS)
+endif (NOT WORD_SIZE EQUAL 32)
+
+list(APPEND cwdebug_SOURCE_FILES ${cwdebug_HEADER_FILES})
+
+add_library (cwdebug ${cwdebug_SOURCE_FILES})

indra/cwdebug/cwdebug.h

@@ -0,0 +1,9 @@
+// We support compiling C++ source files that are not
+// thread-safe, but in that case we assume that they
+// will not be linked with libcwd_r.
+#if !defined(_REENTRANT) || !defined(__linux__)
+#undef CWDEBUG
+#endif
+
+#include "sys.h"
+#include "debug.h"

indra/cwdebug/debug.cc

@@ -0,0 +1,414 @@
+// slviewer -- Second Life Viewer Source Code
+//
+//! @file debug.cc
+//! @brief This file contains the definitions of debug related objects and functions.
+//
+// Copyright (C) 2008, by
+//
+// Carlo Wood, Run on IRC <carlo@alinoe.com>
+// RSA-1024 0x624ACAD5 1997-01-26                    Sign & Encrypt
+// Fingerprint16 = 32 EC A7 B6 AC DB 65 A6  F6 F6 55 DD 1C DC FF 61
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program 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 General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef USE_PCH
+#include "sys.h"                        // Needed for platform-specific code
+#endif
+
+#ifdef CWDEBUG
+
+#ifndef USE_PCH
+#include <cctype>                       // Needed for std::isprint
+#include <iomanip>                      // Needed for setfill and setw
+#include <map>
+#include <string>
+#include <sstream>
+#include <fstream>
+#include "debug.h"
+#ifdef USE_LIBCW
+#include <libcw/memleak.h>		// memleak_filter
+#endif
+#include <sys/types.h>
+#include <unistd.h>
+#endif // USE_PCH
+
+#define BACKTRACE_AQUIRE_LOCK           libcwd::_private_::mutex_tct<libcwd::_private_::backtrace_instance>::lock()
+#define BACKTRACE_RELEASE_LOCK          libcwd::_private_::mutex_tct<libcwd::_private_::backtrace_instance>::unlock()
+
+namespace debug {
+
+#if CWDEBUG_LOCATION
+void BackTrace::dump_backtrace(void) const
+{
+  for (int frame = 0; frame < frames(); ++frame)
+  {
+    libcwd::location_ct loc((char*)buffer()[frame] + libcwd::builtin_return_address_offset);
+    Dout(dc::notice|continued_cf, '#' << std::left << std::setw(3) << frame <<
+	std::left << std::setw(16) << buffer()[frame] << ' ' << loc << "\n                  in ");
+    char const* mangled_function_name = loc.mangled_function_name();
+    if (mangled_function_name != libcwd::unknown_function_c)
+    {
+      std::string demangled_function_name;
+      libcwd::demangle_symbol(mangled_function_name, demangled_function_name);
+      Dout(dc::finish, demangled_function_name);
+    }
+    else
+      Dout(dc::finish, mangled_function_name);
+  }
+}
+#endif // CWDEBUG_LOCATION
+
+#if CWDEBUG_ALLOC && CWDEBUG_LOCATION
+typedef std::map<BackTrace, int, std::less<BackTrace>, libcwd::_private_::internal_allocator> backtrace_map_t;
+backtrace_map_t* backtrace_map;
+static int total_calls = 0;
+static int number_of_stack_traces = 0;
+
+void my_backtrace_hook(void** buffer, int frames LIBCWD_COMMA_TSD_PARAM)
+{
+  ++total_calls;
+
+  backtrace_map_t::iterator iter;
+
+  set_alloc_checking_off(__libcwd_tsd);
+  {
+    BackTrace backtrace(buffer, frames);
+    std::pair<backtrace_map_t::iterator, bool> res = backtrace_map->insert(backtrace_map_t::value_type(backtrace, 0));
+    if (res.second)
+      ++number_of_stack_traces;
+    ++res.first->second;
+    iter = res.first;
+  }
+  set_alloc_checking_on(__libcwd_tsd);
+#if 0
+  // Dump the stack trace.
+  iter->first.dump_backtrace();
+#endif
+}
+
+void start_recording_backtraces(void)
+{
+  BACKTRACE_AQUIRE_LOCK;
+  libcwd::backtrace_hook = my_backtrace_hook;
+  BACKTRACE_RELEASE_LOCK;
+  //Debug(dc::malloc.on());
+  LIBCWD_TSD_DECLARATION;
+  set_alloc_checking_off(__libcwd_tsd);
+  backtrace_map = new backtrace_map_t;
+  set_alloc_checking_on(__libcwd_tsd);
+}
+
+struct Compare {
+  bool operator()(backtrace_map_t::const_iterator const& iter1, backtrace_map_t::const_iterator const& iter2)
+  {
+    return iter1->second > iter2->second;
+  }
+};
+
+void stop_recording_backtraces(void)
+{
+  //Debug(dc::malloc.off());
+  BACKTRACE_AQUIRE_LOCK;
+  libcwd::backtrace_hook = NULL;
+
+  if (!backtrace_map)
+  {
+    Dout(dc::notice, "Not recording; call cwdebug_start() first.");
+    return;
+  }
+
+  Dout(dc::notice, "Total number of calls: " << total_calls);
+  Dout(dc::notice, "Number of different stack traces: " << number_of_stack_traces);
+  Dout(dc::notice, "First 10 stack traces:");
+  std::list<backtrace_map_t::const_iterator> entries;
+  for (backtrace_map_t::const_iterator iter = backtrace_map->begin(); iter != backtrace_map->end(); ++iter)
+    entries.push_back(iter);
+  entries.sort(Compare());
+  int count = 0;
+  for (std::list<backtrace_map_t::const_iterator>::iterator iter = entries.begin(); iter != entries.end(); ++iter, ++count)
+  {
+    Dout(dc::notice, "Used: " << (*iter)->second);
+    // Dump the stack trace.
+    (*iter)->first.dump_backtrace();
+    if (count == 10)
+      break;
+  }
+
+  // Clear all data.
+  LIBCWD_TSD_DECLARATION;
+  set_alloc_checking_off(__libcwd_tsd);
+  delete backtrace_map;
+  set_alloc_checking_on(__libcwd_tsd);
+  backtrace_map = NULL;
+  total_calls = 0;
+  number_of_stack_traces = 0;
+
+  BACKTRACE_RELEASE_LOCK;
+}
+#endif // CWDEBUG_ALLOC && CWDEBUG_LOCATION
+
+  namespace channels {	// namespace DEBUGCHANNELS
+    namespace dc {
+
+#ifndef DOXYGEN
+#define DDCN(x) (x)
+#endif
+      // Add new debug channels here.
+
+      channel_ct viewer DDCN("VIEWER");		//!< This debug channel is used for the normal debugging out of the viewer.
+      channel_ct primbackup DDCN("PRIMBACKUP");	//!< This debug channel is used for output related to primbackup.
+      channel_ct gtk DDCN("GTK");		//!< This debug channel is used for output related to gtk.
+      channel_ct sdl DDCN("SDL");		//!< This debug channel is used for output related to sdl locking.
+      channel_ct backtrace DDCN("BACKTRACE");	//!< This debug channel is used for backtraces.
+      channel_ct statemachine DDCN("STATEMACHINE");	//!< This debug channel is used for output related to class AIStateMachine.
+      channel_ct caps DDCN("CAPS");		//!< This debug channel is used for output related to Capabilities.
+
+    } // namespace dc
+  } // namespace DEBUGCHANNELS
+
+  // Anonymous namespace, this map and its initialization functions are private to this file
+  // for Thead-safeness reasons.
+  namespace {
+
+    /*! @brief The type of rcfile_dc_states.
+     * @internal
+     */
+    typedef std::map<std::string, bool> rcfile_dc_states_type;
+
+    /*! @brief Map containing the default debug channel states used at the start of each new thread.
+     * @internal
+     *
+     * The first thread calls main, which calls debug::init which will initialize this
+     * map with all debug channel labels and whether or not they were turned on in the
+     * rcfile or not.
+     */
+    rcfile_dc_states_type rcfile_dc_states;
+
+    /*! @brief Set the default state of debug channel \a dc_label.
+     * @internal
+     *
+     * This function is called once for each debug channel.
+     */
+    void set_state(char const* dc_label, bool is_on)
+    {
+      std::pair<rcfile_dc_states_type::iterator, bool> res =
+          rcfile_dc_states.insert(rcfile_dc_states_type::value_type(std::string(dc_label), is_on));
+      if (!res.second)
+        Dout(dc::warning, "Calling set_state() more than once for the same label!");
+      return;
+    }
+
+    /*! @brief Save debug channel states.
+     * @internal
+     *
+     * One time initialization function of rcfile_dc_state.
+     * This must be called from debug::init after reading the rcfile.
+     */
+    void save_dc_states(void)
+    {
+      // We may only call this function once: it reflects the states as stored
+      // in the rcfile and that won't change.  Therefore it is not needed to
+      // lock `rcfile_dc_states', it is only written to by the first thread
+      // (once, via main -> init) when there are no other threads yet.
+      static bool second_time = false;
+      if (second_time)
+      {
+        Dout(dc::warning, "Calling save_dc_states() more than once!");
+	return;
+      }
+      second_time = true;
+      ForAllDebugChannels( set_state(debugChannel.get_label(), debugChannel.is_on()) );
+    }
+
+  } // anonymous namespace
+
+  /*! @brief Returns the the original state of a debug channel.
+   * @internal
+   *
+   * For a given \a dc_label, which must be the exact name (<tt>channel_ct::get_label</tt>) of an
+   * existing debug channel, this function returns \c true when the corresponding debug channel was
+   * <em>on</em> at the startup of the application, directly after reading the libcwd runtime
+   * configuration file (.libcwdrc).
+   *
+   * If the label/channel did not exist at the start of the application, it will return \c false
+   * (note that libcwd disallows adding debug channels to modules - so this would probably
+   * a bug).
+   */
+  bool is_on_in_rcfile(char const* dc_label)
+  {
+    rcfile_dc_states_type::const_iterator iter = rcfile_dc_states.find(std::string(dc_label));
+    if (iter == rcfile_dc_states.end())
+    {
+      Dout(dc::warning, "is_on_in_rcfile(\"" << dc_label << "\"): \"" << dc_label << "\" is an unknown label!");
+      return false;
+    }
+    return iter->second;
+  }
+
+#if LIBCWD_THREAD_SAFE
+  pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+  // I can cause I'm the maintainer of libcwd ;).
+  libcwd::_private_::pthread_lock_interface_ct cout_mutex(&mutex);
+  libcwd::_private_::lock_interface_base_ct* cout_mutex_ptr(&cout_mutex);
+#endif
+
+  /*! @brief Initialize debugging code from new threads.
+   *
+   * This function needs to be called at the start of each new thread,
+   * because a new thread starts in a completely reset state.
+   *
+   * The function turns on all debug channels that were turned on
+   * after reading the rcfile at the start of the application.
+   * Furthermore it initializes the debug ostream, its mutex and the
+   * margin of the default debug object (Dout).
+   */
+  void init_thread(void)
+  {
+    // Turn on all debug channels that are turned on as per rcfile configuration.
+    ForAllDebugChannels(
+        if (!debugChannel.is_on() && is_on_in_rcfile(debugChannel.get_label()))
+	  debugChannel.on();
+    );
+
+    // Turn on debug output.
+    Debug( libcw_do.on() );
+    static std::ofstream debug_file;
+    static bool debug_out_opened = false;
+    if (!debug_out_opened)
+    {
+      debug_out_opened = true;		// Thread-safe, cause the main thread calls this first while it's still alone.
+      std::ostringstream os;
+      os << "debug.out." << getpid();
+      debug_file.open(os.str().c_str());
+    }
+    static debug::TeeStream debug_stream(std::cout, debug_file);
+#if LIBCWD_THREAD_SAFE
+    Debug( libcw_do.set_ostream(&debug_stream, cout_mutex_ptr) );
+#else
+    Debug( libcw_do.set_ostream(&debug_stream) );
+#endif
+
+    static bool first_thread = true;
+    if (!first_thread)			// So far, the application has only one thread.  So don't add a thread id.
+    {
+      // Set the thread id in the margin.
+      char margin[18];
+      sprintf(margin, "0x%-14lx ", pthread_self());
+      Debug( libcw_do.margin().assign(margin, 17) );
+    }
+    first_thread = false;
+  }
+
+  /*! @brief Initialize debugging code from main.
+   *
+   * This function initializes the debug code.
+   */
+  void init(void)
+  {
+#if CWDEBUG_ALLOC && defined(USE_LIBCW)
+    // Tell the memory leak detector which parts of the code are
+    // expected to leak so that we won't get an alarm for those.
+    {
+      std::vector<std::pair<std::string, std::string> > hide_list;
+      hide_list.push_back(std::pair<std::string, std::string>("libdl.so.2", "_dlerror_run"));
+      hide_list.push_back(std::pair<std::string, std::string>("libstdc++.so.6", "__cxa_get_globals"));
+      // The following is actually necessary because of a bug in glibc
+      // (see http://sources.redhat.com/bugzilla/show_bug.cgi?id=311).
+      hide_list.push_back(std::pair<std::string, std::string>("libc.so.6", "dl_open_worker"));
+      memleak_filter().hide_functions_matching(hide_list);
+    }
+    {
+      std::vector<std::string> hide_list;
+      // Also because of http://sources.redhat.com/bugzilla/show_bug.cgi?id=311
+      hide_list.push_back(std::string("ld-linux.so.2"));
+      memleak_filter().hide_objectfiles_matching(hide_list);
+    }
+    memleak_filter().set_flags(libcwd::show_objectfile|libcwd::show_function);
+#endif
+
+    // The following call allocated the filebuf's of cin, cout, cerr, wcin, wcout and wcerr.
+    // Because this causes a memory leak being reported, make them invisible.
+    Debug(set_invisible_on());
+
+    // You want this, unless you mix streams output with C output.
+    // Read  http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#8 for an explanation.
+    //std::ios::sync_with_stdio(false);
+
+    // Cancel previous call to set_invisible_on.
+    Debug(set_invisible_off());
+
+    // This will warn you when you are using header files that do not belong to the
+    // shared libcwd object that you linked with.
+    Debug( check_configuration() );
+
+    Debug(
+      libcw_do.on();		// Show which rcfile we are reading!
+      ForAllDebugChannels(
+        while (debugChannel.is_on())
+	  debugChannel.off()	// Print as little as possible though.
+      );
+      read_rcfile();		// Put 'silent = on' in the rcfile to suppress most of the output here.
+      libcw_do.off()
+    );
+    save_dc_states();
+
+    init_thread();
+  }
+
+#if CWDEBUG_LOCATION
+  /*! @brief Return call location.
+   *
+   * @param return_addr The return address of the call.
+   */
+  std::string call_location(void const* return_addr)
+  {
+    libcwd::location_ct loc((char*)return_addr + libcwd::builtin_return_address_offset);
+    std::ostringstream convert;
+    convert << loc;
+    return convert.str();
+  }
+
+  std::vector<BackTrace> __attribute__ ((visibility("default"))) backtraces;
+  pthread_mutex_t __attribute__ ((visibility("default"))) backtrace_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif
+
+} // namespace debug
+
+#if CWDEBUG_ALLOC
+// These can be called from gdb.
+void cwdebug_start()
+{
+  debug::start_recording_backtraces();
+}
+
+void cwdebug_stop()
+{
+  debug::stop_recording_backtraces();
+}
+#endif
+
+#if CWDEBUG_LOCATION
+void cwdebug_backtrace(int n)
+{
+  if (0 < n && n <= debug::backtraces.size())
+  {
+    Dout(dc::backtrace, "Backtrace #" << n << ":");
+    debug::backtraces[n - 1].dump_backtrace();
+  }
+  else
+    std::cout << "No such backtrace nr. Max is " << debug::backtraces.size() << std::endl;
+}
+#endif
+
+#endif // CWDEBUG

indra/cwdebug/debug.h

@@ -0,0 +1,258 @@
+// slviewer -- Second Life Viewer Source Code
+//
+//! @file debug.h
+//! @brief This file contains the declaration of debug related macros, objects and functions.
+//
+// Copyright (C) 2008, by
+//
+// Carlo Wood, Run on IRC <carlo@alinoe.com>
+// RSA-1024 0x624ACAD5 1997-01-26                    Sign & Encrypt
+// Fingerprint16 = 32 EC A7 B6 AC DB 65 A6  F6 F6 55 DD 1C DC FF 61
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program 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 General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef DEBUG_H
+#define DEBUG_H
+
+#ifndef CWDEBUG
+
+#ifndef DOXYGEN         // No need to document this.  See http://libcwd.sourceforge.net/ for more info.
+
+#include <iostream>
+#include <cstdlib>      // std::exit, EXIT_FAILURE
+
+#define AllocTag1(p)
+#define AllocTag2(p, desc)
+#define AllocTag_dynamic_description(p, x)
+#define AllocTag(p, x)
+#define Debug(x)
+#define Dout(a, b)
+#define DoutEntering(a, b)
+#define DoutFatal(a, b) LibcwDoutFatal(::std, , a, b)
+#define ForAllDebugChannels(STATEMENT)
+#define ForAllDebugObjects(STATEMENT)
+#define LibcwDebug(dc_namespace, x)
+#define LibcwDout(a, b, c, d)
+#define LibcwDoutFatal(a, b, c, d) do { ::std::cerr << d << ::std::endl; ::std::exit(EXIT_FAILURE); } while (1)
+#define NEW(x) new x
+#define CWDEBUG_ALLOC 0
+#define CWDEBUG_MAGIC 0
+#define CWDEBUG_LOCATION 0
+#define CWDEBUG_LIBBFD 0
+#define CWDEBUG_DEBUG 0
+#define CWDEBUG_DEBUGOUTPUT 0
+#define CWDEBUG_DEBUGM 0
+#define CWDEBUG_DEBUGT 0
+#define CWDEBUG_MARKER 0
+
+#define BACKTRACE do { } while(0)
+
+#endif // !DOXYGEN
+
+#include <cassert>
+#ifdef DEBUG
+#define ASSERT(x) assert(x)
+#else
+#define ASSERT(x)
+#endif
+
+#else // CWDEBUG
+
+//! Assert \a x, if debugging is turned on.
+#define ASSERT(x) LIBCWD_ASSERT(x)
+#define builtin_return_address(addr) ((char*)__builtin_return_address(addr) + libcwd::builtin_return_address_offset)
+
+#ifndef DEBUGCHANNELS
+//! @brief The namespace in which the \c dc namespace is declared.
+//
+// <A HREF="http://libcwd.sourceforge.net/">Libcwd</A> demands that this macro is defined
+// before <libcwd/debug.h> is included and must be the name of the namespace containing
+// the \c dc (Debug Channels) namespace.
+//
+// @sa debug::channels::dc
+
+#define DEBUGCHANNELS ::debug::channels
+#endif
+#include <libcwd/debug.h>
+#include <boost/shared_array.hpp>
+#if CWDEBUG_LOCATION
+#include <execinfo.h>		// Needed for 'backtrace'.
+#endif
+
+#define CWD_API __attribute__ ((visibility("default")))
+
+//! Debug specific code.
+namespace debug {
+
+void CWD_API init(void);                // Initialize debugging code, called once from main.
+void CWD_API init_thread(void);         // Initialize debugging code, called once for each thread.
+
+//! @brief Debug Channels (dc) namespace.
+//
+// @sa debug::channels::dc
+namespace channels {	// namespace DEBUGCHANNELS
+
+//! The namespace containing the actual debug channels.
+namespace dc {
+using namespace libcwd::channels::dc;
+using libcwd::channel_ct;
+
+#ifndef DOXYGEN         // Doxygen bug causes a warning here.
+// Add the declaration of new debug channels here
+// and add their definition in a custom debug.cc file.
+extern CWD_API channel_ct viewer;	// The normal logging output of the viewer (normally to stderr).
+extern CWD_API channel_ct primbackup;
+extern CWD_API channel_ct gtk;
+extern CWD_API channel_ct sdl;
+extern CWD_API channel_ct backtrace;
+extern CWD_API channel_ct statemachine;
+extern CWD_API channel_ct caps;
+
+#endif
+
+} // namespace dc
+} // namespace DEBUGCHANNELS
+
+#if CWDEBUG_LOCATION
+std::string call_location(void const* return_addr);
+#endif
+
+//! @brief Interface for marking scopes of invisible memory allocations.
+//
+// Creation of the object does nothing, you have to explicitly call
+// InvisibleAllocations::on.  Destruction of the object automatically
+// cancels any call to \c on of this object.  This makes it exception-
+// (stack unwinding) and recursive-safe.
+struct InvisibleAllocations {
+  int M_on;             //!< The number of times that InvisibleAllocations::on() was called.
+  //! Constructor.
+  InvisibleAllocations() : M_on(0) { }
+  //! Destructor.
+  ~InvisibleAllocations() { while (M_on > 0) off(); }
+  //! Set invisible allocations on. Can be called recursively.
+  void on(void) { libcwd::set_invisible_on(); ++M_on; }
+  //! Cancel one call to on().
+  void off(void) { assert(M_on > 0); --M_on; libcwd::set_invisible_off(); }
+};
+
+//! @brief Interface for marking scopes with indented debug output.
+//
+// Creation of the object increments the debug indentation. Destruction
+// of the object automatically decrements the indentation again.
+struct Indent {
+  int M_indent;                 //!< The extra number of spaces that were added to the indentation.
+  //! Construct an Indent object.
+  Indent(int indent) : M_indent(indent) { if (M_indent > 0) libcwd::libcw_do.inc_indent(M_indent); }
+  //! Destructor.
+  ~Indent() { if (M_indent > 0) libcwd::libcw_do.dec_indent(M_indent); }
+};
+
+// A class streambuf that splits what is written to two streambufs.
+class TeeBuf : public std::streambuf {
+  private:
+    std::streambuf* M_sb1;
+    std::streambuf* M_sb2;
+
+  public:
+    TeeBuf(std::streambuf* sb1, std::streambuf* sb2) : M_sb1(sb1), M_sb2(sb2) { }
+
+  protected:
+    virtual int sync(void) { M_sb2->pubsync(); return M_sb1->pubsync(); }
+    virtual std::streamsize xsputn(char_type const* p, std::streamsize n) { M_sb2->sputn(p, n); return M_sb1->sputn(p, n); }
+    virtual int_type overflow(int_type c = traits_type::eof()) { M_sb2->sputc(c); return M_sb1->sputc(c); }
+};
+
+// An ostream that passes what is written to it on to two other ostreams.
+class TeeStream : public std::ostream {
+  private:
+    TeeBuf M_teebuf;
+  public:
+    TeeStream(std::ostream& os1, std::ostream& os2) : std::ostream(&M_teebuf), M_teebuf(os1.rdbuf(), os2.rdbuf()) { }
+};
+
+#if CWDEBUG_LOCATION
+class BackTrace {
+  private:
+    boost::shared_array<void*> M_buffer;
+    int M_frames;
+  public:
+    BackTrace(void** buffer, int frames) : M_buffer(new void* [frames]), M_frames(frames) { std::memcpy(M_buffer.get(), buffer, sizeof(void*) * frames); }
+
+    friend bool operator<(BackTrace const& bt1, BackTrace const& bt2)
+    {
+      if (bt1.M_frames != bt2.M_frames)
+	return bt1.M_frames < bt2.M_frames;
+      for (int frame = 0; frame < bt1.M_frames; ++frame)
+	if (bt1.M_buffer[frame] < bt2.M_buffer[frame])
+	  return true;
+        else if (bt1.M_buffer[frame] > bt2.M_buffer[frame])
+	  return true;
+      return false;
+    }
+
+  void dump_backtrace(void) const;
+
+  int frames(void) const { return M_frames; }
+  boost::shared_array<void*> const& buffer(void) const { return M_buffer; }
+};
+extern std::vector<BackTrace> backtraces;
+extern pthread_mutex_t backtrace_mutex;
+#define BACKTRACE do { \
+    using namespace debug; \
+    void* buffer[32]; \
+    int frames = backtrace(buffer, 32); \
+    size_t size; \
+    { \
+      pthread_mutex_lock(&backtrace_mutex); \
+      backtraces.push_back(BackTrace(buffer, frames)); \
+      size = backtraces.size(); \
+      pthread_mutex_unlock(&backtrace_mutex); \
+    } \
+    Dout(dc::backtrace, "Stored backtrace #" << size); \
+  } while(0)
+#else
+#define BACKTRACE do { } while(0)
+#endif // CWDEBUG_LOCATION
+
+} // namespace debug
+
+//! Debugging macro.
+//
+// Print "Entering " << \a data to channel \a cntrl and increment
+// debugging output indentation until the end of the current scope.
+#define DoutEntering(cntrl, data) \
+  int __slviewer_debug_indentation = 2;                                                                      \
+  {                                                                                                                     \
+    LIBCWD_TSD_DECLARATION;                                                                                             \
+    if (LIBCWD_DO_TSD_MEMBER_OFF(::libcwd::libcw_do) < 0)                                                               \
+    {                                                                                                                   \
+      ::libcwd::channel_set_bootstrap_st __libcwd_channel_set(LIBCWD_DO_TSD(::libcwd::libcw_do) LIBCWD_COMMA_TSD);      \
+      bool on;                                                                                                          \
+      {                                                                                                                 \
+        using namespace LIBCWD_DEBUGCHANNELS;                                                                           \
+        on = (__libcwd_channel_set|cntrl).on;                                                                           \
+      }                                                                                                                 \
+      if (on)                                                                                                           \
+        Dout(cntrl, "Entering " << data);                                                                               \
+      else                                                                                                              \
+        __slviewer_debug_indentation = 0;                                                                    \
+    }                                                                                                                   \
+  }                                                                                                                     \
+  debug::Indent __slviewer_debug_indent(__slviewer_debug_indentation);
+
+#endif // CWDEBUG
+
+#include "debug_ostream_operators.h"
+
+#endif // DEBUG_H

indra/cwdebug/debug_ostream_operators.h

@@ -0,0 +1 @@
+// Empty so far...

indra/cwdebug/sys.h

@@ -0,0 +1,9 @@
+// The following is the libcwd related mandatory part.
+// It must be included before any system header file is included.
+#ifdef CWDEBUG
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include <libcwd/sys.h>
+#endif
+

indra/develop.py

@@ -518,9 +518,16 @@ class WindowsSetup(PlatformSetup):
                         self.using_express = True
                         print 'Building with ', self.gens[version]['gen'] , "Express edition"
                         break
-                    else:
+                else:
-                        print >> sys.stderr, 'Cannot find any Visual Studio installation'
+					for version in 'vc80 vc90 vc100 vc71'.split():
-                        sys.exit(1)
+						if self.find_visual_studio_express_single(version):
+							self._generator = version
+							self.using_express = True
+							print 'Building with ', self.gens[version]['gen'] , "Express edition"
+							break
+					else:
+						print >> sys.stderr, 'Cannot find any Visual Studio installation'
+						sys.exit(1)
         return self._generator
 
     def _set_generator(self, gen):
@@ -605,6 +612,28 @@ class WindowsSetup(PlatformSetup):
         except WindowsError, err:
             print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
             return ''
+        
+    def find_visual_studio_express_single(self, gen=None):
+        if gen is None:
+            gen = self._generator
+        gen = gen.lower()
+        try:
+            import _winreg
+            key_str = (r'SOFTWARE\Microsoft\VCEXpress\%s_Config\Setup\VC' %
+                       self.gens[gen]['ver'])
+            value_str = (r'ProductDir')
+            print ('Reading VS environment from HKEY_CURRENT_USER\%s\%s' %
+                   (key_str, value_str))
+            print key_str
+
+            reg = _winreg.ConnectRegistry(None, _winreg.HKEY_CURRENT_USER)
+            key = _winreg.OpenKey(reg, key_str)
+            value = _winreg.QueryValueEx(key, value_str)[0]+"IDE"
+            print 'Found: %s' % value
+            return value
+        except WindowsError, err:
+            print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
+            return ''
 
     def get_build_cmd(self):
         if self.incredibuild:
@@ -617,13 +646,15 @@ class WindowsSetup(PlatformSetup):
         if environment == '':
             environment = self.find_visual_studio_express()
             if environment == '':
-                 print >> sys.stderr, "Something went very wrong during build stage, could not find a Visual Studio?"
+				environment = self.find_visual_studio_express_single()
-            else:
+				if environment == '':
-                 build_dirs=self.build_dirs()
+					print >> sys.stderr, "Something went very wrong during build stage, could not find a Visual Studio?"
-                 print >> sys.stderr, "\nSolution generation complete, it can can now be found in:", build_dirs[0]    
+				else:
-                 print >> sys.stderr, "\nAs you are using an Express Visual Studio, the build step cannot be automated"
+					build_dirs=self.build_dirs()
-		 print >> sys.stderr, "\nPlease see https://wiki.secondlife.com/wiki/Microsoft_Visual_Studio#Extra_steps_for_Visual_Studio_Express_editions for Visual Studio Express specific information"
+					print >> sys.stderr, "\nSolution generation complete, it can can now be found in:", build_dirs[0]    
-                 exit(0)
+					print >> sys.stderr, "\nAs you are using an Express Visual Studio, the build step cannot be automated"
+					print >> sys.stderr, "\nPlease see https://wiki.secondlife.com/wiki/Microsoft_Visual_Studio#Extra_steps_for_Visual_Studio_Express_editions for Visual Studio Express specific information"
+					exit(0)
     
         # devenv.com is CLI friendly, devenv.exe... not so much.
         return ('"%sdevenv.com" %s.sln /build %s' % 
@@ -718,6 +749,7 @@ class CygwinSetup(WindowsSetup):
 setup_platform = {
     'darwin': DarwinSetup,
     'linux2': LinuxSetup,
+    'linux3': LinuxSetup,
     'win32' : WindowsSetup,
     'cygwin' : CygwinSetup
     }
@@ -743,9 +775,8 @@ Options:
   -p | --project=NAME   set the root project name. (Doesn't effect makefiles)
                         
 Commands:
-  build      configure and build default target
+  build           configure and build default target
-  clean      delete all build directories, does not affect sources
+  clean           delete all build directories, does not affect sources
-  configure  configure project by running cmake (default command if none given)
   configure       configure project by running cmake (default if none given)
   printbuilddirs  print the build directory that will be used
 

indra/lib/python/indra/util/llmanifest.py

@@ -156,6 +156,9 @@ ARGUMENTS=[
     dict(name='source',
          description='Source directory.',
          default=DEFAULT_SRCTREE),
+    dict(name='standalone',
+         description='Set to ON if this is a standalone build.',
+         default="OFF"),
     dict(name='artwork', description='Artwork directory.', default=DEFAULT_SRCTREE),
     dict(name='touch',
          description="""File to touch when action is finished. Touch file will
@@ -165,7 +168,10 @@ ARGUMENTS=[
     dict(name='version',
          description="""This specifies the version of Second Life that is
         being packaged up.""",
-         default=get_default_version)
+         default=get_default_version),
+    dict(name='extra_libraries',
+         description="""List of extra libraries to include in package""",
+         default=None)
     ]
 
 def usage(srctree=""):
@@ -634,9 +640,9 @@ class LLManifest(object):
         is_glob = False
 
         # look under each prefix for matching paths
-        paths = [os.path.join(self.get_src_prefix(), src),
+        paths = set([os.path.join(self.get_src_prefix(), src),
                  os.path.join(self.get_artwork_prefix(), src),
-                 os.path.join(self.get_build_prefix(), src)]
+                 os.path.join(self.get_build_prefix(), src)])
         for path in paths:
             if self.wildcard_pattern.search(path):
                 is_glob = True

indra/libopenjpeg/CMakeLists.txt

@@ -1,105 +1,84 @@
-# Main CMakeLists.txt to build the OpenJPEG project using CMake (www.cmake.org)
+# -*- cmake -*-
-# Written by Mathieu Malaterre
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+project(openjpeg)
 
-IF(COMMAND CMAKE_POLICY)
+include(00-Common)
-  CMAKE_POLICY(SET CMP0003 NEW)
-ENDIF(COMMAND CMAKE_POLICY)
 
-PROJECT(openjpeg)
 
-# Do full dependency headers.
-INCLUDE_REGULAR_EXPRESSION("^.*$")
-
-#-----------------------------------------------------------------------------
 # OPENJPEG version number, useful for packaging and doxygen doc:
-SET(OPENJPEG_VERSION_MAJOR 1)
+set(OPENJPEG_VERSION_MAJOR 1)
-SET(OPENJPEG_VERSION_MINOR 4)
+set(OPENJPEG_VERSION_MINOR 4)
-SET(OPENJPEG_VERSION_BUILD 0)
+set(OPENJPEG_VERSION_BUILD 0)
-SET(OPENJPEG_VERSION
+set(OPENJPEG_VERSION
   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
 
+set(openjpeg_SOURCE_FILES
+    bio.c
+    cio.c
+    dwt.c
+    event.c
+    image.c
+    j2k.c
+    j2k_lib.c
+    jp2.c
+    jpt.c
+    mct.c
+    mqc.c
+    openjpeg.c
+    pi.c
+    raw.c
+    t1.c
+    t2.c
+    tcd.c
+    tgt.c
+)
+
+set(openjpeg_HEADER_FILES
+    bio.h
+    cio.h
+    dwt.h
+    event.h 
+    fix.h
+    image.h
+    int.h
+    j2k.h
+    j2k_lib.h
+    jp2.h
+    jpt.h
+    mct.h
+    mqc.h
+    openjpeg.h
+    opj_includes.h
+    opj_malloc.h
+    pi.h
+    raw.h
+    t1.h
+    t1_luts.h
+    t2.h
+    tcd.h
+    tgt.h
+)
+
+IF(WINDOWS)
+   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+   add_definitions(-DOPJ_STATIC)
+ENDIF(WINDOWS)
+
+
+set_source_files_properties(${openjpeg_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND openjpeg_SOURCE_FILES ${openjpeg_HEADER_FILES})
+
+add_library (openjpeg ${openjpeg_SOURCE_FILES})
+
 # This setting of SOVERSION assumes that any API change
 # will increment either the minor or major version number of openjpeg
-SET(OPENJPEG_LIBRARY_PROPERTIES
+set(OPENJPEG_LIBRARY_PROPERTIES
   VERSION   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
   SOVERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}"
 )
 
-# On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security
+set_target_properties(openjpeg PROPERTIES
-# warnings
-IF(WIN32)
-  IF(NOT BORLAND)
-    IF(NOT CYGWIN)
-      IF(NOT MINGW)
-        IF(NOT ITK_ENABLE_VISUAL_STUDIO_DEPRECATED_C_WARNINGS)
-          ADD_DEFINITIONS(
-            -D_CRT_FAR_MAPPINGS_NO_DEPRECATE
-            -D_CRT_IS_WCTYPE_NO_DEPRECATE
-            -D_CRT_MANAGED_FP_NO_DEPRECATE
-            -D_CRT_NONSTDC_NO_DEPRECATE
-            -D_CRT_SECURE_NO_DEPRECATE
-            -D_CRT_SECURE_NO_DEPRECATE_GLOBALS
-            -D_CRT_SETERRORMODE_BEEP_SLEEP_NO_DEPRECATE
-            -D_CRT_TIME_FUNCTIONS_NO_DEPRECATE
-            -D_CRT_VCCLRIT_NO_DEPRECATE
-            -D_SCL_SECURE_NO_DEPRECATE
-            )
-        ENDIF(NOT ITK_ENABLE_VISUAL_STUDIO_DEPRECATED_C_WARNINGS)
-      ENDIF(NOT MINGW)
-    ENDIF(NOT CYGWIN)
-  ENDIF(NOT BORLAND)
-ENDIF(WIN32)
-
-
-#-----------------------------------------------------------------------------
-# Test for some required system information.
-# INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityC.cmake)
-
-#-----------------------------------------------------------------------------
-# Compiler specific flags:
-IF(CMAKE_COMPILER_IS_GNUCC)
-  # For all builds, make sure openjpeg is std99 compliant:
-  # SET(CMAKE_C_FLAGS "-Wall -std=c99 ${CMAKE_C_FLAGS}") # FIXME: this setting prevented us from setting a coverage build.
-  # Do not use ffast-math for all build, it would produce incorrect results, only set for release:
-  SET(CMAKE_C_FLAGS_RELEASE "-ffast-math ${CMAKE_C_FLAGS_RELEASE}")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
-# Defines the source code for the library
-SET(OPENJPEG_SRCS
-  bio.c
-  cio.c
-  dwt.c
-  event.c
-  image.c
-  j2k.c
-  j2k_lib.c
-  jp2.c
-  jpt.c
-  mct.c
-  mqc.c
-  openjpeg.c
-  pi.c
-  raw.c
-  t1.c
-  t2.c
-  tcd.c
-  tgt.c
-)
-
-# Pass proper definition to preprocessor to generate shared lib
-IF(WIN32)
-  IF(BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS(-DOPJ_EXPORTS)
-  ELSE(BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS(-DOPJ_STATIC)
-  ENDIF(BUILD_SHARED_LIBS)
-ENDIF(WIN32)
-
-# Create the library
-ADD_LIBRARY(openjpeg ${OPENJPEG_SRCS})
-SET_TARGET_PROPERTIES(openjpeg PROPERTIES
 	${OPENJPEG_LIBRARY_PROPERTIES})
 
-

indra/libopenjpeg/dwt.c

@@ -527,7 +527,7 @@ static void dwt_decode_tile(opj_tcd_tilecomp_t* tilec, int numres, DWT1DFN dwt_1
 
 	int w = tilec->x1 - tilec->x0;
 
-	h.mem = opj_aligned_malloc(dwt_decode_max_resolution(tr, numres) * sizeof(int));
+	h.mem = (int *)opj_aligned_malloc(dwt_decode_max_resolution(tr, numres) * sizeof(int));
 	v.mem = h.mem;
 
 	while( --numres) {
@@ -570,7 +570,7 @@ static void v4dwt_interleave_h(v4dwt_t* restrict w, float* restrict a, int x, in
 	int count = w->sn;
 	int i, k;
 	for(k = 0; k < 2; ++k){
-		if (count + 3 * x < size && ((int) a & 0x0f) == 0 && ((int) bi & 0x0f) == 0 && (x & 0x0f) == 0) {
+		if (count + 3 * x < size && ((long) a & 0x0f) == 0 && ((long) bi & 0x0f) == 0 && (x & 0x0f) == 0) {
 			/* Fast code path */
 			for(i = 0; i < count; ++i){
 				int j = i;

indra/libopenjpeg/event.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Herv<EFBFBD> Drolon, FreeImage Team
+ * Copyright (c) 2005, Hervé Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,41 +26,6 @@
 
 #include "opj_includes.h"
 
-/* ==========================================================
-     Utility functions
-   ==========================================================*/
-
-#if !defined(_MSC_VER) && !defined(__MINGW32__)
-static char*
-i2a(unsigned i, char *a, unsigned r) {
-	if (i/r > 0) a = i2a(i/r,a,r);
-	*a = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"[i%r];
-	return a+1;
-}
-
-/** 
- Transforms integer i into an ascii string and stores the result in a; 
- string is encoded in the base indicated by r.
- @param i Number to be converted
- @param a String result
- @param r Base of value; must be in the range 2 - 36
- @return Returns a
-*/
-static char *
-_itoa(int i, char *a, int r) {
-	r = ((r < 2) || (r > 36)) ? 10 : r;
-	if(i < 0) {
-		*a = '-';
-		*i2a(-i, a+1, r) = 0;
-	}
-	else *i2a(i, a, r) = 0;
-	return a;
-}
-
-#endif /* !WIN32 */
-
-/* ----------------------------------------------------------------------- */
-
 opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context) {
 	if(cinfo) {
 		opj_event_mgr_t *previous = cinfo->event_mgr;

indra/libopenjpeg/j2k.c

@@ -236,7 +236,7 @@ static void j2k_read_unk(opj_j2k_t *j2k);
 /* ----------------------------------------------------------------------- */
 typedef struct j2k_prog_order{
 	OPJ_PROG_ORDER enum_prog;
-	char str_prog[4];
+	char str_prog[5];
 }j2k_prog_order_t;
 
 j2k_prog_order_t j2k_prog_order_list[] = {

indra/libopenjpeg/opj_malloc.h

@@ -1,163 +1,163 @@
-/*
+/*
- * Copyright (c) 2005, Herv<72> Drolon, FreeImage Team
+ * Copyright (c) 2005, Herv<72> Drolon, FreeImage Team
- * Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
+ * Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
- * All rights reserved.
+ * All rights reserved.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
+ * modification, are permitted provided that the following conditions
- * are met:
+ * are met:
- * 1. Redistributions of source code must retain the above copyright
+ * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
+ *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
+ *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ *    documentation and/or other materials provided with the distribution.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-#ifndef __OPJ_MALLOC_H
+#ifndef __OPJ_MALLOC_H
-#define __OPJ_MALLOC_H
+#define __OPJ_MALLOC_H
-/**
+/**
-@file opj_malloc.h
+@file opj_malloc.h
-@brief Internal functions
+@brief Internal functions
-
+
-The functions in opj_malloc.h are internal utilities used for memory management.
+The functions in opj_malloc.h are internal utilities used for memory management.
-*/
+*/
-
+
-/** @defgroup MISC MISC - Miscellaneous internal functions */
+/** @defgroup MISC MISC - Miscellaneous internal functions */
-/*@{*/
+/*@{*/
-
+
-/** @name Exported functions */
+/** @name Exported functions */
-/*@{*/
+/*@{*/
-/* ----------------------------------------------------------------------- */
+/* ----------------------------------------------------------------------- */
-
+
-/**
+/**
-Allocate an uninitialized memory block
+Allocate an uninitialized memory block
-@param size Bytes to allocate
+@param size Bytes to allocate
-@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
+@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
-*/
+*/
-#ifdef ALLOC_PERF_OPT
+#ifdef ALLOC_PERF_OPT
-void * OPJ_CALLCONV opj_malloc(size_t size);
+void * OPJ_CALLCONV opj_malloc(size_t size);
-#else
+#else
-#define opj_malloc(size) malloc(size)
+#define opj_malloc(size) malloc(size)
-#endif
+#endif
-
+
-/**
+/**
-Allocate a memory block with elements initialized to 0
+Allocate a memory block with elements initialized to 0
-@param num Blocks to allocate
+@param num Blocks to allocate
-@param size Bytes per block to allocate
+@param size Bytes per block to allocate
-@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
+@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
-*/
+*/
-#ifdef ALLOC_PERF_OPT
+#ifdef ALLOC_PERF_OPT
-void * OPJ_CALLCONV opj_calloc(size_t _NumOfElements, size_t _SizeOfElements);
+void * OPJ_CALLCONV opj_calloc(size_t _NumOfElements, size_t _SizeOfElements);
-#else
+#else
-#define opj_calloc(num, size) calloc(num, size)
+#define opj_calloc(num, size) calloc(num, size)
-#endif
+#endif
-
+
-/**
+/**
-Allocate memory aligned to a 16 byte boundry
+Allocate memory aligned to a 16 byte boundry
-@param size Bytes to allocate
+@param size Bytes to allocate
-@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
+@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
-*/
+*/
-/* FIXME: These should be set with cmake tests, but we're currently not requiring use of cmake */
+/* FIXME: These should be set with cmake tests, but we're currently not requiring use of cmake */
-#ifdef WIN32
+#ifdef WIN32
-	/* Someone should tell the mingw people that their malloc.h ought to provide _mm_malloc() */
+	/* Someone should tell the mingw people that their malloc.h ought to provide _mm_malloc() */
-	#ifdef __GNUC__
+	#ifdef __GNUC__
-		#include <mm_malloc.h>
+		#include <mm_malloc.h>
-		#define HAVE_MM_MALLOC
+		#define HAVE_MM_MALLOC
-	#else /* MSVC, Intel C++ */
+	#else /* MSVC, Intel C++ */
-		#include <malloc.h>
+		#include <malloc.h>
-		#ifdef _mm_malloc
+		#ifdef _mm_malloc
-			#define HAVE_MM_MALLOC
+			#define HAVE_MM_MALLOC
-		#endif
+		#endif
-	#endif
+	#endif
-#else /* Not WIN32 */
+#else /* Not WIN32 */
-	#if defined(__sun)
+	#if defined(__sun)
-		#define HAVE_MEMALIGN
+		#define HAVE_MEMALIGN
-	/* Linux x86_64 and OSX always align allocations to 16 bytes */
+	/* Linux x86_64 and OSX always align allocations to 16 bytes */
-	#elif !defined(__amd64__) && !defined(__APPLE__)	
+	#elif !defined(__amd64__) && !defined(__APPLE__)	
-		#define HAVE_MEMALIGN
+		#define HAVE_MEMALIGN
-		#include <malloc.h>			
+		#include <malloc.h>			
-	#endif
+	#endif
-#endif
+#endif
-
+
-#define opj_aligned_malloc(size) malloc(size)
+#define opj_aligned_malloc(size) malloc(size)
-#define opj_aligned_free(m) free(m)
+#define opj_aligned_free(m) free(m)
-
+
-#ifdef HAVE_MM_MALLOC
+#ifdef HAVE_MM_MALLOC
-	#undef opj_aligned_malloc
+	#undef opj_aligned_malloc
-	#define opj_aligned_malloc(size) _mm_malloc(size, 16)
+	#define opj_aligned_malloc(size) _mm_malloc(size, 16)
-	#undef opj_aligned_free
+	#undef opj_aligned_free
-	#define opj_aligned_free(m) _mm_free(m)
+	#define opj_aligned_free(m) _mm_free(m)
-#endif
+#endif
-
+
-#ifdef HAVE_MEMALIGN
+#ifdef HAVE_MEMALIGN
-	extern void* memalign(size_t, size_t);
+	extern void* memalign(size_t, size_t);
-	#undef opj_aligned_malloc
+	#undef opj_aligned_malloc
-	#define opj_aligned_malloc(size) memalign(16, (size))
+	#define opj_aligned_malloc(size) memalign(16, (size))
-	#undef opj_aligned_free
+	#undef opj_aligned_free
-	#define opj_aligned_free(m) free(m)
+	#define opj_aligned_free(m) free(m)
-#endif
+#endif
-
+
-#ifdef HAVE_POSIX_MEMALIGN
+#ifdef HAVE_POSIX_MEMALIGN
-	#undef opj_aligned_malloc
+	#undef opj_aligned_malloc
-	extern int posix_memalign(void**, size_t, size_t);
+	extern int posix_memalign(void**, size_t, size_t);
-
+
-	static INLINE void* __attribute__ ((malloc)) opj_aligned_malloc(size_t size){
+	static INLINE void* __attribute__ ((malloc)) opj_aligned_malloc(size_t size){
-		void* mem = NULL;
+		void* mem = NULL;
-		posix_memalign(&mem, 16, size);
+		posix_memalign(&mem, 16, size);
-		return mem;
+		return mem;
-	}
+	}
-	#undef opj_aligned_free
+	#undef opj_aligned_free
-	#define opj_aligned_free(m) free(m)
+	#define opj_aligned_free(m) free(m)
-#endif
+#endif
-
+
-#ifdef ALLOC_PERF_OPT
+#ifdef ALLOC_PERF_OPT
-	#undef opj_aligned_malloc
+	#undef opj_aligned_malloc
-	#define opj_aligned_malloc(size) opj_malloc(size)
+	#define opj_aligned_malloc(size) opj_malloc(size)
-	#undef opj_aligned_free
+	#undef opj_aligned_free
-	#define opj_aligned_free(m) opj_free(m)
+	#define opj_aligned_free(m) opj_free(m)
-#endif
+#endif
-
+
-/**
+/**
-Reallocate memory blocks.
+Reallocate memory blocks.
-@param memblock Pointer to previously allocated memory block
+@param memblock Pointer to previously allocated memory block
-@param size New size in bytes
+@param size New size in bytes
-@return Returns a void pointer to the reallocated (and possibly moved) memory block
+@return Returns a void pointer to the reallocated (and possibly moved) memory block
-*/
+*/
-#ifdef ALLOC_PERF_OPT
+#ifdef ALLOC_PERF_OPT
-void * OPJ_CALLCONV opj_realloc(void * _Memory, size_t NewSize);
+void * OPJ_CALLCONV opj_realloc(void * _Memory, size_t NewSize);
-#else
+#else
-#define opj_realloc(m, s) realloc(m, s)
+#define opj_realloc(m, s) realloc(m, s)
-#endif
+#endif
-
+
-/**
+/**
-Deallocates or frees a memory block.
+Deallocates or frees a memory block.
-@param memblock Previously allocated memory block to be freed
+@param memblock Previously allocated memory block to be freed
-*/
+*/
-#ifdef ALLOC_PERF_OPT
+#ifdef ALLOC_PERF_OPT
-void OPJ_CALLCONV opj_free(void * _Memory);
+void OPJ_CALLCONV opj_free(void * _Memory);
-#else
+#else
-#define opj_free(m) free(m)
+#define opj_free(m) free(m)
-#endif
+#endif
-
+
-#ifdef __GNUC__
+#ifdef __GNUC__
-#pragma GCC poison malloc calloc realloc free
+#pragma GCC poison malloc calloc realloc free
-#endif
+#endif
-
+
-/* ----------------------------------------------------------------------- */
+/* ----------------------------------------------------------------------- */
-/*@}*/
+/*@}*/
-
+
-/*@}*/
+/*@}*/
-
+
-#endif /* __OPJ_MALLOC_H */
+#endif /* __OPJ_MALLOC_H */
-
+

indra/linux_crash_logger/CMakeLists.txt

@@ -38,7 +38,7 @@ list(APPEND linux_crash_logger_SOURCE_FILES
      ${linux_crash_logger_HEADER_FILES}
      )
 
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lrt -lapr-1 -Wl,--as-needed")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
 
 add_executable(linux-crash-logger ${linux_crash_logger_SOURCE_FILES})
 

indra/llaudio/CMakeLists.txt

@@ -5,16 +5,30 @@ project(llaudio)
 include(00-Common)
 include(Audio)
 include(LLAudio)
-include(FMOD)
+if(FMODEX)
+	include(FMODEX)
+	if(FMODEX)
+		set(FMOD OFF)
+	endif(FMODEX)
+endif(FMODEX)
+if(NOT FMODEX)
+	include(FMOD)
+endif(NOT FMODEX)
 include(OPENAL)
 include(LLCommon)
 include(LLMath)
 include(LLMessage)
 include(LLVFS)
 
+if(FMODEX)
+	include_directories(${FMODEX_INCLUDE_DIR})
+endif(FMODEX)
+if(FMOD)
+	include_directories(${FMOD_INCLUDE_DIR})
+endif(FMOD)
+
 include_directories(
     ${LLAUDIO_INCLUDE_DIRS}
-    ${FMOD_INCLUDE_DIR}
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
     ${LLMESSAGE_INCLUDE_DIRS}
@@ -46,6 +60,19 @@ set(llaudio_HEADER_FILES
     llwindgen.h
     )
 
+if (FMODEX)
+    list(APPEND llaudio_SOURCE_FILES
+         llaudioengine_fmodex.cpp
+         lllistener_fmodex.cpp
+         llstreamingaudio_fmodex.cpp
+         )
+
+    list(APPEND llaudio_HEADER_FILES
+         llaudioengine_fmodex.h
+         lllistener_fmodex.h
+         llstreamingaudio_fmodex.h
+         )
+endif (FMODEX)
 if (FMOD)
     list(APPEND llaudio_SOURCE_FILES
          llaudioengine_fmod.cpp

indra/llaudio/llaudiodecodemgr.cpp

@@ -249,7 +249,7 @@ BOOL LLVorbisDecodeState::initDecode()
 		llwarns << "Bad sound caught by zmagic" << llendl;
 		abort_decode = true;
 	}
-	else
+	else if(!gAudiop->getAllowLargeSounds())
 	{
 	// </edit> 
 	//Much more restrictive than zmagic. Perhaps make toggleable.
@@ -723,4 +723,4 @@ BOOL LLAudioDecodeMgr::addDecodeRequest(const LLUUID &uuid)
 	}
 
 	return FALSE;
-}
+}

indra/llaudio/llaudioengine.cpp

@@ -115,6 +115,8 @@ void LLAudioEngine::setDefaults()
 
 	for (U32 i = 0; i < LLAudioEngine::AUDIO_TYPE_COUNT; i++)
 		mSecondaryGain[i] = 1.0f;
+
+	mAllowLargeSounds = false;
 }
 
 
@@ -1336,16 +1338,17 @@ LLAudioSource::LLAudioSource(const LLUUID& id, const LLUUID& owner_id, const F32
 
 LLAudioSource::~LLAudioSource()
 {
+	// <edit>
+	// Record destruction of LLAudioSource object.
+	if(mType != LLAudioEngine::AUDIO_TYPE_UI)
+		logSoundStop(mLogID, true);
+	// </edit>
 	if (mChannelp)
 	{
 		// Stop playback of this sound
 		mChannelp->setSource(NULL);
-		mChannelp = NULL;
+		setChannel(NULL);
 	}
-	// <edit>
-	if(mType != LLAudioEngine::AUDIO_TYPE_UI) // && mSourceID.notNull())
-		logSoundStop(mLogID);
-	// </edit>
 }
 
 
@@ -1356,10 +1359,17 @@ void LLAudioSource::setChannel(LLAudioChannel *channelp)
 		return;
 	}
 
+	// <edit>
+	if (!channelp)
+	{
+		if(mType != LLAudioEngine::AUDIO_TYPE_UI)
+			logSoundStop(mLogID, false);
+	}
+	// </edit>
+
 	mChannelp = channelp;
 }
 
-
 void LLAudioSource::update()
 {
 	if (!getCurrentBuffer())
@@ -1434,10 +1444,6 @@ bool LLAudioSource::setupChannel()
 
 bool LLAudioSource::play(const LLUUID &audio_uuid)
 {
-	// <edit>
-	if(mType != LLAudioEngine::AUDIO_TYPE_UI) //&& mSourceID.notNull())
-		logSoundPlay(mLogID, this, mPositionGlobal, mType, audio_uuid, mOwnerID, mSourceID, mIsTrigger, mLoop); // is mID okay for source id?
-	// </edit>
 	// Special abuse of play(); don't play a sound, but kill it.
 	if (audio_uuid.isNull())
 	{
@@ -1453,6 +1459,11 @@ bool LLAudioSource::play(const LLUUID &audio_uuid)
 		return false;
 	}
 
+	// <edit>
+	if(mType != LLAudioEngine::AUDIO_TYPE_UI) //&& mSourceID.notNull())
+		logSoundPlay(this, audio_uuid);
+	// </edit>
+
 	// Reset our age timeout if someone attempts to play the source.
 	mAgeTimer.reset();
 
@@ -1846,36 +1857,38 @@ bool LLAudioData::load()
 std::map<LLUUID, LLSoundHistoryItem> gSoundHistory;
 
 // static
-void logSoundPlay(LLUUID id, LLAudioSource* audio_source, LLVector3d position, S32 type, LLUUID assetid, LLUUID ownerid, LLUUID sourceid, bool is_trigger, bool is_looped)
+void logSoundPlay(LLAudioSource* audio_source, LLUUID const& assetid)
 {
 	LLSoundHistoryItem item;
-	item.mID = id;
+	item.mID = audio_source->getLogID();
 	item.mAudioSource = audio_source;
-	item.mPosition = position;
+	item.mPosition = audio_source->getPositionGlobal();
-	item.mType = type;
+	item.mType = audio_source->getType();
 	item.mAssetID = assetid;
-	item.mOwnerID = ownerid;
+	item.mOwnerID = audio_source->getOwnerID();
-	item.mSourceID = sourceid;
+	item.mSourceID = audio_source->getSourceID();
 	item.mPlaying = true;
 	item.mTimeStarted = LLTimer::getElapsedSeconds();
 	item.mTimeStopped = F64_MAX;
-	item.mIsTrigger = is_trigger;
+	item.mIsTrigger = audio_source->getIsTrigger();
-	item.mIsLooped = is_looped;
+	item.mIsLooped = audio_source->isLoop();
 
 	item.mReviewed = false;
 	item.mReviewedCollision = false;
 
-	gSoundHistory[id] = item;
+	gSoundHistory[item.mID] = item;
 }
 
 //static 
-void logSoundStop(LLUUID id)
+void logSoundStop(LLUUID const& id, bool destructed)
 {
-	if(gSoundHistory.find(id) != gSoundHistory.end())
+	std::map<LLUUID, LLSoundHistoryItem>::iterator iter = gSoundHistory.find(id);
+	if(iter != gSoundHistory.end() && iter->second.mAudioSource)
 	{
-		gSoundHistory[id].mPlaying = false;
+		iter->second.mPlaying = false;
-		gSoundHistory[id].mTimeStopped = LLTimer::getElapsedSeconds();
+		iter->second.mTimeStopped = LLTimer::getElapsedSeconds();
-		gSoundHistory[id].mAudioSource = NULL; // just in case
+		if (destructed)
+			iter->second.mAudioSource = NULL;
 		pruneSoundLog();
 	}
 }

indra/llaudio/llaudioengine.h

@@ -187,6 +187,8 @@ public:
 
 	bool updateBufferForData(LLAudioData *adp, const LLUUID &audio_uuid = LLUUID::null);
 
+	void setAllowLargeSounds(bool allow) { mAllowLargeSounds = allow ;}
+	bool getAllowLargeSounds() const {return mAllowLargeSounds;}
 
 	// Asset callback when we're retrieved a sound from the asset server.
 	void startNextTransfer();
@@ -237,12 +239,15 @@ protected:
 	// A list of all audio sources that are known to the viewer at this time.
 	// This is most likely a superset of the ones that we actually have audio
 	// data for, or are playing back.
+public://Jay: IDGAF
 	typedef std::map<LLUUID, LLAudioSource *> source_map;
+protected:
 	typedef std::map<LLUUID, LLAudioData *> data_map;
-
+	
+public://Jay: IDGAF
 	source_map mAllSources;
+protected:
 	data_map mAllData;
-
 	LLAudioChannel *mChannels[MAX_CHANNELS];
 
 	// Buffers needs to change into a different data structure, as the number of buffers
@@ -260,6 +265,8 @@ protected:
 private:
 	void setDefaults();
 	LLStreamingAudioInterface *mStreamingAudioImpl;
+
+	bool mAllowLargeSounds;
 };
 
 
@@ -306,7 +313,11 @@ public:
 	void setPlayedOnce(const bool played_once)				{ mPlayedOnce = played_once; }
 
 	void setType(S32 type)                                  { mType = type; }
-	S32 getType()                                           { return mType; }
+	S32 getType(void) const                                 { return mType; }
+
+	LLUUID const& getOwnerID(void) const					{ return mOwnerID; }
+	LLUUID const& getSourceID(void) const					{ return mSourceID; }
+	bool getIsTrigger(void) const							{ return mIsTrigger; }
 
 	void setPositionGlobal(const LLVector3d &position_global)		{ mPositionGlobal = position_global; }
 	LLVector3d getPositionGlobal() const							{ return mPositionGlobal; }
@@ -337,11 +348,15 @@ public:
 	friend class LLAudioChannel;
 protected:
 	void setChannel(LLAudioChannel *channelp);
+public:
 	LLAudioChannel *getChannel() const						{ return mChannelp; }
 
 protected:
 	LLUUID			mID; // The ID of the source is that of the object if it's attached to an object.
 	LLUUID			mOwnerID;	// owner of the object playing the sound
+public:
+	const LLUUID &getOwnerID()		{ return mOwnerID; }
+protected:
 	F32				mPriority;
 	F32				mGain;
 	bool			mSourceMuted;
@@ -430,17 +445,22 @@ public:
 
 	friend class LLAudioEngine;
 	friend class LLAudioSource;
+
 protected:
 	virtual void play() = 0;
 	virtual void playSynced(LLAudioChannel *channelp) = 0;
 	virtual void cleanup() = 0;
+	void setWaiting(bool waiting)               { mWaiting = waiting; }
+
+public:
 	virtual bool isPlaying() = 0;
-	void setWaiting(const bool waiting)			{ mWaiting = waiting; }
 	bool isWaiting() const						{ return mWaiting; }
 
+protected:
 	virtual bool updateBuffer(); // Check to see if the buffer associated with the source changed, and update if necessary.
 	virtual void update3DPosition() = 0;
 	virtual void updateLoop() = 0; // Update your loop/completion status, for use by queueing/syncing.
+
 protected:
 	LLAudioSource	*mCurrentSourcep;
 	LLAudioBuffer	*mCurrentBufferp;
@@ -478,7 +498,7 @@ protected:
 extern LLAudioEngine* gAudiop;
 
 // <edit>
-typedef struct
+struct LLSoundHistoryItem
 {
 	LLUUID mID;
 	LLVector3d mPosition;
@@ -494,12 +514,27 @@ typedef struct
 	bool mReviewed;
 	bool mReviewedCollision;
 	LLAudioSource* mAudioSource;
-} LLSoundHistoryItem;
+	
+	LLSoundHistoryItem() : mType(0), mPlaying(false), mIsTrigger(false),
+			mIsLooped(false), mReviewed(false), mReviewedCollision(false),
+			mTimeStarted(0), mTimeStopped(0), mAudioSource(0) {}
+
+	bool isPlaying(void) const
+	{
+		return mPlaying && mAudioSource && mAudioSource->getChannel()
+		  // It's only REALLY playing if the following also returns true,
+		  // but it's too hard detect when that part is starting/stopping,
+		  // so in the sound explorer we call "playing" (or "looping")
+		  // those audio source that have a channel assigned and call
+		  // it a day.
+			 /*&& mAudioSource->getChannel()->isPlaying()*/ ;
+	}
+};
 
 extern std::map<LLUUID, LLSoundHistoryItem> gSoundHistory;
 
-extern void logSoundPlay(LLUUID id, LLAudioSource* audio_source, LLVector3d position, S32 type, LLUUID assetid, LLUUID ownerid, LLUUID sourceid, bool is_trigger, bool is_looped);
+extern void logSoundPlay(LLAudioSource* audio_source, LLUUID const& assetid);
-extern void logSoundStop(LLUUID id);
+extern void logSoundStop(LLUUID const& id, bool destructed);
 extern void pruneSoundLog();
 extern int gSoundHistoryPruneCounter;
 

indra/llaudio/llaudioengine_fmod.cpp

@@ -107,6 +107,7 @@ bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata)
 	// This means we also try to play audio when minimized,
 	// so we manually handle muting in that case. JC
 	fmod_flags |= FSOUND_INIT_GLOBALFOCUS;
+	fmod_flags |= FSOUND_INIT_DSOUND_HRTF_FULL;
 #endif
 
 #if LL_LINUX

indra/llaudio/llaudioengine_fmodex.cpp

@@ -0,0 +1,782 @@
+/** 
+ * @file audioengine_FMODEX.cpp
+ * @brief Implementation of LLAudioEngine class abstracting the audio support as a FMOD 3D implementation
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llstreamingaudio.h"
+#include "llstreamingaudio_fmodex.h"
+
+#include "llaudioengine_fmodex.h"
+#include "lllistener_fmodex.h"
+
+#include "llerror.h"
+#include "llmath.h"
+#include "llrand.h"
+
+#include "fmod.hpp"
+#include "fmod_errors.h"
+#include "lldir.h"
+#include "llapr.h"
+
+#include "sound_ids.h"
+
+#if LL_WINDOWS	//Some ugly code to make missing fmodex.dll not cause a fatal error.
+#define WIN32_LEAN_AND_MEAN
+#include "windows.h"
+#include <DelayImp.h>
+#pragma comment(lib, "delayimp.lib")
+
+bool attemptDelayLoad()
+{
+	__try
+	{
+		if( FAILED( __HrLoadAllImportsForDll( "fmodex.dll" ) ) )
+			return false;
+	}
+	__except( EXCEPTION_EXECUTE_HANDLER )
+	{
+		return false;
+	}
+	return true;
+}
+#endif
+
+FMOD_RESULT F_CALLBACK windCallback(FMOD_DSP_STATE *dsp_state, float *inbuffer, float *outbuffer, unsigned int length, int inchannels, int outchannels);
+
+LLAudioEngine_FMODEX::LLAudioEngine_FMODEX(bool enable_profiler)
+{
+	mInited = false;
+	mWindGen = NULL;
+	mWindDSP = NULL;
+	mSystem = NULL;
+	mEnableProfiler = enable_profiler;
+}
+
+
+LLAudioEngine_FMODEX::~LLAudioEngine_FMODEX()
+{
+}
+
+
+inline bool Check_FMOD_Error(FMOD_RESULT result, const char *string)
+{
+	if(result == FMOD_OK)
+		return false;
+	llwarns << string << " Error: " << FMOD_ErrorString(result) << llendl;
+	return true;
+}
+
+bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
+{
+
+#if LL_WINDOWS
+	if(!attemptDelayLoad())
+		return false;
+#endif
+
+	U32 version;
+	FMOD_RESULT result;
+	int numdrivers;
+	FMOD_SPEAKERMODE speakermode;
+	FMOD_CAPS caps;
+	char name[256];
+
+	LL_DEBUGS("AppInit") << "LLAudioEngine_FMODEX::init() initializing FMOD" << LL_ENDL;
+
+	result = FMOD::System_Create(&mSystem);
+	if(Check_FMOD_Error(result, "FMOD::System_Create"))
+		return false;
+
+	//will call LLAudioEngine_FMODEX::allocateListener, which needs a valid mSystem pointer.
+	LLAudioEngine::init(num_channels, userdata);	
+	
+	result = mSystem->getVersion(&version);
+	Check_FMOD_Error(result, "FMOD::System::getVersion");
+
+	if (version < FMOD_VERSION)
+	{
+		LL_WARNS("AppInit") << "Error : You are using the wrong FMOD version (" << version
+			<< ")!  You should be using FMOD " << FMOD_VERSION << LL_ENDL;
+	}
+
+#if LL_WINDOWS
+	//Is this block applicable to linux?
+	{
+		result = mSystem->getNumDrivers(&numdrivers);
+		Check_FMOD_Error(result, "FMOD::System::getNumDrivers");
+		if (numdrivers == 0)
+		{
+			result = mSystem->setOutput(FMOD_OUTPUTTYPE_NOSOUND);
+			Check_FMOD_Error(result, "FMOD::System::setOutput");
+		}
+		else
+		{
+			result = mSystem->getDriverCaps(0, &caps, 0, &speakermode);
+			Check_FMOD_Error(result,"FMOD::System::getDriverCaps");
+			/*
+			Set the user selected speaker mode.
+			*/
+			result = mSystem->setSpeakerMode(speakermode);
+			Check_FMOD_Error(result, "FMOD::System::setSpeakerMode");
+			if (caps & FMOD_CAPS_HARDWARE_EMULATED)
+			{
+				/*
+				The user has the 'Acceleration' slider set to off! This is really bad
+				for latency! You might want to warn the user about this.
+				*/
+				result = mSystem->setDSPBufferSize(1024, 10);
+				Check_FMOD_Error(result, "FMOD::System::setDSPBufferSize");
+			}
+			result = mSystem->getDriverInfo(0, name, 256, 0);
+			Check_FMOD_Error(result, "FMOD::System::getDriverInfo");
+
+			if (strstr(name, "SigmaTel"))
+			{
+				/*
+				Sigmatel sound devices crackle for some reason if the format is PCM 16bit.
+				PCM floating point output seems to solve it.
+				*/
+				result = mSystem->setSoftwareFormat(48000, FMOD_SOUND_FORMAT_PCMFLOAT, 0,0, FMOD_DSP_RESAMPLER_LINEAR);
+				Check_FMOD_Error(result,"FMOD::System::setSoftwareFormat");
+			}
+		}
+	}
+#endif //LL_WINDOWS
+
+	// In this case, all sounds, PLUS wind and stream will be software.
+	result = mSystem->setSoftwareChannels(num_channels+2);
+	Check_FMOD_Error(result,"FMOD::System::setSoftwareChannels");
+
+	U32 fmod_flags = FMOD_INIT_NORMAL;
+	if(mEnableProfiler)
+		fmod_flags |= FMOD_INIT_ENABLE_PROFILE;
+
+#if LL_LINUX
+	// If we don't set an output method, Linux FMOD always
+	// decides on OSS and fails otherwise.  So we'll manually
+	// try ESD, then OSS, then ALSA.
+	// Why this order?  See SL-13250, but in short, OSS emulated
+	// on top of ALSA is ironically more reliable than raw ALSA.
+	// Ack, and ESD has more reliable failure modes - but has worse
+	// latency - than all of them, so wins for now.
+	bool audio_ok = false;
+
+	if (!audio_ok)
+	{
+		if (NULL == getenv("LL_BAD_FMODEX_ESD")) /*Flawfinder: ignore*/
+		{
+			LL_DEBUGS("AppInit") << "Trying ESD audio output..." << LL_ENDL;
+			if(mSystem->SetOutput(FMOD_OUTPUTTYPE_ESD) == FMOD_OK &&
+				(result = mSystem->init(num_channels, fmod_flags, 0)) == FMOD_OK)
+			{
+				LL_DEBUGS("AppInit") << "ESD audio output initialized OKAY"	<< LL_ENDL;
+				audio_ok = true;
+			}
+			else 
+			{
+				Check_FMOD_Error(result, "ESD audio output FAILED to initialize");
+			}
+		} 
+		else 
+		{
+			LL_DEBUGS("AppInit") << "ESD audio output SKIPPED" << LL_ENDL;
+		}	
+	}
+	if (!audio_ok)
+	{
+		if (NULL == getenv("LL_BAD_FMODEX_OSS")) 	 /*Flawfinder: ignore*/
+		{
+			LL_DEBUGS("AppInit") << "Trying OSS audio output..." << LL_ENDL;
+			if(mSystem->SetOutput(FMOD_OUTPUTTYPE_OSS) == FMOD_OK &&
+			   (result = mSystem->init(num_channels, fmod_flags, 0)) == FMOD_OK)
+			{
+				LL_DEBUGS("AppInit") << "OSS audio output initialized OKAY" << LL_ENDL;
+				audio_ok = true;
+			} 
+			else 
+			{
+				Check_FMOD_Error(result, "OSS audio output FAILED to initialize" << LL_ENDL;
+			}
+		} 
+		else 
+		{
+			LL_DEBUGS("AppInit") << "OSS audio output SKIPPED" << LL_ENDL;
+		}
+	}
+	if (!audio_ok)
+	{
+		if (NULL == getenv("LL_BAD_FMODEX_ALSA"))		/*Flawfinder: ignore*/
+		{
+			LL_DEBUGS("AppInit") << "Trying ALSA audio output..." << LL_ENDL;
+			if(mSystem->SetOutput(FMOD_OUTPUTTYPE_ALSA) &&
+			   (result = mSystem->init(num_channels, fmod_flags, 0)) == FMOD_OK)
+			{
+				LL_DEBUGS("AppInit") << "ALSA audio output initialized OKAY" << LL_ENDL;
+				audio_ok = true;
+			}
+			else
+			{
+				Check_FMOD_Error(result, "ALSA audio output FAILED to initialize");
+			}
+		} else 
+		{
+			LL_DEBUGS("AppInit") << "OSS audio output SKIPPED" << LL_ENDL;
+		}
+	}
+	if (!audio_ok)
+	{
+		LL_WARNS("AppInit") << "Overall audio init failure." << LL_ENDL;
+		return false;
+	}
+
+	// On Linux, FMOD causes a SIGPIPE for some netstream error
+	// conditions (an FMOD bug); ignore SIGPIPE so it doesn't crash us.
+	// NOW FIXED in FMOD 3.x since 2006-10-01.
+	//signal(SIGPIPE, SIG_IGN);
+
+	// We're interested in logging which output method we
+	// ended up with, for QA purposes.
+	FMOD_OUTPUTTYPE output_type;
+	mSystem->getOutput(output_type);
+	switch (output_type)
+	{
+		case FSOUND_OUTPUT_NOSOUND: 
+			LL_DEBUGS("AppInit") << "Audio output: NoSound" << LL_ENDL; break;
+		case FSOUND_OUTPUT_OSS:	
+			LL_DEBUGS("AppInit") << "Audio output: OSS" << LL_ENDL; break;
+		case FSOUND_OUTPUT_ESD:	
+			LL_DEBUGS("AppInit") << "Audio output: ESD" << LL_ENDL; break;
+		case FSOUND_OUTPUT_ALSA: 
+			LL_DEBUGS("AppInit") << "Audio output: ALSA" << LL_ENDL; break;
+		default:
+			LL_INFOS("AppInit") << "Audio output: Unknown!" << LL_ENDL; break;
+	};
+#else // LL_LINUX
+
+	// initialize the FMOD engine
+	result = mSystem->init( num_channels + 2, fmod_flags, 0);
+	if (result == FMOD_ERR_OUTPUT_CREATEBUFFER)
+	{
+		/*
+		Ok, the speaker mode selected isn't supported by this soundcard. Switch it
+		back to stereo...
+		*/
+		result = mSystem->setSpeakerMode(FMOD_SPEAKERMODE_STEREO);
+		Check_FMOD_Error(result,"Error falling back to stereo mode");
+		/*
+		... and re-init.
+		*/
+		result = mSystem->init(100, FMOD_INIT_NORMAL, 0);
+	}
+	if(Check_FMOD_Error(result, "Error initializing FMOD"))
+		return false;
+#endif
+
+	// set up our favourite FMOD-native streaming audio implementation if none has already been added
+	if (!getStreamingAudioImpl()) // no existing implementation added
+		setStreamingAudioImpl(new LLStreamingAudio_FMODEX(mSystem));
+
+	LL_DEBUGS("AppInit") << "LLAudioEngine_FMODEX::init() FMOD initialized correctly" << LL_ENDL;
+
+	mInited = true;
+
+	return true;
+}
+
+
+std::string LLAudioEngine_FMODEX::getDriverName(bool verbose)
+{
+	llassert_always(mSystem);
+	if (verbose)
+	{
+		U32 version;
+		if(!Check_FMOD_Error(mSystem->getVersion(&version), "FMOD::System::getVersion"))
+		{
+			return llformat("FMOD version %1x.%02x.%02x", version >> 16, version >> 8 & 0x000000FF, version & 0x000000FF);
+		}
+	}
+	return "FMOD";
+}
+
+
+void LLAudioEngine_FMODEX::allocateListener(void)
+{	
+	mListenerp = (LLListener *) new LLListener_FMODEX(mSystem);
+	if (!mListenerp)
+	{
+		llwarns << "Listener creation failed" << llendl;
+	}
+}
+
+
+void LLAudioEngine_FMODEX::shutdown()
+{
+	stopInternetStream();
+
+	LLAudioEngine::shutdown();
+	
+	llinfos << "LLAudioEngine_FMODEX::shutdown() closing FMOD" << llendl;
+	mSystem->close();
+	mSystem->release();
+	llinfos << "LLAudioEngine_FMODEX::shutdown() done closing FMOD" << llendl;
+
+	delete mListenerp;
+	mListenerp = NULL;
+}
+
+
+LLAudioBuffer * LLAudioEngine_FMODEX::createBuffer()
+{
+	return new LLAudioBufferFMODEX(mSystem);
+}
+
+
+LLAudioChannel * LLAudioEngine_FMODEX::createChannel()
+{
+	return new LLAudioChannelFMODEX(mSystem);
+}
+
+bool LLAudioEngine_FMODEX::initWind()
+{
+	mNextWindUpdate = 0.0;
+
+	if (!mWindDSP)
+	{
+		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.read = &windCallback; //Assign callback.
+		if(Check_FMOD_Error(mSystem->createDSP(&dspdesc, &mWindDSP), "FMOD::createDSP"))
+			return false;
+
+		if(mWindGen)
+			delete mWindGen;
+	
+		float frequency = 44100;
+		mWindDSP->getDefaults(&frequency,0,0,0);
+		mWindGen = new LLWindGen<MIXBUFFERFORMAT>((U32)frequency);
+		mWindDSP->setUserData((void*)mWindGen);
+	}
+
+	if (mWindDSP)
+	{
+		mSystem->playDSP(FMOD_CHANNEL_FREE, mWindDSP, false, 0);
+		return true;
+	}
+	return false;
+}
+
+
+void LLAudioEngine_FMODEX::cleanupWind()
+{
+	if (mWindDSP)
+	{
+		mWindDSP->remove();
+		mWindDSP->release();
+		mWindDSP = NULL;
+	}
+
+	delete mWindGen;
+	mWindGen = NULL;
+}
+
+
+//-----------------------------------------------------------------------
+void LLAudioEngine_FMODEX::updateWind(LLVector3 wind_vec, F32 camera_height_above_water)
+{
+	LLVector3 wind_pos;
+	F64 pitch;
+	F64 center_freq;
+
+	if (!mEnableWind)
+	{
+		return;
+	}
+	
+	if (mWindUpdateTimer.checkExpirationAndReset(LL_WIND_UPDATE_INTERVAL))
+	{
+		
+		// wind comes in as Linden coordinate (+X = forward, +Y = left, +Z = up)
+		// need to convert this to the conventional orientation DS3D and OpenAL use
+		// where +X = right, +Y = up, +Z = backwards
+
+		wind_vec.setVec(-wind_vec.mV[1], wind_vec.mV[2], -wind_vec.mV[0]);
+
+		// cerr << "Wind update" << endl;
+
+		pitch = 1.0 + mapWindVecToPitch(wind_vec);
+		center_freq = 80.0 * pow(pitch,2.5*(mapWindVecToGain(wind_vec)+1.0));
+		
+		mWindGen->mTargetFreq = (F32)center_freq;
+		mWindGen->mTargetGain = (F32)mapWindVecToGain(wind_vec) * mMaxWindGain;
+		mWindGen->mTargetPanGainR = (F32)mapWindVecToPan(wind_vec);
+  	}
+}
+
+//-----------------------------------------------------------------------
+void LLAudioEngine_FMODEX::setInternalGain(F32 gain)
+{
+	if (!mInited)
+	{
+		return;
+	}
+
+	gain = llclamp( gain, 0.0f, 1.0f );
+
+	FMOD::ChannelGroup *master_group;
+	mSystem->getMasterChannelGroup(&master_group);
+
+	master_group->setVolume(gain);
+
+	LLStreamingAudioInterface *saimpl = getStreamingAudioImpl();
+	if ( saimpl )
+	{
+		// fmod likes its streaming audio channel gain re-asserted after
+		// master volume change.
+		saimpl->setGain(saimpl->getGain());
+	}
+}
+
+//
+// LLAudioChannelFMODEX implementation
+//
+
+LLAudioChannelFMODEX::LLAudioChannelFMODEX(FMOD::System *system) : LLAudioChannel(), mSystemp(system), mChannelp(NULL), mLastSamplePos(0)
+{
+}
+
+
+LLAudioChannelFMODEX::~LLAudioChannelFMODEX()
+{
+	cleanup();
+}
+
+bool LLAudioChannelFMODEX::updateBuffer()
+{
+	if (LLAudioChannel::updateBuffer())
+	{
+		// Base class update returned true, which means that we need to actually
+		// set up the channel for a different buffer.
+
+		LLAudioBufferFMODEX *bufferp = (LLAudioBufferFMODEX *)mCurrentSourcep->getCurrentBuffer();
+
+		// Grab the FMOD sample associated with the buffer
+		FMOD::Sound *soundp = bufferp->getSound();
+		if (!soundp)
+		{
+			// This is bad, there should ALWAYS be a sound associated with a legit
+			// buffer.
+			llerrs << "No FMOD sound!" << llendl;
+			return false;
+		}
+
+
+		// Actually play the sound.  Start it off paused so we can do all the necessary
+		// setup.
+		if(!mChannelp)
+		{
+			FMOD_RESULT result = getSystem()->playSound(FMOD_CHANNEL_FREE, soundp, true, &mChannelp);
+			Check_FMOD_Error(result, "FMOD::System::playSound");
+		}
+
+		//llinfos << "Setting up channel " << std::hex << mChannelID << std::dec << llendl;
+	}
+
+	// If we have a source for the channel, we need to update its gain.
+	if (mCurrentSourcep)
+	{
+		// SJB: warnings can spam and hurt framerate, disabling
+		FMOD_RESULT result;
+
+		result = mChannelp->setVolume(getSecondaryGain() * mCurrentSourcep->getGain());
+		//Check_FMOD_Error(result, "FMOD::Channel::setVolume");
+
+		result = mChannelp->setMode(mCurrentSourcep->isLoop() ? FMOD_LOOP_NORMAL : FMOD_LOOP_OFF);
+		/*if(Check_FMOD_Error(result, "FMOD::Channel::setMode"))
+		{
+			S32 index;
+			mChannelp->getIndex(&index);
+ 			llwarns << "Channel " << index << "Source ID: " << mCurrentSourcep->getID()
+ 					<< " at " << mCurrentSourcep->getPositionGlobal() << llendl;		
+		}*/
+	}
+
+	return true;
+}
+
+
+void LLAudioChannelFMODEX::update3DPosition()
+{
+	if (!mChannelp)
+	{
+		// We're not actually a live channel (i.e., we're not playing back anything)
+		return;
+	}
+
+	LLAudioBufferFMODEX  *bufferp = (LLAudioBufferFMODEX  *)mCurrentBufferp;
+	if (!bufferp)
+	{
+		// We don't have a buffer associated with us (should really have been picked up
+		// by the above if.
+		return;
+	}
+
+	if (mCurrentSourcep->isAmbient())
+	{
+		// Ambient sound, don't need to do any positional updates.
+		set3DMode(false);
+	}
+	else
+	{
+		// Localized sound.  Update the position and velocity of the sound.
+		set3DMode(true);
+
+		LLVector3 float_pos;
+		float_pos.setVec(mCurrentSourcep->getPositionGlobal());
+		FMOD_RESULT result = mChannelp->set3DAttributes((FMOD_VECTOR*)float_pos.mV, (FMOD_VECTOR*)mCurrentSourcep->getVelocity().mV);
+		Check_FMOD_Error(result, "FMOD::Channel::set3DAttributes");
+	}
+}
+
+
+void LLAudioChannelFMODEX::updateLoop()
+{
+	if (!mChannelp)
+	{
+		// May want to clear up the loop/sample counters.
+		return;
+	}
+
+	//
+	// Hack:  We keep track of whether we looped or not by seeing when the
+	// sample position looks like it's going backwards.  Not reliable; may
+	// yield false negatives.
+	//
+	U32 cur_pos;
+	mChannelp->getPosition(&cur_pos,FMOD_TIMEUNIT_PCMBYTES);
+
+	if (cur_pos < (U32)mLastSamplePos)
+	{
+		mLoopedThisFrame = true;
+	}
+	mLastSamplePos = cur_pos;
+}
+
+
+void LLAudioChannelFMODEX::cleanup()
+{
+	if (!mChannelp)
+	{
+		//llinfos << "Aborting cleanup with no channel handle." << llendl;
+		return;
+	}
+
+	//llinfos << "Cleaning up channel: " << mChannelID << llendl;
+	Check_FMOD_Error(mChannelp->stop(),"FMOD::Channel::stop");
+
+	mCurrentBufferp = NULL;
+	mChannelp = NULL;
+}
+
+
+void LLAudioChannelFMODEX::play()
+{
+	if (!mChannelp)
+	{
+		llwarns << "Playing without a channel handle, aborting" << llendl;
+		return;
+	}
+
+	Check_FMOD_Error(mChannelp->setPaused(false), "FMOD::Channel::pause");
+
+	getSource()->setPlayedOnce(true);
+}
+
+
+void LLAudioChannelFMODEX::playSynced(LLAudioChannel *channelp)
+{
+	LLAudioChannelFMODEX *fmod_channelp = (LLAudioChannelFMODEX*)channelp;
+	if (!(fmod_channelp->mChannelp && mChannelp))
+	{
+		// Don't have channels allocated to both the master and the slave
+		return;
+	}
+
+	U32 cur_pos;
+	if(Check_FMOD_Error(mChannelp->getPosition(&cur_pos,FMOD_TIMEUNIT_PCMBYTES), "Unable to retrieve current position"))
+		return;
+
+	cur_pos %= mCurrentBufferp->getLength();
+	
+	// Try to match the position of our sync master
+	Check_FMOD_Error(mChannelp->setPosition(cur_pos,FMOD_TIMEUNIT_PCMBYTES),"Unable to set current position");
+
+	// Start us playing
+	play();
+}
+
+
+bool LLAudioChannelFMODEX::isPlaying()
+{
+	if (!mChannelp)
+	{
+		return false;
+	}
+
+	bool paused, playing;
+	mChannelp->getPaused(&paused);
+	mChannelp->isPlaying(&playing);
+	return !paused && playing;
+}
+
+
+//
+// LLAudioChannelFMODEX implementation
+//
+
+
+LLAudioBufferFMODEX::LLAudioBufferFMODEX(FMOD::System *system) : mSystemp(system), mSoundp(NULL)
+{
+}
+
+
+LLAudioBufferFMODEX::~LLAudioBufferFMODEX()
+{
+	if(mSoundp)
+	{
+		mSoundp->release();
+		mSoundp = NULL;
+	}
+}
+
+
+bool LLAudioBufferFMODEX::loadWAV(const std::string& filename)
+{
+	// Try to open a wav file from disk.  This will eventually go away, as we don't
+	// really want to block doing this.
+	if (filename.empty())
+	{
+		// invalid filename, abort.
+		return false;
+	}
+
+	if (!LLAPRFile::isExist(filename, LL_APR_RPB))
+	{
+		// File not found, abort.
+		return false;
+	}
+	
+	if (mSoundp)
+	{
+		// If there's already something loaded in this buffer, clean it up.
+		mSoundp->release();
+		mSoundp = NULL;
+	}
+
+	FMOD_MODE base_mode = FMOD_LOOP_NORMAL | FMOD_SOFTWARE;
+	FMOD_CREATESOUNDEXINFO exinfo;
+	memset(&exinfo,0,sizeof(exinfo));
+	exinfo.cbsize = sizeof(exinfo);
+	exinfo.suggestedsoundtype = FMOD_SOUND_TYPE_WAV;	//Hint to speed up loading.
+	// Load up the wav file into an fmod sample
+#if LL_WINDOWS
+	FMOD_RESULT result = getSystem()->createSound((const char*)utf8str_to_utf16str(filename).c_str(), base_mode | FMOD_UNICODE, &exinfo, &mSoundp);
+#else
+	FMOD_RESULT result = getSystem()->createSound(filename.c_str(), base_mode, &exinfo, &mSoundp);
+#endif
+
+	if (result != FMOD_OK)
+	{
+		// We failed to load the file for some reason.
+		llwarns << "Could not load data '" << filename << "': " << FMOD_ErrorString(result) << llendl;
+
+		//
+		// If we EVER want to load wav files provided by end users, we need
+		// to rethink this!
+		//
+		// file is probably corrupt - remove it.
+		LLFile::remove(filename);
+		return false;
+	}
+
+	// Everything went well, return true
+	return true;
+}
+
+
+U32 LLAudioBufferFMODEX::getLength()
+{
+	if (!mSoundp)
+	{
+		return 0;
+	}
+
+	U32 length;
+	mSoundp->getLength(&length, FMOD_TIMEUNIT_PCMBYTES);
+	return length;
+}
+
+
+void LLAudioChannelFMODEX::set3DMode(bool use3d)
+{
+	FMOD_MODE current_mode;
+	if(mChannelp->getMode(&current_mode) != FMOD_OK)
+		return;
+	FMOD_MODE new_mode = current_mode;	
+	new_mode &= ~(use3d ? FMOD_2D : FMOD_3D);
+	new_mode |= use3d ? FMOD_3D : FMOD_2D;
+
+	if(current_mode != new_mode)
+	{
+		mChannelp->setMode(new_mode);
+	}
+}
+
+
+FMOD_RESULT F_CALLBACK windCallback(FMOD_DSP_STATE *dsp_state, float *originalbuffer, float *newbuffer, unsigned int length, int inchannels, int outchannels)
+{
+	// originalbuffer = fmod's original mixbuffer.
+	// newbuffer = the buffer passed from the previous DSP unit.
+	// length = length in samples at this mix time.
+	// userdata = user parameter passed through in FSOUND_DSP_Create.
+	
+	LLWindGen<LLAudioEngine_FMODEX::MIXBUFFERFORMAT> *windgen;
+	FMOD::DSP *thisdsp = (FMOD::DSP *)dsp_state->instance;
+
+	thisdsp->getUserData((void **)&windgen);
+	S32 channels, configwidth, configheight;
+	thisdsp->getInfo(0, 0, &channels, &configwidth, &configheight);
+	
+	windgen->windGenerate((LLAudioEngine_FMODEX::MIXBUFFERFORMAT *)newbuffer, length);
+
+	return FMOD_OK;
+}

indra/llaudio/llaudioengine_fmodex.h

@@ -0,0 +1,131 @@
+/** 
+ * @file audioengine_FMODEX.h
+ * @brief Definition of LLAudioEngine class abstracting the audio
+ * support as a FMOD 3D implementation
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_AUDIOENGINE_FMODEX_H
+#define LL_AUDIOENGINE_FMODEX_H
+
+#include "llaudioengine.h"
+#include "lllistener_fmod.h"
+#include "llwindgen.h"
+
+//Stubs
+class LLAudioStreamManagerFMODEX;
+namespace FMOD
+{
+	class System;
+	class Channel;
+	class Sound;
+	class DSP;
+}
+
+//Interfaces
+class LLAudioEngine_FMODEX : public LLAudioEngine 
+{
+public:
+	LLAudioEngine_FMODEX(bool enable_profiler);
+	virtual ~LLAudioEngine_FMODEX();
+
+	// initialization/startup/shutdown
+	virtual bool init(const S32 num_channels, void *user_data);
+       	virtual std::string getDriverName(bool verbose);
+	virtual void allocateListener();
+
+	virtual void shutdown();
+
+	/*virtual*/ bool initWind();
+	/*virtual*/ void cleanupWind();
+
+	/*virtual*/void updateWind(LLVector3 direction, F32 camera_height_above_water);
+
+	typedef F32 MIXBUFFERFORMAT;
+
+	FMOD::System *getSystem()				const {return mSystem;}
+protected:
+	/*virtual*/ LLAudioBuffer *createBuffer(); // Get a free buffer, or flush an existing one if you have to.
+	/*virtual*/ LLAudioChannel *createChannel(); // Create a new audio channel.
+
+	/*virtual*/ void setInternalGain(F32 gain);
+
+	bool mInited;
+
+	LLWindGen<MIXBUFFERFORMAT> *mWindGen;
+
+	FMOD::DSP *mWindDSP;
+	FMOD::System *mSystem;
+	bool mEnableProfiler;
+};
+
+
+class LLAudioChannelFMODEX : public LLAudioChannel
+{
+public:
+	LLAudioChannelFMODEX(FMOD::System *audioengine);
+	virtual ~LLAudioChannelFMODEX();
+
+protected:
+	/*virtual*/ void play();
+	/*virtual*/ void playSynced(LLAudioChannel *channelp);
+	/*virtual*/ void cleanup();
+	/*virtual*/ bool isPlaying();
+
+	/*virtual*/ bool updateBuffer();
+	/*virtual*/ void update3DPosition();
+	/*virtual*/ void updateLoop();
+
+	void set3DMode(bool use3d);
+protected:
+	FMOD::System *getSystem()	const {return mSystemp;}
+	FMOD::System *mSystemp;
+	FMOD::Channel *mChannelp;
+	S32 mLastSamplePos;
+};
+
+
+class LLAudioBufferFMODEX : public LLAudioBuffer
+{
+public:
+	LLAudioBufferFMODEX(FMOD::System *audioengine);
+	virtual ~LLAudioBufferFMODEX();
+
+	/*virtual*/ bool loadWAV(const std::string& filename);
+	/*virtual*/ U32 getLength();
+	friend class LLAudioChannelFMODEX;
+protected:
+	FMOD::System *getSystem()	const {return mSystemp;}
+	FMOD::System *mSystemp;
+	FMOD::Sound *getSound()		const{ return mSoundp; }
+	FMOD::Sound *mSoundp;
+};
+
+
+#endif // LL_AUDIOENGINE_FMODEX_H

indra/llaudio/lllistener_fmodex.cpp

@@ -0,0 +1,132 @@
+/** 
+ * @file listener_fmod.cpp
+ * @brief implementation of LISTENER class abstracting the audio
+ * support as a FMOD 3D implementation (windows only)
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+#include "llaudioengine.h"
+#include "lllistener_fmodex.h"
+#include "fmod.hpp"
+
+//-----------------------------------------------------------------------
+// constructor
+//-----------------------------------------------------------------------
+LLListener_FMODEX::LLListener_FMODEX(FMOD::System *system)
+{
+	mSystem = system;
+	init();
+}
+
+//-----------------------------------------------------------------------
+LLListener_FMODEX::~LLListener_FMODEX()
+{
+}
+
+//-----------------------------------------------------------------------
+void LLListener_FMODEX::init(void)
+{
+	// do inherited
+	LLListener::init();
+	mDopplerFactor = 1.0f;
+	mRolloffFactor = 1.0f;
+}
+
+//-----------------------------------------------------------------------
+void LLListener_FMODEX::translate(LLVector3 offset)
+{
+	LLListener::translate(offset);
+
+	mSystem->set3DListenerAttributes(0, (FMOD_VECTOR*)mPosition.mV, NULL, (FMOD_VECTOR*)mListenAt.mV, (FMOD_VECTOR*)mListenUp.mV);
+}
+
+//-----------------------------------------------------------------------
+void LLListener_FMODEX::setPosition(LLVector3 pos)
+{
+	LLListener::setPosition(pos);
+
+	mSystem->set3DListenerAttributes(0, (FMOD_VECTOR*)mPosition.mV, NULL, (FMOD_VECTOR*)mListenAt.mV, (FMOD_VECTOR*)mListenUp.mV);
+}
+
+//-----------------------------------------------------------------------
+void LLListener_FMODEX::setVelocity(LLVector3 vel)
+{
+	LLListener::setVelocity(vel);
+
+	mSystem->set3DListenerAttributes(0, NULL, (FMOD_VECTOR*)mVelocity.mV, (FMOD_VECTOR*)mListenAt.mV, (FMOD_VECTOR*)mListenUp.mV);
+}
+
+//-----------------------------------------------------------------------
+void LLListener_FMODEX::orient(LLVector3 up, LLVector3 at)
+{
+	LLListener::orient(up, at);
+
+	// Welcome to the transition between right and left
+	// (coordinate systems, that is)
+	// Leaving the at vector alone results in a L/R reversal
+	// since DX is left-handed and we (LL, OpenGL, OpenAL) are right-handed
+	at = -at;
+
+	mSystem->set3DListenerAttributes(0, NULL, NULL, (FMOD_VECTOR*)at.mV, (FMOD_VECTOR*)up.mV);
+}
+
+//-----------------------------------------------------------------------
+void LLListener_FMODEX::commitDeferredChanges()
+{
+	mSystem->update();
+}
+
+
+void LLListener_FMODEX::setRolloffFactor(F32 factor)
+{
+	mRolloffFactor = factor;
+	mSystem->set3DSettings(mDopplerFactor, 1.f, mRolloffFactor);
+}
+
+
+F32 LLListener_FMODEX::getRolloffFactor()
+{
+	return mRolloffFactor;
+}
+
+
+void LLListener_FMODEX::setDopplerFactor(F32 factor)
+{
+	mDopplerFactor = factor;
+	mSystem->set3DSettings(mDopplerFactor, 1.f, mRolloffFactor);
+}
+
+
+F32 LLListener_FMODEX::getDopplerFactor()
+{
+	return mDopplerFactor;
+}
+
+

indra/llaudio/lllistener_fmodex.h

@@ -1,7 +1,7 @@
 /** 
- * @file llfloaterbeacons.h
+ * @file listener_fmod.h
- * @brief Front-end to LLPipeline controls for highlighting various kinds of objects.
+ * @brief Description of LISTENER class abstracting the audio support
- * @author Coco 
+ * as an FMOD 3D implementation (windows and Linux)
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
@@ -31,27 +31,41 @@
  * $/LicenseInfo$
  */
 
-#ifndef LL_LLFLOATERDICKDONGS_H
+#ifndef LL_LISTENER_FMODEX_H
-#define LL_LLFLOATERDICKDONGS_H
+#define LL_LISTENER_FMODEX_H
 
-#include "llfloater.h"
+#include "lllistener.h"
 
-class LLFloaterDickDongs : public LLFloater, public LLFloaterSingleton<LLFloaterDickDongs>
+//Stubs
+namespace FMOD
 {
-	friend class LLUISingleton<LLFloaterDickDongs, VisibilityPolicy<LLFloater> >;
+	class System;
-	
+}
-public:
-	// /*virtual*/ BOOL postBuild();
-	
-	// Needed to make the floater visibility toggle the beacons.
-	// Too bad we can't just add control_name="BeaconAlwaysOn" to the XML.
-	/*virtual*/ void open();
-	/*virtual*/ void close(bool app_quitting);
 
-private:
+//Interfaces
-	LLFloaterDickDongs(const LLSD& seed);
+class LLListener_FMODEX : public LLListener
+{
+ public:  
+	LLListener_FMODEX(FMOD::System *system);
+	virtual ~LLListener_FMODEX();
+	virtual void init();  
 
-	//static void onClickUICheck(LLUICtrl *ctrl, void* data);
+	virtual void translate(LLVector3 offset);
+	virtual void setPosition(LLVector3 pos);
+	virtual void setVelocity(LLVector3 vel);
+	virtual void orient(LLVector3 up, LLVector3 at);
+	virtual void commitDeferredChanges();
+
+	virtual void setDopplerFactor(F32 factor);
+	virtual F32 getDopplerFactor();
+	virtual void setRolloffFactor(F32 factor);
+	virtual F32 getRolloffFactor();
+ protected:
+	 FMOD::System *mSystem;
+	 F32 mDopplerFactor;
+	 F32 mRolloffFactor;
 };
 
 #endif
+
+

indra/llaudio/llstreamingaudio.h

@@ -36,6 +36,8 @@
 
 #include "stdtypes.h" // from llcommon
 
+class LLSD;
+
 // Entirely abstract.  Based exactly on the historic API.
 class LLStreamingAudioInterface
 {
@@ -51,6 +53,11 @@ class LLStreamingAudioInterface
 	virtual void setGain(F32 vol) = 0;
 	virtual F32 getGain() = 0;
 	virtual std::string getURL() = 0;
+
+	virtual bool supportsMetaData() = 0;
+	virtual const LLSD *getMetaData() = 0;
+	virtual bool supportsWaveData() = 0;
+	virtual bool getWaveData(float* arr, S32 count, S32 stride = 1) = 0;
 };
 
 #endif // LL_STREAMINGAUDIO_H

indra/llaudio/llstreamingaudio_fmod.cpp

@@ -51,6 +51,8 @@ public:
 	const std::string& getURL() 	{ return mInternetStreamURL; }
 
 	int getOpenState();
+
+	FSOUND_STREAM* getStream()		{ return mInternetStream; }
 protected:
 	FSOUND_STREAM* mInternetStream;
 	bool mReady;
@@ -66,7 +68,8 @@ protected:
 LLStreamingAudio_FMOD::LLStreamingAudio_FMOD() :
 	mCurrentInternetStreamp(NULL),
 	mFMODInternetStreamChannel(-1),
-	mGain(1.0f)
+	mGain(1.0f),
+	mMetaData(NULL)
 {
 	// Number of milliseconds of audio to buffer for the audio card.
 	// Must be larger than the usual Second Life frame stutter time.
@@ -87,6 +90,17 @@ LLStreamingAudio_FMOD::~LLStreamingAudio_FMOD()
 	// nothing interesting/safe to do.
 }
 
+signed char F_CALLBACKAPI MetaDataCallback(char *name, char *value, void *userdata)
+{
+	std::string szName(name);
+	if(szName == "TITLE" || szName=="TIT2" || szName=="Title")
+		(*(LLSD*)userdata)["TITLE"] = value;
+	if(szName == "ARTIST" || szName=="TPE1" || szName =="WM/AlbumTitle")
+		(*(LLSD*)userdata)["ARTIST"] = value;
+	else
+		(*(LLSD*)userdata)[std::string(name)] = value;
+	return true;
+}
 
 void LLStreamingAudio_FMOD::start(const std::string& url)
 {
@@ -104,6 +118,10 @@ void LLStreamingAudio_FMOD::start(const std::string& url)
 		llinfos << "Starting internet stream: " << url << llendl;
 		mCurrentInternetStreamp = new LLAudioStreamManagerFMOD(url);
 		mURL = url;
+		if(mCurrentInternetStreamp->getStream())
+		{
+			mMetaData = new LLSD;
+		}
 	}
 	else
 	{
@@ -154,6 +172,10 @@ void LLStreamingAudio_FMOD::update()
 				// Reset volume to previously set volume
 				setGain(getGain());
 				FSOUND_SetPaused(mFMODInternetStreamChannel, false);
+				if(mCurrentInternetStreamp->getStream() && mMetaData)
+				{
+					FSOUND_Stream_Net_SetMetadataCallback(mCurrentInternetStreamp->getStream(),&MetaDataCallback, mMetaData);
+				}
 			}
 		}
 	}
@@ -184,11 +206,17 @@ void LLStreamingAudio_FMOD::update()
 		// buffering
 		break;
 	}
-
 }
 
 void LLStreamingAudio_FMOD::stop()
 {
+	if(mMetaData)
+	{
+		if(mCurrentInternetStreamp && mCurrentInternetStreamp->getStream())
+			FSOUND_Stream_Net_SetMetadataCallback(mCurrentInternetStreamp->getStream(),NULL,NULL);
+		delete mMetaData;
+		mMetaData = NULL;
+	}
 	if (mFMODInternetStreamChannel != -1)
 	{
 		FSOUND_SetPaused(mFMODInternetStreamChannel, true);

indra/llaudio/llstreamingaudio_fmod.h

@@ -55,6 +55,10 @@ class LLStreamingAudio_FMOD : public LLStreamingAudioInterface
 	/*virtual*/ F32 getGain();
 	/*virtual*/ std::string getURL();
 
+	/*virtual*/ bool supportsMetaData(){return true;}
+	/*virtual*/ const LLSD *getMetaData(){return mMetaData;}	//return NULL if not playing.
+	/*virtual*/ bool supportsWaveData(){return false;}
+	/*virtual*/ bool getWaveData(float* arr, S32 count, S32 stride = 1){return false;}
 private:
 	LLAudioStreamManagerFMOD *mCurrentInternetStreamp;
 	int mFMODInternetStreamChannel;
@@ -62,6 +66,8 @@ private:
 
 	std::string mURL;
 	F32 mGain;
+
+	LLSD *mMetaData;
 };
 
 

indra/llaudio/llstreamingaudio_fmodex.cpp

@@ -0,0 +1,450 @@
+/** 
+ * @file streamingaudio_fmod.cpp
+ * @brief LLStreamingAudio_FMODEX implementation
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 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 "linden_common.h"
+
+#include "llmath.h"
+
+#include "fmod.hpp"
+#include "fmod_errors.h"
+
+#include "llstreamingaudio_fmodex.h"
+
+
+class LLAudioStreamManagerFMODEX
+{
+public:
+	LLAudioStreamManagerFMODEX(FMOD::System *system, const std::string& url);
+	FMOD::Channel* startStream();
+	bool stopStream(); // Returns true if the stream was successfully stopped.
+	bool ready();
+
+	const std::string& getURL() 	{ return mInternetStreamURL; }
+
+	FMOD_OPENSTATE getOpenState();
+protected:
+	FMOD::System* mSystem;
+	FMOD::Channel* mStreamChannel;
+	FMOD::Sound* mInternetStream;
+	bool mReady;
+
+	std::string mInternetStreamURL;
+};
+
+
+
+//---------------------------------------------------------------------------
+// Internet Streaming
+//---------------------------------------------------------------------------
+LLStreamingAudio_FMODEX::LLStreamingAudio_FMODEX(FMOD::System *system) :
+	mSystem(system),
+	mCurrentInternetStreamp(NULL),
+	mFMODInternetStreamChannelp(NULL),
+	mGain(1.0f),
+	mMetaData(NULL)
+{
+	// Number of milliseconds of audio to buffer for the audio card.
+	// Must be larger than the usual Second Life frame stutter time.
+	const U32 buffer_seconds = 5;		//sec
+	const U32 estimated_bitrate = 128;	//kbit/sec
+	mSystem->setStreamBufferSize(estimated_bitrate * buffer_seconds * 128/*bytes/kbit*/, FMOD_TIMEUNIT_RAWBYTES);
+
+	// Here's where we set the size of the network buffer and some buffering 
+	// parameters.  In this case we want a network buffer of 16k, we want it 
+	// to prebuffer 40% of that when we first connect, and we want it 
+	// to rebuffer 80% of that whenever we encounter a buffer underrun.
+
+	// Leave the net buffer properties at the default.
+	//FSOUND_Stream_Net_SetBufferProperties(20000, 40, 80);
+}
+
+
+LLStreamingAudio_FMODEX::~LLStreamingAudio_FMODEX()
+{
+	// nothing interesting/safe to do.
+}
+
+
+void LLStreamingAudio_FMODEX::start(const std::string& url)
+{
+	//if (!mInited)
+	//{
+	//	llwarns << "startInternetStream before audio initialized" << llendl;
+	//	return;
+	//}
+
+	// "stop" stream but don't clear url, etc. in case url == mInternetStreamURL
+	stop();
+
+	if (!url.empty())
+	{
+		llinfos << "Starting internet stream: " << url << llendl;
+		mCurrentInternetStreamp = new LLAudioStreamManagerFMODEX(mSystem,url);
+		mURL = url;
+		mMetaData = new LLSD;
+	}
+	else
+	{
+		llinfos << "Set internet stream to null" << llendl;
+		mURL.clear();
+	}
+}
+
+
+void LLStreamingAudio_FMODEX::update()
+{
+	// Kill dead internet streams, if possible
+	std::list<LLAudioStreamManagerFMODEX *>::iterator iter;
+	for (iter = mDeadStreams.begin(); iter != mDeadStreams.end();)
+	{
+		LLAudioStreamManagerFMODEX *streamp = *iter;
+		if (streamp->stopStream())
+		{
+			llinfos << "Closed dead stream" << llendl;
+			delete streamp;
+			mDeadStreams.erase(iter++);
+		}
+		else
+		{
+			iter++;
+		}
+	}
+
+	// Don't do anything if there are no streams playing
+	if (!mCurrentInternetStreamp)
+	{
+		return;
+	}
+
+	FMOD_OPENSTATE open_state = mCurrentInternetStreamp->getOpenState();
+
+	if (open_state == FMOD_OPENSTATE_READY)
+	{
+		// Stream is live
+
+		// start the stream if it's ready
+		if (!mFMODInternetStreamChannelp &&
+			(mFMODInternetStreamChannelp = mCurrentInternetStreamp->startStream()))
+		{
+			// Reset volume to previously set volume
+			setGain(getGain());
+			mFMODInternetStreamChannelp->setPaused(false);
+		}
+	}
+	else if(open_state == FMOD_OPENSTATE_ERROR)
+	{
+		stop();
+		return;
+	}
+
+	if(mFMODInternetStreamChannelp)
+	{
+		if(!mMetaData)
+			mMetaData = new LLSD;
+
+		FMOD::Sound *sound = NULL;
+		
+		if(mFMODInternetStreamChannelp->getCurrentSound(&sound) == FMOD_OK && sound)
+		{
+			FMOD_TAG tag;
+			S32 tagcount, dirtytagcount;
+			if(sound->getNumTags(&tagcount, &dirtytagcount) == FMOD_OK && dirtytagcount)
+			{
+				mMetaData->clear();
+
+				for(S32 i = 0; i < tagcount; ++i)
+				{
+					if(sound->getTag(NULL, i, &tag)!=FMOD_OK)
+						continue;
+					std::string name = tag.name;
+					switch(tag.type)	//Crappy tag translate table.
+					{
+					case(FMOD_TAGTYPE_ID3V2):
+						if(name == "TIT2") name = "TITLE";
+						else if(name == "TPE1") name = "ARTIST";
+						break;
+					case(FMOD_TAGTYPE_ASF):
+						if(name == "Title") name = "TITLE";
+						else if(name == "WM/AlbumArtist") name = "ARTIST";
+						break;
+					default:
+						break;
+					}
+					switch(tag.datatype)
+					{
+						case(FMOD_TAGDATATYPE_INT):
+							(*mMetaData)[name]=*(LLSD::Integer*)(tag.data);
+							llinfos << tag.name << ": " << *(int*)(tag.data) << llendl;
+							break;
+						case(FMOD_TAGDATATYPE_FLOAT):
+							(*mMetaData)[name]=*(LLSD::Float*)(tag.data);
+							llinfos << tag.name << ": " << *(float*)(tag.data) << llendl;
+							break;
+						case(FMOD_TAGDATATYPE_STRING):
+						{
+							std::string out = rawstr_to_utf8(std::string((char*)tag.data,tag.datalen));
+							(*mMetaData)[name]=out;
+							llinfos << tag.name << ": " << out << llendl;
+						}
+							break;
+						case(FMOD_TAGDATATYPE_STRING_UTF16):
+						{
+							std::string out((char*)tag.data,tag.datalen);
+							(*mMetaData)[std::string(tag.name)]=out;
+							llinfos << tag.name << ": " << out << llendl;
+						}
+							break;
+						case(FMOD_TAGDATATYPE_STRING_UTF16BE):
+						{
+							std::string out((char*)tag.data,tag.datalen);
+							U16* buf = (U16*)out.c_str();
+							for(U32 j = 0; j < out.size()/2; ++j)
+								(((buf[j] & 0xff)<<8) | ((buf[j] & 0xff00)>>8));
+							(*mMetaData)[std::string(tag.name)]=out;
+							llinfos << tag.name << ": " << out << llendl;
+						}
+						default:
+							break;
+					}
+				}
+			}
+		}
+	}
+}
+
+void LLStreamingAudio_FMODEX::stop()
+{
+	if(mMetaData)
+	{
+		delete mMetaData;
+		mMetaData = NULL;
+	}
+	if (mFMODInternetStreamChannelp)
+	{
+		mFMODInternetStreamChannelp->setPaused(true);
+		mFMODInternetStreamChannelp->setPriority(0);
+		mFMODInternetStreamChannelp = NULL;
+	}
+
+	if (mCurrentInternetStreamp)
+	{
+		llinfos << "Stopping internet stream: " << mCurrentInternetStreamp->getURL() << llendl;
+		if (mCurrentInternetStreamp->stopStream())
+		{
+			delete mCurrentInternetStreamp;
+		}
+		else
+		{
+			llwarns << "Pushing stream to dead list: " << mCurrentInternetStreamp->getURL() << llendl;
+			mDeadStreams.push_back(mCurrentInternetStreamp);
+		}
+		mCurrentInternetStreamp = NULL;
+		//mURL.clear();
+	}
+}
+
+void LLStreamingAudio_FMODEX::pause(int pauseopt)
+{
+	if (pauseopt < 0)
+	{
+		pauseopt = mCurrentInternetStreamp ? 1 : 0;
+	}
+
+	if (pauseopt)
+	{
+		if (mCurrentInternetStreamp)
+		{
+			stop();
+		}
+	}
+	else
+	{
+		start(getURL());
+	}
+}
+
+
+// A stream is "playing" if it has been requested to start.  That
+// doesn't necessarily mean audio is coming out of the speakers.
+int LLStreamingAudio_FMODEX::isPlaying()
+{
+	if (mCurrentInternetStreamp)
+	{
+		return 1; // Active and playing
+	}
+	else if (!mURL.empty())
+	{
+		return 2; // "Paused"
+	}
+	else
+	{
+		return 0;
+	}
+}
+
+
+F32 LLStreamingAudio_FMODEX::getGain()
+{
+	return mGain;
+}
+
+
+std::string LLStreamingAudio_FMODEX::getURL()
+{
+	return mURL;
+}
+
+
+void LLStreamingAudio_FMODEX::setGain(F32 vol)
+{
+	mGain = vol;
+
+	if (mFMODInternetStreamChannelp)
+	{
+		vol = llclamp(vol * vol, 0.f, 1.f);	//should vol be squared here?
+
+		mFMODInternetStreamChannelp->setVolume(vol);
+	}
+}
+
+/*virtual*/ bool LLStreamingAudio_FMODEX::getWaveData(float* arr, S32 count, S32 stride/*=1*/)
+{
+	if(!mFMODInternetStreamChannelp || !mCurrentInternetStreamp)
+		return false;
+
+	static std::vector<float> local_array(count);	//Have to have an extra buffer to mix channels. Bleh.
+	if(count > (S32)local_array.size())	//Expand the array if needed. Try to minimize allocation calls, so don't ever shrink.
+		local_array.resize(count);
+
+	if(	mFMODInternetStreamChannelp->getWaveData(&local_array[0],count,0) == FMOD_OK &&
+		mFMODInternetStreamChannelp->getWaveData(&arr[0],count,1) == FMOD_OK )
+	{
+		for(S32 i = count-1;i>=0;i-=stride)
+		{
+			arr[i] += local_array[i];
+			arr[i] *= .5f;
+		}
+		return true;
+	}
+	return false;
+}
+
+///////////////////////////////////////////////////////
+// manager of possibly-multiple internet audio streams
+
+LLAudioStreamManagerFMODEX::LLAudioStreamManagerFMODEX(FMOD::System *system, const std::string& url) :
+	mSystem(system),
+	mStreamChannel(NULL),
+	mInternetStream(NULL),
+	mReady(false)
+{
+	mInternetStreamURL = url;
+
+	FMOD_CREATESOUNDEXINFO exinfo;
+	memset(&exinfo,0,sizeof(exinfo));
+	exinfo.cbsize = sizeof(exinfo);
+	exinfo.suggestedsoundtype = FMOD_SOUND_TYPE_MPEG;	//Hint to speed up loading.
+
+	FMOD_RESULT result = mSystem->createStream(url.c_str(), FMOD_2D | FMOD_NONBLOCKING | FMOD_IGNORETAGS, &exinfo, &mInternetStream);
+
+	if (result!= FMOD_OK)
+	{
+		llwarns << "Couldn't open fmod stream, error "
+			<< FMOD_ErrorString(result)
+			<< llendl;
+		mReady = false;
+		return;
+	}
+
+	mReady = true;
+}
+
+FMOD::Channel *LLAudioStreamManagerFMODEX::startStream()
+{
+	// We need a live and opened stream before we try and play it.
+	if (!mInternetStream || getOpenState() != FMOD_OPENSTATE_READY)
+	{
+		llwarns << "No internet stream to start playing!" << llendl;
+		return NULL;
+	}
+
+	if(mStreamChannel)
+		return mStreamChannel;	//Already have a channel for this stream.
+
+	mSystem->playSound(FMOD_CHANNEL_FREE, mInternetStream, true, &mStreamChannel);
+	return mStreamChannel;
+}
+
+bool LLAudioStreamManagerFMODEX::stopStream()
+{
+	if (mInternetStream)
+	{
+
+
+		bool close = true;
+		switch (getOpenState())
+		{
+		case FMOD_OPENSTATE_CONNECTING:
+			close = false;
+			break;
+		/*case FSOUND_STREAM_NET_NOTCONNECTED:
+		case FSOUND_STREAM_NET_BUFFERING:
+		case FSOUND_STREAM_NET_READY:
+		case FSOUND_STREAM_NET_ERROR:*/
+		default:
+			close = true;
+		}
+
+		if (close)
+		{
+			mInternetStream->release();
+			mStreamChannel = NULL;
+			mInternetStream = NULL;
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	else
+	{
+		return true;
+	}
+}
+
+FMOD_OPENSTATE LLAudioStreamManagerFMODEX::getOpenState()
+{
+	FMOD_OPENSTATE state;
+	mInternetStream->getOpenState(&state,NULL,NULL,NULL);
+	return state;
+}

indra/llaudio/llstreamingaudio_fmodex.h

@@ -0,0 +1,83 @@
+/** 
+ * @file streamingaudio_fmod.h
+ * @author Tofu Linden
+ * @brief Definition of LLStreamingAudio_FMOD implementation
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_STREAMINGAUDIO_FMOD_H
+#define LL_STREAMINGAUDIO_FMOD_H
+
+#include "stdtypes.h" // from llcommon
+
+#include "llstreamingaudio.h"
+
+//Stubs
+class LLAudioStreamManagerFMODEX;
+namespace FMOD
+{
+	class System;
+	class Channel;
+}
+
+//Interfaces
+class LLStreamingAudio_FMODEX : public LLStreamingAudioInterface
+{
+ public:
+	LLStreamingAudio_FMODEX(FMOD::System *system);
+	/*virtual*/ ~LLStreamingAudio_FMODEX();
+
+	/*virtual*/ void start(const std::string& url);
+	/*virtual*/ void stop();
+	/*virtual*/ void pause(int pause);
+	/*virtual*/ void update();
+	/*virtual*/ int isPlaying();
+	/*virtual*/ void setGain(F32 vol);
+	/*virtual*/ F32 getGain();
+	/*virtual*/ std::string getURL();
+
+	/*virtual*/ bool supportsMetaData(){return true;}
+	/*virtual*/ const LLSD *getMetaData(){return mMetaData;}	//return NULL if not playing.
+	/*virtual*/ bool supportsWaveData(){return true;}
+	/*virtual*/ bool getWaveData(float* arr, S32 count, S32 stride = 1);
+private:
+	FMOD::System *mSystem;
+
+	LLAudioStreamManagerFMODEX *mCurrentInternetStreamp;
+	FMOD::Channel *mFMODInternetStreamChannelp;
+	std::list<LLAudioStreamManagerFMODEX *> mDeadStreams;
+
+	std::string mURL;
+	F32 mGain;
+
+	LLSD *mMetaData;
+};
+
+
+#endif // LL_STREAMINGAUDIO_FMOD_H

indra/llaudio/llvorbisdecode.cpp

@@ -133,10 +133,10 @@ BOOL decode_vorbis_file(LLVFS *vfs, const LLUUID &in_uuid, char *out_fname)
 		return(FALSE);
 	}
 
-	//**********************************
+	// **********************************
 	LLAPRFile outfile ;
 	outfile.open(out_fname,LL_APR_WPB);
-	//**********************************
+	// **********************************
 	if (!outfile.getFileHandle())
 	{
 		llwarning("unable to open vorbis destination file for writing",0);
@@ -308,9 +308,9 @@ BOOL decode_vorbis_file(LLVFS *vfs, const LLUUID &in_uuid, char *out_fname)
 	
 	outfile.seek(SEEK_END,-fade_length*2); 
 	outfile.write(pcmout,2*fade_length);  //write back xfaded last 16 samples
-	//*******************
+	// *******************
 	outfile.close();
-	//*******************
+	// *******************
 	
 	if ((36 == data_length) || (!(eof)))
 	{

indra/llaudio/llvorbisencode.cpp

@@ -87,10 +87,10 @@ S32 check_for_invalid_wav_formats(const std::string& in_fname, std::string& erro
 
 	error_msg.clear();
 
-	//********************************
+	// ********************************
 	LLAPRFile infile ;
-    infile.open(in_fname,LL_APR_RB, LLAPRFile::global);
+    infile.open(in_fname,LL_APR_RB);
-	//********************************
+	// ********************************
 	if (!infile.getFileHandle())
 	{
 		error_msg = "CannotUploadSoundFile";
@@ -159,9 +159,9 @@ S32 check_for_invalid_wav_formats(const std::string& in_fname, std::string& erro
 		file_pos += (chunk_length + 8);
 		chunk_length = 0;
 	} 
-	//****************
+	// ****************
 	infile.close();
-	//****************
+	// ****************
 
 	if (!uncompressed_pcm)
 	{	
@@ -240,7 +240,7 @@ S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname
 	S32 data_left = 0;
 
 	LLAPRFile infile ;
-	infile.open(in_fname,LL_APR_RB, LLAPRFile::global);
+	infile.open(in_fname,LL_APR_RB);
 	if (!infile.getFileHandle())
 	{
 		llwarns << "Couldn't open temporary ogg file for writing: " << in_fname
@@ -249,7 +249,7 @@ S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname
 	}
 
 	LLAPRFile outfile ;
-	outfile.open(out_fname,LL_APR_WPB, LLAPRFile::global);
+	outfile.open(out_fname,LL_APR_WPB);
 	if (!outfile.getFileHandle())
 	{
 		llwarns << "Couldn't open upload sound file for reading: " << in_fname

indra/llaudio/llwindgen.h

@@ -33,6 +33,7 @@
 #define WINDGEN_H
 
 #include "llcommon.h"
+#include "llrand.h"
 
 template <class MIXBUFFERFORMAT_T>
 class LLWindGen
@@ -60,7 +61,9 @@ public:
 	}
 
 	const U32 getInputSamplingRate() { return mInputSamplingRate; }
-	
+	const F32 getNextSample();
+	const F32 getClampedSample(bool clamp, F32 sample);
+
 	// newbuffer = the buffer passed from the previous DSP unit.
 	// numsamples = length in samples-per-channel at this mix time.
 	// NOTE: generates L/R interleaved stereo
@@ -95,7 +98,7 @@ public:
 			
 			// Start with white noise
 			// This expression is fragile, rearrange it and it will break!
-			next_sample = (F32)rand() * (1.0f / (F32)(RAND_MAX / (U16_MAX / 8))) + (F32)(S16_MIN / 8);
+			next_sample = getNextSample();
 			
 			// Apply a pinking filter
 			// Magic numbers taken from PKE method at http://www.firstpr.com.au/dsp/pink-noise/
@@ -132,23 +135,13 @@ public:
 			for (U8 i=mSubSamples; i && numsamples; --i, --numsamples) 
 			{
 				mLastSample = mLastSample + delta;
-				S32	sample_right = (S32)(mLastSample * mCurrentPanGainR);
+				MIXBUFFERFORMAT_T	sample_right = (MIXBUFFERFORMAT_T)getClampedSample(clip, mLastSample * mCurrentPanGainR);
-				S32	sample_left = (S32)mLastSample - sample_right;
+				MIXBUFFERFORMAT_T	sample_left = (MIXBUFFERFORMAT_T)getClampedSample(clip, mLastSample - (F32)sample_right);
 				
-				if (!clip)
+				*cursamplep = sample_left;
-				{
+				++cursamplep;
-					*cursamplep = (MIXBUFFERFORMAT_T)sample_left;
+				*cursamplep = sample_right;
-					++cursamplep;
+				++cursamplep;
-					*cursamplep = (MIXBUFFERFORMAT_T)sample_right;
-					++cursamplep;
-				}
-				else
-				{
-					*cursamplep = (MIXBUFFERFORMAT_T)llclamp(sample_left, (S32)S16_MIN, (S32)S16_MAX);
-					++cursamplep;
-					*cursamplep = (MIXBUFFERFORMAT_T)llclamp(sample_right, (S32)S16_MIN, (S32)S16_MAX);
-					++cursamplep;
-				}
 			}
 		}
 		
@@ -179,4 +172,9 @@ private:
 	F32 mLastSample;
 };
 
+template<class T> inline const F32 LLWindGen<T>::getNextSample() { return (F32)rand() * (1.0f / (F32)(RAND_MAX / (U16_MAX / 8))) + (F32)(S16_MIN / 8); }
+template<> inline const F32 LLWindGen<F32>::getNextSample() { return ll_frand()-.5f; }
+template<class T> inline const F32 LLWindGen<T>::getClampedSample(bool clamp, F32 sample) { return clamp ? (F32)llclamp((S32)sample,(S32)S16_MIN,(S32)S16_MAX) : sample; }
+template<> inline const F32 LLWindGen<F32>::getClampedSample(bool clamp, F32 sample) { return sample; }
+
 #endif

indra/llcharacter/llbvhloader.cpp

@@ -48,10 +48,10 @@ using namespace std;
 
 #define INCHES_TO_METERS 0.02540005f
 
-const F32 POSITION_KEYFRAME_THRESHOLD = 0.03f;
+const F32 POSITION_KEYFRAME_THRESHOLD_SQUARED = 0.03f * 0.03f;
 const F32 ROTATION_KEYFRAME_THRESHOLD = 0.01f;
 
-const F32 POSITION_MOTION_THRESHOLD = 0.001f;
+const F32 POSITION_MOTION_THRESHOLD_SQUARED = 0.001f * 0.001f;
 const F32 ROTATION_MOTION_THRESHOLD = 0.001f;
 
 char gInFile[1024];		/* Flawfinder: ignore */
@@ -225,8 +225,7 @@ ELoadStatus LLBVHLoader::loadTranslationTable(const char *fileName)
 	//--------------------------------------------------------------------
 	std::string path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,fileName);
 
-	LLAPRFile infile ;
+	LLAPRFile infile(path, LL_APR_R);
-	infile.open(path, LL_APR_R, LLAPRFile::global);
 	apr_file_t *fp = infile.getFileHandle();
 	if (!fp)
 		return E_ST_NO_XLT_FILE;
@@ -1202,7 +1201,7 @@ void LLBVHLoader::optimize()
 				if (ki_prev == ki_last_good_pos)
 				{
 					joint->mNumPosKeys++;
-					if (dist_vec(LLVector3(ki_prev->mPos), first_frame_pos) > POSITION_MOTION_THRESHOLD)
+					if (dist_vec_squared(LLVector3(ki_prev->mPos), first_frame_pos) > POSITION_MOTION_THRESHOLD_SQUARED)
 					{
 						pos_changed = TRUE;
 					}
@@ -1215,12 +1214,12 @@ void LLBVHLoader::optimize()
 					LLVector3 current_pos(ki->mPos);
 					LLVector3 interp_pos = lerp(current_pos, last_good_pos, 1.f / (F32)numPosFramesConsidered);
 
-					if (dist_vec(current_pos, first_frame_pos) > POSITION_MOTION_THRESHOLD)
+					if (dist_vec_squared(current_pos, first_frame_pos) > POSITION_MOTION_THRESHOLD_SQUARED)
 					{
 						pos_changed = TRUE;
 					}
 
-					if (dist_vec(interp_pos, test_pos) < POSITION_KEYFRAME_THRESHOLD)
+					if (dist_vec_squared(interp_pos, test_pos) < POSITION_KEYFRAME_THRESHOLD_SQUARED)
 					{
 						ki_prev->mIgnorePos = TRUE;
 						numPosFramesConsidered++;

indra/llcharacter/llcharacter.cpp

@@ -45,7 +45,7 @@
 LLStringTable LLCharacter::sVisualParamNames(1024);
 
 std::vector< LLCharacter* > LLCharacter::sInstances;
-
+BOOL LLCharacter::sAllowInstancesChange = TRUE ;
 
 //-----------------------------------------------------------------------------
 // LLCharacter()
@@ -59,8 +59,10 @@ LLCharacter::LLCharacter()
 	mSkeletonSerialNum( 0 ),
 	mInAppearance( false )
 {
-	mMotionController.setCharacter( this );
+	llassert_always(sAllowInstancesChange) ;
 	sInstances.push_back(this);
+
+	mMotionController.setCharacter( this );
 	mPauseRequest = new LLPauseRequestHandle();
 }
 
@@ -77,11 +79,22 @@ LLCharacter::~LLCharacter()
 	{
 		delete param;
 	}
-	std::vector<LLCharacter*>::iterator iter = std::find(sInstances.begin(), sInstances.end(), this);
+
-	if (iter != sInstances.end())
+	U32 i ;
+	U32 size = sInstances.size() ;
+	for(i = 0 ; i < size ; i++)
 	{
-		sInstances.erase(iter);
+		if(sInstances[i] == this)
+		{
+			break ;
+		}
 	}
+
+	llassert_always(i < size) ;
+
+	llassert_always(sAllowInstancesChange) ;
+	sInstances[i] = sInstances[size - 1] ;
+	sInstances.pop_back() ;
 }
 
 
@@ -182,15 +195,19 @@ void LLCharacter::requestStopMotion( LLMotion* motion)
 //-----------------------------------------------------------------------------
 // updateMotions()
 //-----------------------------------------------------------------------------
+static LLFastTimer::DeclareTimer FTM_UPDATE_ANIMATION("Update Animation");
+static LLFastTimer::DeclareTimer FTM_UPDATE_HIDDEN_ANIMATION("Update Hidden Anim");
+
 void LLCharacter::updateMotions(e_update_t update_type)
 {
-	LLFastTimer t(LLFastTimer::FTM_UPDATE_ANIMATION);
 	if (update_type == HIDDEN_UPDATE)
 	{
+		LLFastTimer t(FTM_UPDATE_HIDDEN_ANIMATION);
 		mMotionController.updateMotionsMinimal();
 	}
 	else
 	{
+		LLFastTimer t(FTM_UPDATE_ANIMATION);
 		// unpause if the number of outstanding pause requests has dropped to the initial one
 		if (mMotionController.isPaused() && mPauseRequest->getNumRefs() == 1)
 		{

indra/llcharacter/llcharacter.h

@@ -42,7 +42,7 @@
 #include "llmotioncontroller.h"
 #include "llvisualparam.h"
 #include "string_table.h"
-#include "llmemory.h"
+#include "llpointer.h"
 #include "llthread.h"
 
 class LLPolyMesh;
@@ -246,9 +246,9 @@ public:
 		return rtn;
 	}
 
-	LLVisualParam*	getVisualParam(S32 id)
+	LLVisualParam*	getVisualParam(S32 id) const
 	{
-		visual_param_index_map_t::iterator iter = mVisualParamIndexMap.find(id);
+		visual_param_index_map_t::const_iterator iter = mVisualParamIndexMap.find(id);
 		return (iter == mVisualParamIndexMap.end()) ? 0 : iter->second;
 	}
 	S32 getVisualParamID(LLVisualParam *id)
@@ -261,7 +261,7 @@ public:
 		}
 		return 0;
 	}
-	S32				getVisualParamCount() { return (S32)mVisualParamIndexMap.size(); }
+	S32				getVisualParamCount() const { return (S32)mVisualParamIndexMap.size(); }
 	LLVisualParam*	getVisualParam(const char *name);
 
 
@@ -279,6 +279,7 @@ public:
 	void			setSkeletonSerialNum( U32 num )	{ mSkeletonSerialNum = num; }
 
 	static std::vector< LLCharacter* > sInstances;
+	static BOOL sAllowInstancesChange ; //debug use
 
 protected:
 	LLMotionController	mMotionController;

indra/llcharacter/lljoint.cpp

@@ -56,6 +56,7 @@ LLJoint::LLJoint()
 	mUpdateXform = TRUE;
 	mJointNum = -1;
 	touch();
+	mResetAfterRestoreOldXform = false;
 }
 
 
@@ -239,6 +240,41 @@ void LLJoint::setPosition( const LLVector3& pos )
 	}
 }
 
+//--------------------------------------------------------------------
+// setPosition()
+//--------------------------------------------------------------------
+void LLJoint::setDefaultFromCurrentXform( void )
+{
+	mDefaultXform = mXform;
+	touch(MATRIX_DIRTY | POSITION_DIRTY);
+	
+}
+
+//--------------------------------------------------------------------
+// storeCurrentXform()
+//--------------------------------------------------------------------
+void LLJoint::storeCurrentXform( const LLVector3& pos )
+{
+	mOldXform = mXform;
+	mResetAfterRestoreOldXform = true;
+	setPosition( pos );
+}
+//--------------------------------------------------------------------
+// restoreOldXform()
+//--------------------------------------------------------------------
+void LLJoint::restoreOldXform( void )
+{
+	mResetAfterRestoreOldXform = false;
+	mXform = mOldXform;
+}
+//--------------------------------------------------------------------
+// restoreOldXform()
+//--------------------------------------------------------------------
+void LLJoint::restoreToDefaultXform( void )
+{	
+	mXform = mDefaultXform;
+	setPosition( mXform.getPosition() );	
+}
 
 //--------------------------------------------------------------------
 // getWorldPosition()