From 39db370002f241ca96c7e6d76c08ae8950bab920 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 26 Aug 2010 16:40:39 -0500
Subject: Added faad2 license info.

---
 linden/LICENSE-libraries.txt                       | 31 ++++++++++++++++++++++
 .../skins/default/xui/en-us/floater_about.xml      |  3 ++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/linden/LICENSE-libraries.txt b/linden/LICENSE-libraries.txt
index c00ff61..b0b5258 100644
--- a/linden/LICENSE-libraries.txt
+++ b/linden/LICENSE-libraries.txt
@@ -294,6 +294,37 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+=============
+FAAD2 License
+=============
+
+FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
+Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
+
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+Any non-GPL usage of this software or parts of this software is strictly
+forbidden.
+
+The "appropriate copyright message" mentioned in section 2c of the GPLv2
+must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
+
+Commercial non-GPL licensing of this software is possible.
+For more info contact Nero AG through Mpeg4AAClicense@nero.com.
+
+
 ============
 FLAC License
 ============
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index 557c1d7..1370051 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -50,8 +50,9 @@ Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft
   xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
   zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
   google-perftools Copyright (c) 2005, Google Inc.
+  Code from FAAD2 is copyright (c) Nero AG, www.nero.com
 
-  All rights reserved.  See licenses.txt for details.
+  All rights reserved.  See LICENSE-libraries.txt for details.
 
   Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 
-- 
cgit v1.1