svn merge -r 67483:67657 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1

This is "really" the merge of everything that went out in the 1.18.2(0) viewer release.

1 files changed, 178 insertions, 52 deletions

diff --git a/indra/newview/licenses-mac.txt b/indra/newview/licenses-mac.txt
index 24539e52b0..e87d244141 100644
--- a/indra/newview/licenses-mac.txt
+++ b/indra/newview/licenses-mac.txt
@@ -48,58 +48,6 @@ Base32 License
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
 
-==========
-Cg License
-==========
-
-Copyright (c) 2002, NVIDIA Corporation.
-
- 
-
-NVIDIA Corporation("NVIDIA") supplies this software to you in consideration 
-of your agreement to the following terms, and your use, installation, 
-modification or redistribution of this NVIDIA software constitutes 
-acceptance of these terms.  If you do not agree with these terms, please do 
-not use, install, modify or redistribute this NVIDIA software.
-
- 
-
-In consideration of your agreement to abide by the following terms, and 
-subject to these terms, NVIDIA grants you a personal, non-exclusive license,
-under NVIDIA's copyrights in this original NVIDIA software (the "NVIDIA 
-Software"), to use, reproduce, modify and redistribute the NVIDIA 
-Software, with or without modifications, in source and/or binary forms; 
-provided that if you redistribute the NVIDIA Software, you must retain the 
-copyright notice of NVIDIA, this notice and the following text and 
-disclaimers in all such redistributions of the NVIDIA Software. Neither the 
-name, trademarks, service marks nor logos of NVIDIA Corporation may be used 
-to endorse or promote products derived from the NVIDIA Software without 
-specific prior written permission from NVIDIA.  Except as expressly stated 
-in this notice, no other rights or licenses express or implied, are granted 
-by NVIDIA herein, including but not limited to any patent rights that may be 
-infringed by your derivative works or by other works in which the NVIDIA 
-Software may be incorporated. No hardware is licensed hereunder. 
-
- 
-
-THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT 
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING 
-WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, 
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR ITS USE AND OPERATION 
-EITHER ALONE OR IN COMBINATION WITH OTHER PRODUCTS.
-
- 
-
-IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL, 
-EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOST 
-PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY OUT OF THE USE, 
-REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE NVIDIA SOFTWARE, 
-HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING 
-NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF NVIDIA HAS BEEN ADVISED 
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 ============
 cURL License
 ============
@@ -525,3 +473,181 @@ 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.
+
+=================
+Vivox SDK License
+=================
+
+RSA Data Security, Inc. MD5 Message-Digest Algorithm 
+
+Audio coding: Polycom¨ 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