25 files changed, 879 insertions, 258 deletions
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 26f37a4..b7d15b5 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -14,12 +14,11 @@ bushing Spatula - VWR-424, VWR-119
 Catherine Pfeffer - VWR-1282
 Dale Glass - VWR-120, VWR-560
 Drewan Keats - VWR-28, VWR-248, VWR-412
-Duckless Vandyke - VWR-383
 Dylan Haskell - VWR-72
 Dzonatas Sol - VWR-198, VWR-878, VWR-1704, VWR-1705, VWR-1729, VWR-975
 Eddy Stryker - VWR-15, VWR-23, VWR-1468
 EponymousDylan Ra - VWR-1465
-Fee Larsson - VWR-1314
+Feep Larsson - VWR-1314
 Fremont Cunningham - VWR-1147
 Gigs Taggart - VWR-71, VWR-326, VWR-1217, VWR-1434
 Ginko Bayliss - VWR-4
diff --git a/linden/indra/llcommon/llversion.h b/linden/indra/llcommon/llversion.h
index 555698d..2fb743f 100644
--- a/linden/indra/llcommon/llversion.h
+++ b/linden/indra/llcommon/llversion.h
@@ -31,7 +31,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 18;
-const S32 LL_VERSION_PATCH = 1;
+const S32 LL_VERSION_PATCH = 2;
-const S32 LL_VERSION_BUILD = 2;
+const S32 LL_VERSION_BUILD = 0;
 #endif
diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index e36503a..4e844c3 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -265,6 +265,7 @@ static void request(
        LLURLRequest *req = new LLURLRequest(method, url);
        req->requestEncoding("");
+    // Insert custom headers is the caller sent any
    if (headers.isMap())
    {
        LLSD::map_const_iterator iter = headers.beginMap();
@@ -273,7 +274,17 @@ static void request(
        for (; iter != end; ++iter)
        {
            std::ostringstream header;
+            //if the header is "Pragma" with no value
+            //the caller intends to force libcurl to drop
+            //the Pragma header it so gratuitously inserts
+            //Before inserting the header, force libcurl
+            //to not use the proxy (read: llurlrequest.cpp)
+            if ((iter->first == "Pragma") && (iter->second.asString() == ""))
+            {
+                req->useProxy(FALSE);
+            }
            header << iter->first << ": " << iter->second.asString() ;
+            llinfos << "header = " << header.str() << llendl;
            req->addHeader(header.str().c_str());
        }
    }
diff --git a/linden/indra/llmessage/llurlrequest.cpp b/linden/indra/llmessage/llurlrequest.cpp
index 1c7648b..00c0577 100644
--- a/linden/indra/llmessage/llurlrequest.cpp
+++ b/linden/indra/llmessage/llurlrequest.cpp
@@ -39,6 +39,7 @@
 #include "llpumpio.h"
 #include "llsd.h"
 #include "llstring.h"
+#include "apr-1/apr_env.h"
 static const U32 HTTP_STATUS_PIPE_ERROR = 499;
@@ -202,6 +203,47 @@ void LLURLRequest::setCallback(LLURLRequestComplete* callback)
        curl_easy_setopt(mDetail->mCurl, CURLOPT_WRITEHEADER, callback);
 }
+// Added to mitigate the effect of libcurl looking
+// for the ALL_PROXY and http_proxy env variables
+// and deciding to insert a Pragma: no-cache
+// header! The only usage of this method at the
+// time of this writing is in llhttpclient.cpp
+// in the request() method, where this method
+// is called with use_proxy = FALSE
+void LLURLRequest::useProxy(bool use_proxy)
+{
+    static char *env_proxy;
+    if (use_proxy && (env_proxy == NULL))
+    {
+        apr_status_t status;
+        apr_pool_t* pool;
+        apr_pool_create(&pool, NULL);
+        status = apr_env_get(&env_proxy, "ALL_PROXY", pool);
+        if (status != APR_SUCCESS)
+        {
+            status = apr_env_get(&env_proxy, "http_proxy", pool);
+        }
+        if (status != APR_SUCCESS)
+        {
+           use_proxy = FALSE;
+        }
+        apr_pool_destroy(pool);
+    }
+    lldebugs << "use_proxy = " << (use_proxy?'Y':'N') << ", env_proxy = " << env_proxy << llendl;
+    if (env_proxy && use_proxy)
+    {
+        curl_easy_setopt(mDetail->mCurl, CURLOPT_PROXY, env_proxy);
+    }
+    else
+    {
+        curl_easy_setopt(mDetail->mCurl, CURLOPT_PROXY, "");
+    }
+}
 // virtual
 LLIOPipe::EStatus LLURLRequest::handleError(
        LLIOPipe::EStatus status,
diff --git a/linden/indra/llmessage/llurlrequest.h b/linden/indra/llmessage/llurlrequest.h
index 9088244..8aa1788 100644
--- a/linden/indra/llmessage/llurlrequest.h
+++ b/linden/indra/llmessage/llurlrequest.h
@@ -174,6 +174,12 @@ public:
        /* @name LLIOPipe virtual implementations
         */
+    /**
+     * @ brief Turn off (or on) the CURLOPT_PROXY header.
+     */
+    void useProxy(bool use_proxy);
 public:
        /** 
         * @brief Give this pipe a chance to handle a generated error
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index aa9b6c0..1b9fdbe 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.18.1.2";
+CFBundleShortVersionString = "Second Life version 1.18.2.0";
-CFBundleGetInfoString = "Second Life version 1.18.1.2, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleGetInfoString = "Second Life version 1.18.2.0, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist
index 91d1849..87087f7 100644
--- a/linden/indra/newview/Info-SecondLife.plist
+++ b/linden/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
                </dict>
        </array>
        <key>CFBundleVersion</key>
-        <string>1.18.1.2</string>
+        <string>1.18.2.0</string>
        <key>CSResourcesFileMapped</key>
        <true/>
 </dict>
diff --git a/linden/indra/newview/licenses-linux.txt b/linden/indra/newview/licenses-linux.txt
index 826e044..795b7cc 100644
--- a/linden/indra/newview/licenses-linux.txt
+++ b/linden/indra/newview/licenses-linux.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
 ============
@@ -640,3 +588,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 
diff --git a/linden/indra/newview/licenses-mac.txt b/linden/indra/newview/licenses-mac.txt
index 24539e5..e87d244 100644
--- a/linden/indra/newview/licenses-mac.txt
+++ b/linden/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 
diff --git a/linden/indra/newview/licenses-solaris.txt b/linden/indra/newview/licenses-solaris.txt
index a0dc048..792330f 100644
--- a/linden/indra/newview/licenses-solaris.txt
+++ b/linden/indra/newview/licenses-solaris.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
 ============
@@ -514,3 +462,181 @@ jloup@gzip.org
 Mark Adler 
 madler@alumni.caltech.edu 
+=================
+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 
diff --git a/linden/indra/newview/licenses-win32.txt b/linden/indra/newview/licenses-win32.txt
index 24539e5..e87d244 100644
--- a/linden/indra/newview/licenses-win32.txt
+++ b/linden/indra/newview/licenses-win32.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 
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index 9798796..38ae97b 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -173,6 +173,7 @@ BOOL LLChatBar::postBuild()
                mInputEditor->setPassDelete(TRUE);
                mInputEditor->setMaxTextLength(1023);
+                mInputEditor->setEnableLineHistory(TRUE);
        }
        mIsBuilt = TRUE;
diff --git a/linden/indra/newview/llfloatervoicewizard.cpp b/linden/indra/newview/llfloatervoicewizard.cpp
index 879cb6d..69c7a9d 100644
--- a/linden/indra/newview/llfloatervoicewizard.cpp
+++ b/linden/indra/newview/llfloatervoicewizard.cpp
@@ -129,16 +129,21 @@ void LLFloaterVoiceWizard::draw()
 void LLFloaterVoiceWizard::onOpen()
 {
-        // put voice client in "tuning" mode
+        if(mDevicePanel)
-        gVoiceClient->tuningStart();
+        {
-        //LLVoiceChannel::suspend();
+                mDevicePanel->onOpen();
+        }
        LLFloater::onOpen();
 }
 void LLFloaterVoiceWizard::onClose(bool app_quitting)
 {
-        gVoiceClient->tuningStop();
+        if(mDevicePanel)
-        //LLVoiceChannel::resume();
+        {
+                mDevicePanel->onClose(app_quitting);
+        }
        LLFloater::onClose(app_quitting);
 }
@@ -221,7 +226,8 @@ LLPanelDeviceSettings::LLPanelDeviceSettings()
        mMicVolume = gSavedSettings.getF32("AudioLevelMic");
        // ask for new device enumeration
-        gVoiceClient->refreshDeviceLists();
+        // now do this in onOpen() instead...
+        //gVoiceClient->refreshDeviceLists();
 }
 LLPanelDeviceSettings::~LLPanelDeviceSettings()
@@ -384,6 +390,22 @@ void LLPanelDeviceSettings::refresh()
        }       
 }
+void LLPanelDeviceSettings::onOpen()
+{
+        mDevicesUpdated = FALSE;
+        // ask for new device enumeration
+        gVoiceClient->refreshDeviceLists();
+        // put voice client in "tuning" mode
+        gVoiceClient->tuningStart();
+}
+void LLPanelDeviceSettings::onClose(bool app_quitting)
+{
+        gVoiceClient->tuningStop();
+}
 //
 // LLFloaterDeviceSettings
 //
@@ -391,22 +413,29 @@ void LLPanelDeviceSettings::refresh()
 LLFloaterDeviceSettings::LLFloaterDeviceSettings(const LLSD& seed) : LLFloater("floater_device_settings"), mDevicePanel(NULL)
 {
        mFactoryMap["device_settings"] = LLCallbackMap(createPanelDeviceSettings, this);
-        gUICtrlFactory->buildFloater(this, "floater_device_settings.xml", &mFactoryMap);
+        // do not automatically open singleton floaters (as result of getInstance())
+        BOOL no_open = FALSE;
+        gUICtrlFactory->buildFloater(this, "floater_device_settings.xml", &mFactoryMap, no_open);
        center();
 }
 void LLFloaterDeviceSettings::onOpen()
 {
-        // put voice client in "tuning" mode
+        if(mDevicePanel)
-        gVoiceClient->tuningStart();
+        {
-        //LLVoiceChannel::suspend();
+                mDevicePanel->onOpen();
+        }
        LLFloater::onOpen();
 }
 void LLFloaterDeviceSettings::onClose(bool app_quitting)
 {
-        gVoiceClient->tuningStop();
+        if(mDevicePanel)
-        //LLVoiceChannel::resume();
+        {
+                mDevicePanel->onClose(app_quitting);
+        }
        setVisible(FALSE);
 }
diff --git a/linden/indra/newview/llfloatervoicewizard.h b/linden/indra/newview/llfloatervoicewizard.h
index bd9ce80..8e8c900 100644
--- a/linden/indra/newview/llfloatervoicewizard.h
+++ b/linden/indra/newview/llfloatervoicewizard.h
@@ -71,6 +71,8 @@ public:
        void apply();
        void cancel();
        void refresh();
+        void onOpen();
+        void onClose(bool app_quitting);
 protected:
        F32 mMicVolume;
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp
index f9c3443..c7f1736 100644
--- a/linden/indra/newview/llhoverview.cpp
+++ b/linden/indra/newview/llhoverview.cpp
@@ -102,7 +102,6 @@ LLHoverView::~LLHoverView()
 {
        // children all deleted by LLView destructor
        mText.deleteAllData();
-        mConnectors.reset();
 }
 EWidgetType LLHoverView::getWidgetType() const
@@ -205,7 +204,6 @@ void LLHoverView::cancelHover()
        // mLastHoverObject = NULL;
        setHoverActive(FALSE);
-        mConnectors.reset();
 }
 void LLHoverView::resetLastHoverObject()
diff --git a/linden/indra/newview/llhoverview.h b/linden/indra/newview/llhoverview.h
index ef93eae..a2b624c 100644
--- a/linden/indra/newview/llhoverview.h
+++ b/linden/indra/newview/llhoverview.h
@@ -105,8 +105,6 @@ protected:
        LLVector3d                                      mHoverLandGlobal;
        LLVector3d                                      mHoverOffset;
-        LLDynamicArrayPtr<LLPointer<LLHUDConnector> > mConnectors;
        BOOL            mTyping;
 public:
diff --git a/linden/indra/newview/llhudmanager.cpp b/linden/indra/newview/llhudmanager.cpp
index 0da2f8e..d06b84b 100644
--- a/linden/indra/newview/llhudmanager.cpp
+++ b/linden/indra/newview/llhudmanager.cpp
@@ -127,8 +127,8 @@ void LLHUDManager::cleanupEffects()
 LLHUDEffect *LLHUDManager::createViewerEffect(const U8 type, BOOL send_to_sim, BOOL originated_here)
 {
-        // Should assert that this is actually an LLHUDEffect
+        // SJB: DO NOT USE addHUDObject!!! Not all LLHUDObjects are LLHUDEffects!
-        LLHUDEffect *hep = (LLHUDEffect *)LLHUDObject::addHUDObject(type);
+        LLHUDEffect *hep = LLHUDObject::addHUDEffect(type);
        if (!hep)
        {
                return NULL;
@@ -169,7 +169,6 @@ void LLHUDManager::processViewerEffect(LLMessageSystem *mesgsys, void **user_dat
        {
                effectp = NULL;
                LLHUDEffect::getIDType(mesgsys, k, effect_id, effect_type);
                S32 i;
                for (i = 0; i < gHUDManager->mHUDEffects.count(); i++)
                {
diff --git a/linden/indra/newview/llhudobject.cpp b/linden/indra/newview/llhudobject.cpp
index 3788c29..35e6d94 100644
--- a/linden/indra/newview/llhudobject.cpp
+++ b/linden/indra/newview/llhudobject.cpp
@@ -155,6 +155,22 @@ LLHUDObject *LLHUDObject::addHUDObject(const U8 type)
        case LL_HUD_CONNECTOR:
                hud_objectp = new LLHUDConnector(type);
                break;
+        default:
+                llwarns << "Unknown type of hud object:" << (U32) type << llendl;
+        }
+        if (hud_objectp)
+        {
+                sHUDObjects.push_back(hud_objectp);
+        }
+        return hud_objectp;
+}
+LLHUDEffect *LLHUDObject::addHUDEffect(const U8 type)
+{
+        LLHUDEffect *hud_objectp = NULL;
+        
+        switch (type)
+        {
        case LL_HUD_EFFECT_BEAM:
                hud_objectp = new LLHUDEffectSpiral(type);
                ((LLHUDEffectSpiral *)hud_objectp)->setDuration(0.7f);
@@ -233,7 +249,7 @@ LLHUDObject *LLHUDObject::addHUDObject(const U8 type)
                hud_objectp = new LLHUDEffectPointAt(type);
                break;
        default:
-                llwarns << "Unknown type of hud object:" << (U32) type << llendl;
+                llwarns << "Unknown type of hud effect:" << (U32) type << llendl;
        }
        if (hud_objectp)
diff --git a/linden/indra/newview/llhudobject.h b/linden/indra/newview/llhudobject.h
index a64fe9b..7b74165 100644
--- a/linden/indra/newview/llhudobject.h
+++ b/linden/indra/newview/llhudobject.h
@@ -46,6 +46,7 @@ class LLViewerCamera;
 class LLFontGL;
 class LLFace;
 class LLViewerObject;
+class LLHUDEffect;
 class LLHUDObject : public LLRefCount
 {
@@ -65,6 +66,7 @@ public:
        U8 getType() const { return mType; }
        static LLHUDObject *addHUDObject(const U8 type);
+        static LLHUDEffect *addHUDEffect(const U8 type);
        static void updateAll();
        static void renderAll();
        static void renderAllForSelect();
diff --git a/linden/indra/newview/llprefsvoice.cpp b/linden/indra/newview/llprefsvoice.cpp
index c66a3d0..c5788d6 100644
--- a/linden/indra/newview/llprefsvoice.cpp
+++ b/linden/indra/newview/llprefsvoice.cpp
@@ -149,7 +149,7 @@ void LLPrefsVoiceLogic::onEarLocationCommit(LLUICtrl* ctrl, void* user_data)
 }
 //static
-void LLPrefsVoiceLogic::onClickLaunchWizard(void* user_data)
+void LLPrefsVoiceLogic::onClickLaunchWizard(void* user_data)
 {
        LLFloaterVoiceWizard::showInstance();
 }
@@ -231,10 +231,8 @@ LLPrefsVoice::LLPrefsVoice()
        childSetAction("device_settings_btn", onClickDeviceSettingsBtn, this);
        // create floater immediately and keep it hidden
-        // since it stores preference state for audio devices
+        // since it stores preference state for audio devices
-        mDeviceSettings = LLFloaterDeviceSettings::getInstance();
+        mDeviceSettings = LLFloaterDeviceSettings::getInstance();
-        //*FIXME: getInstance() needs to not show the floater
-        LLFloaterDeviceSettings::hideInstance();
 }
 LLPrefsVoice::~LLPrefsVoice()
@@ -263,15 +261,15 @@ void LLPrefsVoice::cancel()
        mLogic->cancel();
        mDeviceSettings->cancel();
 }
-//static 
+//static 
-void LLPrefsVoice::onClickDeviceSettingsBtn(void* user_data)
+void LLPrefsVoice::onClickDeviceSettingsBtn(void* user_data)
-{
+{
-        LLPrefsVoice* prefs = (LLPrefsVoice*)user_data;
+        LLPrefsVoice* prefs = (LLPrefsVoice*)user_data;
-        prefs->mDeviceSettings->open();
+        prefs->mDeviceSettings->open();
-        LLFloater* parent_floater = gFloaterView->getParentFloater(prefs);
+        LLFloater* parent_floater = gFloaterView->getParentFloater(prefs);
-        if (parent_floater)
+        if (parent_floater)
-        {
+        {
-                parent_floater->addDependentFloater(prefs->mDeviceSettings, FALSE);
+                parent_floater->addDependentFloater(prefs->mDeviceSettings, FALSE);
-        }
+        }
-}
+}
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 0bc42c6..8a0e0dd 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -1177,11 +1177,15 @@ const char *LLVoiceClientStatusObserver::status2string(LLVoiceClientStatusObserv
        switch(inStatus)
        {
+                CASE(STATUS_LOGIN_RETRY);
+                CASE(STATUS_LOGGED_IN);
                CASE(STATUS_JOINING);
                CASE(STATUS_JOINED);
                CASE(STATUS_LEFT_CHANNEL);
+                CASE(BEGIN_ERROR_STATUS);
                CASE(ERROR_CHANNEL_FULL);
                CASE(ERROR_CHANNEL_LOCKED);
+                CASE(ERROR_NOT_AVAILABLE);
                CASE(ERROR_UNKNOWN);
        default:
                break;
diff --git a/linden/indra/newview/llvoiceclient.h b/linden/indra/newview/llvoiceclient.h
index f65aa58..e8c5b33 100644
--- a/linden/indra/newview/llvoiceclient.h
+++ b/linden/indra/newview/llvoiceclient.h
@@ -53,6 +53,8 @@ class LLVoiceClientStatusObserver
 public:
        typedef enum e_voice_status_type
        {
+                // NOTE: when updating this enum, please also update the switch in
+                //  LLVoiceClientStatusObserver::status2string().
                STATUS_LOGIN_RETRY,
                STATUS_LOGGED_IN,
                STATUS_JOINING,
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index a1454be..9ce0bfd 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -1,3 +1,13 @@
+Release Notes for Second Life 1.18.2(0) August 10, 2007
+=====================================
+Bug fixes:
+* VWR-1936: Line editor history missing from First Look: Voice
+* Adjusted thread priorities and buffering algorithms in SLVoice to improve performance on low-end machines
+* Added a DC bias removal filter to SLVoice, which should remove "popping" artifacts heard with some microphones
+* Fixed: Audio devices added to a system after launch of client do not appear in the device menu
+* Fixed: The first time opening the prefs window after launch kicks the user out of their voice channel
 Release Notes for Second Life 1.18.1(2) August 2, 2007
 =====================================
diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc
index 9a86533..20e568e 100644
--- a/linden/indra/newview/res/newViewRes.rc
+++ b/linden/indra/newview/res/newViewRes.rc
@@ -227,8 +227,8 @@ TOOLPIPETTE             CURSOR                  "toolpipette.cur"
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,18,1,2
+ FILEVERSION 1,18,2,0
- PRODUCTVERSION 1,18,1,2
+ PRODUCTVERSION 1,18,2,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -245,12 +245,12 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "Linden Lab"
            VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.18.1.2"
+            VALUE "FileVersion", "1.18.2.0"
            VALUE "InternalName", "Second Life"
            VALUE "LegalCopyright", "Copyright � 2001-2007, Linden Research, Inc."
            VALUE "OriginalFilename", "SecondLife.exe"
            VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.18.1.2"
+            VALUE "ProductVersion", "1.18.2.0"
        END
    END
    BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about.xml b/linden/indra/newview/skins/xui/en-us/floater_about.xml
index 20a97f6..b987d53 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_about.xml
@@ -14,7 +14,6 @@ In Memory of Jesse Malthus, you will be fondly remembered by all who heard your
 Thank you to the following residents for helping to ensure that this is the best version yet: Aces Spade, Adrian Buckler, Adrienne LeShelle, Amanda Ascot, AnnaQuay Heart, Aquamina Khalifa, Arienne Anatine, Aston Hildyard, Ayami Kamachi, Badinage Odets, Biffy Berjis, Bigfox Pye, BigJohn Jade, BigRick Byrd, Brettus Tripsa, Brock Fitzgerald, Broker Allen, Browse by Name, Chiria Celt, Christopher Prudhomme, dale Cao, dale Lynch, Dante Tucker, DaQbet Kish, Dargon Pacer, Darius Antonelli, Deira Llanfair, DeviantBone Xi, Dore Dorado, Englishwob Etchegaray, Enya Masala, Eric Renneville, Fairfax Michinaga, FireFox Bancroft, FOXI Cortes, Frederick Earp, Geo Meek, Gotthilf Fischer, Hallo Loon, Hawk Carter, Hazel Kyrgyz, Hecter Barbosa, Hex Link, Ice Pak, Ideasu Mukerji, Itoku Kamachi, Jared Halleck, Jaykob Carter, Jennifer Drumheller, JensMartin Tomsen, JIAB Boa, Jim Gustafson, JimmyJet Fossett, Joseph Rustamova, Jt Volos, Karilyn Kidomen, Kaysha Sion, Keaton Nacon, Kevin Susenko, Khashai Steinbeck, Kira Cuddihy, Kit Massiel, Kojo Dixon, KUieTSToRm Lightcloud, Kwai Kyong, Kyrtis Daehlie, LazyGunGuy Bartlett, Lewcas Zapedzki, Lioc Cioc, LLIB Utu, Lou Liebknecht, Luca Draken, Maci Homewood, Major Sewell, Mari Todriya, MarieElize Noel, matt27 Churchill, Maverick Miasma, maydaysos Young, Mediaho Ball, Mikayla Gillespie, Mike Faulkland, Modfire Milland, MollyBrown Foxley, Mosley Jewell, Nuahs Zapedzki, Nyx Divine, Panther Farber, Paul Bumi, PrincessNina Prefect, Prio Serpentine, Rainbow Drake, Randall Rall, Randy Kazan, Reinhart Mokeev, Rhyph Somme, Rico Roizman, Ruge Dryke, Ryan Orbit, Safira Rosher, Samantha Bainbridge, Sammy Foxley, Sash Furst, Saturn Ariantho, Sienna Summers, Skye Enoch, Sofie Kanno, Solar Legion, Sonic Oki, Sunra Saenz, Taina Heart, Taryn Sprawl, tenerife Wei, TomDragon Nilsson, Trebla Reve, Trouble Carnell, user1cat Orbit, Vance Merlin, Veritas Variscan, Web Page, Wi3g3ht3s Ihnen, WinDrftr DeFarge, Yuu Nakamichi, Zac Delec, Zed Fairweather, Zimmo Hallard.
 APR Copyright (C) 2000-2004 The Apache Software Foundation
-Cg Copyright (C) 2002, NVIDIA Corporationa.
 cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
 expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
 FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
@@ -31,9 +30,10 @@ zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
 All rights reserved.  See licenses.txt for details.
+Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-Viva la Liberación!</text_editor>
+Mr. Watson -- come here -- I want to see you.</text_editor>
        <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="174" embedded_items="false"
             follows="left|top|right|bottom" font="SansSerif" height="238" left="6"