103 files changed, 5331 insertions, 3684 deletions

diff --git a/linden/LICENSE-libraries-linux.txt b/linden/LICENSE-libraries-linux.txt
new file mode 100644
index 0000000..b43c402
--- /dev/null
+++ b/linden/LICENSE-libraries-linux.txt
@@ -0,0 +1,811 @@
+===========
+APR License
+===========
+
+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.
+
+==============
+Base32 License
+==============
+
+ * Copyright (c) 2006 Christian Biere <christianbiere@gmx.de>
+ * 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. Neither the name of the authors 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 AUTHORS 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.
+
+============
+cURL License
+============
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1996 - 2002, Daniel Stenberg, <daniel@haxx.se>.
+
+All rights reserved.
+
+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", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 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.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization of the copyright holder.
+
+
+=============
+expat License
+=============
+
+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.
+
+================
+FreeType License
+================
+
+Portions of this software are copyright (c) 2003 The FreeType
+Project (www.freetype.org). All rights reserved. 
+
+==========================
+FSI FontShop International
+==========================
+
+Certain of the fonts in the Meta family of copyrighted typefaces are
+used in Second Life under license from FSI FontShop
+International. Copies of such Meta fonts that are included in the
+Viewer are not themselves open source and are not available under the
+GPL license, and they may not be copied.  Developers may use those
+fonts solely to the extent necessary to use or customize the Linden
+Software in Second Life and to develop and distribute content solely
+for use in the Second Life environment, and for no other purposes.
+Second Life developers who wish to make other uses of Meta fonts must
+obtain a license from FSI FontShop International at www.fontfont.com.
+
+==========
+GL License
+==========
+
+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.
+
+=========================
+glh OpenGL helper library
+=========================
+
+glh - is a platform-indepenedent C++ OpenGL helper library
+
+
+Copyright (c) 2000 Cass Everitt
+    Copyright (c) 2000 NVIDIA Corporation
+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 names of contributors to this software may not 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
+              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.
+
+
+Cass Everitt - cass@r3.nu
+
+=======================
+JPEG Library 6b License
+=======================
+
+This software is based in part on the work of the Independent JPEG Group
+
+================
+JPEG2000 License
+================
+
+Copyright 2001, David Taubman, The University of New South Wales (UNSW)
+The copyright owner is Unisearch Ltd, Australia (commercial arm of UNSW)
+Neither this copyright statement, nor the licensing details below
+may be removed from this file or dissociated from its contents.
+
+Licensee: Linden Research, Inc.
+License number: 00024
+The licensee has been granted a COMMERCIAL license to the contents of
+this source file.  A brief summary of this license appears below.  This
+summary is not to be relied upon in preference to the full text of the
+license agreement, accepted at purchase of the license.
+1. The Licensee has the right to Commercial Use of the Kakadu software,
+   including distribution of one or more Applications built using the
+   software.
+2. The Licensee has the right to Internal Use of the Kakadu software,
+   including use by employees of the Licensee or an Affiliate for the
+   purpose of performing services on behalf of the Licensee or Affiliate,
+   or in the performance of services for Third Parties who engage Licensee
+   or an Affiliate for such services.
+3. The Licensee has the right to distribute Reusable Code (including
+   source code and dynamically or statically linked libraries) to a Third
+   Party, provided the Third Party possesses a license to use the Kakadu
+   software.
+
+==================
+ogg/vorbis License
+==================
+
+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.
+
+
+===========
+SDL License
+===========
+
+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
+
+=============
+ELFIO License
+=============
+
+ELFIO.h - ELF reader and producer.
+Copyright (C) 2001 Serge Lamikhov-Center <to_serge@users.sourceforge.net>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+The GNU Library GPL is available at http://www.gnu.org/copyleft/lesser.html
+
+===============
+OpenSSL License
+===============
+
+Copyright (c) 1998-2002 The OpenSSL Project.  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. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED 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 OpenSSL PROJECT OR
+ITS 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.
+====================================================================
+
+This product includes cryptographic software written by Eric Young
+(eay@cryptsoft.com).  This product includes software written by Tim
+Hudson (tjh@cryptsoft.com).
+
+
+
+=======================
+Original SSLeay License
+=======================
+
+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.]
+
+
+==================
+xmlrpc-epi License
+==================
+
+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. 
+
+
+===============
+libuuid License
+===============
+
+Copyright (C) 1999, 2000, 2003, 2004 by Theodore Ts'o
+
+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, and the entire permission notice in its entirety,
+   including the disclaimer of warranties.
+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 name of the author may not be used to endorse or promote
+   products derived from this software without specific prior
+   written permission.
+
+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, ALL OF
+WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR 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 NOT ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+
+============
+zlib License
+============
+
+'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 
+
+=================================
+tcmalloc/Google perftools license
+=================================
+
+Copyright (c) 2005, Google 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:
+
+    * 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 Google Inc. 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.
+
+==============
+libpng license
+==============
+
+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.18, May 15, 2007, are
+Copyright (c) 2004, 2006-2007 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, 2000 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.
+
+=================
+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/LICENSE-libraries-mac.txt b/linden/LICENSE-libraries-mac.txt
new file mode 100644
index 0000000..d488c74
--- /dev/null
+++ b/linden/LICENSE-libraries-mac.txt
@@ -0,0 +1,696 @@
+===========
+APR License
+===========
+
+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.
+
+==============
+Base32 License
+==============
+
+ * Copyright (c) 2006 Christian Biere <christianbiere@gmx.de>
+ * 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. Neither the name of the authors 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 AUTHORS 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.
+
+============
+cURL License
+============
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1996 - 2002, Daniel Stenberg, <daniel@haxx.se>.
+
+All rights reserved.
+
+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", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 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.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization of the copyright holder.
+
+
+=============
+expat License
+=============
+
+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.
+
+================
+FreeType License
+================
+
+Portions of this software are copyright (c) 2003 The FreeType
+Project (www.freetype.org). All rights reserved. 
+
+==========================
+FSI FontShop International
+==========================
+
+Certain of the fonts in the Meta family of copyrighted typefaces are
+used in Second Life under license from FSI FontShop
+International. Copies of such Meta fonts that are included in the
+Viewer are not themselves open source and are not available under the
+GPL license, and they may not be copied.  Developers may use those
+fonts solely to the extent necessary to use or customize the Linden
+Software in Second Life and to develop and distribute content solely
+for use in the Second Life environment, and for no other purposes.
+Second Life developers who wish to make other uses of Meta fonts must
+obtain a license from FSI FontShop International at www.fontfont.com.
+
+==========
+GL License
+==========
+
+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.
+
+=========================
+glh OpenGL helper library
+=========================
+
+glh - is a platform-indepenedent C++ OpenGL helper library
+
+
+Copyright (c) 2000 Cass Everitt
+    Copyright (c) 2000 NVIDIA Corporation
+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 names of contributors to this software may not 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
+              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.
+
+
+Cass Everitt - cass@r3.nu
+
+=======================
+JPEG Library 6b License
+=======================
+
+This software is based in part on the work of the Independent JPEG Group
+
+================
+JPEG2000 License
+================
+
+Copyright 2001, David Taubman, The University of New South Wales (UNSW)
+The copyright owner is Unisearch Ltd, Australia (commercial arm of UNSW)
+Neither this copyright statement, nor the licensing details below
+may be removed from this file or dissociated from its contents.
+
+Licensee: Linden Research, Inc.
+License number: 00024
+The licensee has been granted a COMMERCIAL license to the contents of
+this source file.  A brief summary of this license appears below.  This
+summary is not to be relied upon in preference to the full text of the
+license agreement, accepted at purchase of the license.
+1. The Licensee has the right to Commercial Use of the Kakadu software,
+   including distribution of one or more Applications built using the
+   software.
+2. The Licensee has the right to Internal Use of the Kakadu software,
+   including use by employees of the Licensee or an Affiliate for the
+   purpose of performing services on behalf of the Licensee or Affiliate,
+   or in the performance of services for Third Parties who engage Licensee
+   or an Affiliate for such services.
+3. The Licensee has the right to distribute Reusable Code (including
+   source code and dynamically or statically linked libraries) to a Third
+   Party, provided the Third Party possesses a license to use the Kakadu
+   software.
+
+==================
+ogg/vorbis License
+==================
+
+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.
+
+
+===============
+OpenSSL License
+===============
+
+Copyright (c) 1998-2002 The OpenSSL Project.  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. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED 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 OpenSSL PROJECT OR
+ITS 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.
+====================================================================
+
+This product includes cryptographic software written by Eric Young
+(eay@cryptsoft.com).  This product includes software written by Tim
+Hudson (tjh@cryptsoft.com).
+
+
+
+=======================
+Original SSLeay License
+=======================
+
+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.]
+
+
+==================
+xmlrpc-epi License
+==================
+
+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. 
+
+
+============
+zlib License
+============
+
+'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 
+
+==============
+libpng license
+==============
+
+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.18, May 15, 2007, are
+Copyright (c) 2004, 2006-2007 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, 2000 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.
+
+=================
+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/LICENSE-libraries-win32.txt b/linden/LICENSE-libraries-win32.txt
new file mode 100644
index 0000000..eb441e0
--- /dev/null
+++ b/linden/LICENSE-libraries-win32.txt
@@ -0,0 +1,737 @@
+===========

+Logitech License

+===========

+

+End-User License Agreement for Logitech LCD SDK

+

+This End-User License Agreement for Logitech LCD SDK ( “Agreement”) is a legal agreement between you, either an individual or legal entity (“You” or “you”) and Logitech Inc. (“Logitech”) for use of the Logitech LCD software development kit, which includes computer software and related media and documentation (hereinafter “LCD SDK”). By using this LCD SDK, you are agreeing to be bound by the terms and conditions of this Agreement. If you do not agree to the terms and conditions of this Agreement, promptly return the LCD SDK and other items that are part of this product in their original package with your sales receipt to your point of purchase for a full refund, or if you have downloaded this software from a Logitech web site, then you must stop using the software and destroy any copies of the software in your possession or control.

+

+1 Grant of License and Restrictions. 

+This Agreement grants You the following rights provided that You comply with all terms and conditions of this Agreement.

+(a) Logitech grants You a limited, non-exclusive, nontransferable license to install and use an unlimited number of copies of the LCD SDK on computers . All other rights are reserved to Logitech.

+(b) You shall not reverse engineer, decompile or disassemble any portion of the LCD SDK, except and only to the extent that this limitation is expressly prohibited by applicable law.

+(c) At your option, you may provide reasonable feedback to Logitech, including but not limited to usability, bug reports and test results, with respect to the LCD SDK. All bug reports, test results and other feedback provided to Logitech by You shall be the property of Logitech and may be used by Logitech for any purpose.

+(d) In the event Logitech, in its sole discretion, elects to provide copies of the LCD SDK to more than one individual employed by You (if You are not a single individual), each such individual shall be entitled to exercise the rights granted in this Agreement and shall be bound by the terms and conditions herein.

+

+2 Updates. 

+Logitech is not obligated to provide technical support or updates to You for the LCD SDK provided to You pursuant to this Agreement. However, Logitech may, in its sole discretion, provide further pre-release versions, technical support, updates and/or supplements (“Updates”) to You, in which case such Updates shall be deemed to be included in the “LCD SDK” and shall be governed by this Agreement, unless other terms of use are provided in writing by Logitech with such Updates.

+

+3 Intellectual Property Rights. 

+The LCD SDK is licensed, not sold, to You for use only under the terms and conditions of this Agreement. Logitech and its suppliers retain title to the LCD SDK and all intellectual property rights therein. The LCD SDK is protected by intellectual property laws and international treaties, including U.S. copyright law and international copyright treaties. All rights not expressly granted by Logitech are reserved.

+

+4 Disclaimer of Warranty.

+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, LOGITECH AND ITS SUPPLIERS PROVIDE THE LCD SDK AND OTHER LOGITECH PRODUCTS AND SERVICES (IF ANY) AS IS AND WITHOUT WARRANTY OF ANY KIND. LOGITECH AND ITS SUPPLIERS EXPRESSLY DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD-PARTY RIGHTS WITH RESPECT TO THE LCD SDK AND ANY WARRANTIES OF NON-INTERFERENCE OR ACCURACY OF INFORMATIONAL CONTENT. NO LOGITECH DEALER, AGENT, OR EMPLOYEE IS AUTHORIZED TO MAKE ANY MODIFICATION, EXTENSION, OR ADDITION TO THIS WARRANTY. Some jurisdictions do not allow limitations on how long an implied warranty lasts, so the above limitation may not apply to you.

+

+5 Limitation of Liability.

+IN NO EVENT WILL LOGITECH OR ITS SUPPLIERS BE LIABLE FOR ANY COSTS OF PROCUREMENT OF SUBSTITUTE PRODUCTS OR SERVICES, LOST PROFITS, LOSS OF INFORMATION OR DATA, OR ANY OTHER SPECIAL, INDIRECT, CONSEQUENTIAL, OR INCIDENTAL DAMAGES ARISING IN ANY WAY OUT OF THE SALE OF, USE OF, OR INABILITY TO USE THE LCD SDK OR ANY LOGITECH PRODUCT OR SERVICE, EVEN IF LOGITECH HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN NO CASE SHALL LOGITECH'S AND ITS SUPPLIERS’ TOTAL LIABILITY EXCEED THE ACTUAL MONEY PAID FOR THE LOGITECH PRODUCT OR SERVICE GIVING RISE TO THE LIABILITY. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so the above limitation or exclusion may not apply to you. The above limitations will not apply in case of personal injury where and to the extent that applicable law requires such liability.

+

+6 U.S. Government Rights.

+Use, duplication, or disclosure of the software contained in the LCD SDK by the U.S. Government is subject to restrictions set forth in this Agreement and as provided in DFARS 227.7202-1(a) and 227.7202-3(a) (1995), DFARS 252.227-7013(c)(1)(ii) (OCT 1988) FAR 12.212(a) (1995), FAR 52.227-19, or FAR 52.227-14 (ALT III), as applicable. Logitech Inc. 6505 Kaiser Drive, Fremont, CA 94555.

+

+7 Export Law Assurances.

+You agree and certify that neither the LCD SDK nor any other technical data received from Logitech will be exported outside the United States except as authorized and as permitted by the laws and regulations of the United States. If you have rightfully obtained the LCD SDK outside of the United States, you agree that you will not re-export the LCD SDK nor any other technical data received from Logitech, except as permitted by the laws and regulations of the United States and the laws and regulations of the jurisdiction in which you obtained the LCD SDK.

+

+8 Termination:

+This Agreement is effective until terminated. Upon any violation of any of the provisions of this Agreement, rights to use the LCD SDK shall automatically terminate and the LCD SDK must be returned to Logitech or all copies of the LCD SDK destroyed. You may also terminate this Agreement at any time by destroying all copies of the LCD SDK in your possession or control. If Logitech makes a request via public announcement or press release to stop using the copies of the LCD SDK, you will comply immediately with this request. The provisions of paragraphs 3, 7, 8 and 12 will survive any termination of this Agreement.

+

+9 General Terms and Conditions.

+If You are an individual signing this Agreement on behalf of a company, then You represent that You have authority to execute this Agreement on behalf of such company. This Agreement will be governed by and construed in accordance with the laws of the United States and the State of California, without regard to or application of its choice of law rules or principles. If for any reason a court of competent jurisdiction finds any provision of this Agreement, or portion thereof, to be unenforceable, that provision of the Agreement shall be enforced to the maximum extent permissible so as to affect the intent of the parties, and the remainder of this Agreement shall continue in full force and effect. This Agreement constitutes the entire agreement between You and Logitech respect to the use of the LCD SDK and supersedes all prior or contemporaneous understandings, communications or agreements, written or oral, regarding such subject matter.

+

+===========

+APR License

+===========

+

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

+

+==============

+Base32 License

+==============

+

+ * Copyright (c) 2006 Christian Biere <christianbiere@gmx.de>

+ * 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. Neither the name of the authors 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 AUTHORS 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.

+

+============

+cURL License

+============

+

+COPYRIGHT AND PERMISSION NOTICE

+

+Copyright (c) 1996 - 2002, Daniel Stenberg, <daniel@haxx.se>.

+

+All rights reserved.

+

+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", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 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.

+

+Except as contained in this notice, the name of a copyright holder shall not

+be used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization of the copyright holder.

+

+

+=============

+expat License

+=============

+

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

+

+================

+FreeType License

+================

+

+Portions of this software are copyright (c) 2003 The FreeType

+Project (www.freetype.org). All rights reserved. 

+

+==========================

+FSI FontShop International

+==========================

+

+Certain of the fonts in the Meta family of copyrighted typefaces are

+used in Second Life under license from FSI FontShop

+International. Copies of such Meta fonts that are included in the

+Viewer are not themselves open source and are not available under the

+GPL license, and they may not be copied.  Developers may use those

+fonts solely to the extent necessary to use or customize the Linden

+Software in Second Life and to develop and distribute content solely

+for use in the Second Life environment, and for no other purposes.

+Second Life developers who wish to make other uses of Meta fonts must

+obtain a license from FSI FontShop International at www.fontfont.com.

+

+==========

+GL License

+==========

+

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

+

+ 

+=========================

+glh OpenGL helper library 

+=========================   

+

+glh - is a platform-indepenedent C++ OpenGL helper library 

+

+

+Copyright (c) 2000 Cass Everitt

+    Copyright (c) 2000 NVIDIA Corporation

+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 names of contributors to this software may not 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. 

+

+

+Cass Everitt - cass@r3.nu

+

+=======================

+JPEG Library 6b License

+=======================

+

+This software is based in part on the work of the Independent JPEG Group

+

+================

+JPEG2000 License

+================

+

+Copyright 2001, David Taubman, The University of New South Wales (UNSW)

+The copyright owner is Unisearch Ltd, Australia (commercial arm of UNSW)

+Neither this copyright statement, nor the licensing details below

+may be removed from this file or dissociated from its contents.

+

+Licensee: Linden Research, Inc.

+License number: 00024

+The licensee has been granted a COMMERCIAL license to the contents of

+this source file.  A brief summary of this license appears below.  This

+summary is not to be relied upon in preference to the full text of the

+license agreement, accepted at purchase of the license.

+1. The Licensee has the right to Commercial Use of the Kakadu software,

+   including distribution of one or more Applications built using the

+   software.

+2. The Licensee has the right to Internal Use of the Kakadu software,

+   including use by employees of the Licensee or an Affiliate for the

+   purpose of performing services on behalf of the Licensee or Affiliate,

+   or in the performance of services for Third Parties who engage Licensee

+   or an Affiliate for such services.

+3. The Licensee has the right to distribute Reusable Code (including

+   source code and dynamically or statically linked libraries) to a Third

+   Party, provided the Third Party possesses a license to use the Kakadu

+   software.

+

+==================

+ogg/vorbis License

+==================

+

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

+

+

+===============

+OpenSSL License

+===============

+

+Copyright (c) 1998-2002 The OpenSSL Project.  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. All advertising materials mentioning features or use of this

+   software must display the following acknowledgment:

+   "This product includes software developed by the OpenSSL Project

+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"

+

+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

+   endorse or promote products derived from this software without

+   prior written permission. For written permission, please contact

+   openssl-core@openssl.org.

+

+5. Products derived from this software may not be called "OpenSSL"

+   nor may "OpenSSL" appear in their names without prior written

+   permission of the OpenSSL Project.

+

+6. Redistributions of any form whatsoever must retain the following

+   acknowledgment:

+   "This product includes software developed by the OpenSSL Project

+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"

+

+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

+EXPRESSED 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 OpenSSL PROJECT OR

+ITS 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.

+====================================================================

+

+This product includes cryptographic software written by Eric Young

+(eay@cryptsoft.com).  This product includes software written by Tim

+Hudson (tjh@cryptsoft.com).

+

+

+

+=======================

+Original SSLeay License

+=======================

+

+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.]

+

+

+==================

+xmlrpc-epi License

+==================

+

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

+

+

+============

+zlib License

+============

+

+'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 

+

+==============

+libpng license

+==============

+

+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.18, May 15, 2007, are

+Copyright (c) 2004, 2006-2007 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, 2000 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.

+

+=================

+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/LICENSE-logos.txt b/linden/LICENSE-logos.txt
new file mode 100644
index 0000000..e63c48e
--- /dev/null
+++ b/linden/LICENSE-logos.txt
@@ -0,0 +1,23 @@
+COPYRIGHT AND PERMISSION NOTICE
+
+Second Life(TM) Viewer Artwork.  Copyright (C) 2008 Linden Research, Inc.
+
+Linden Research, Inc. ("Linden Lab") licenses the Second Life viewer
+artwork and other works in the files distributed with this Notice under
+the Creative Commons Attribution-Share Alike 3.0 License, available at 
+http://creativecommons.org/licenses/by-sa/3.0/legalcode.  For the license
+summary, see http://creativecommons.org/licenses/by-sa/3.0/.
+
+Notwithstanding the foregoing, all of Linden Lab's trademarks, including
+but not limited to the Second Life brand name and Second Life Eye-in-Hand
+logo, are subject to our trademark policy at
+http://secondlife.com/corporate/trademark/.
+
+If you distribute any copies or adaptations of the Second Life viewer
+artwork or any other works in these files, you must include this Notice
+and clearly identify any changes made to the original works.  Include
+this Notice and information where copyright notices are usually included,
+for example, after your own copyright notice acknowledging your use of
+the Second Life viewer artwork, in a text file distributed with your
+program, in your application's About window, or on a credits page for
+your work.
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 55156f0..ac24d99 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -13,6 +13,7 @@ Adam Marker
     VWR-2755
 Aimee Trescothick
         VWR-3903
+        VWR-3336
         VWR-4083
         VWR-8341
         VWR-8430
diff --git a/linden/indra/CMakeLists.txt b/linden/indra/CMakeLists.txt
index fac2afa..eb06191 100644
--- a/linden/indra/CMakeLists.txt
+++ b/linden/indra/CMakeLists.txt
@@ -13,7 +13,7 @@ if(COMMAND cmake_policy)
   cmake_policy(SET CMP0003 OLD)
 endif(COMMAND cmake_policy)
 
-project(SecondLife)
+project(Imprudence)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
@@ -77,7 +77,7 @@ if (VIEWER)
   endif (LINUX)
 
   add_subdirectory(${VIEWER_PREFIX}newview)
-  add_dependencies(viewer secondlife-bin)
+  add_dependencies(viewer imprudence-bin)
 endif (VIEWER)
 
 # Linux builds the viewer and server in 2 separate projects
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 240853a..977e588 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -146,7 +146,7 @@ if (LINUX)
   endif (SERVER)
 
   if (VIEWER)
-    add_definitions(-DAPPID=secondlife)
+    add_definitions(-DAPPID=imprudence)
     add_definitions(-fvisibility=hidden)
     if (NOT STANDALONE)
       # this stops us requiring a really recent glibc at runtime
diff --git a/linden/indra/cmake/FMOD.cmake b/linden/indra/cmake/FMOD.cmake
index 759b8f1..e9f483a 100644
--- a/linden/indra/cmake/FMOD.cmake
+++ b/linden/indra/cmake/FMOD.cmake
@@ -7,6 +7,7 @@ if(INSTALL_PROPRIETARY)
   use_prebuilt_binary(fmod)
 endif(INSTALL_PROPRIETARY)
 
+if (FMOD)
 find_library(FMOD_LIBRARY_RELEASE
              NAMES fmod fmodvc fmod-3.75
              PATHS
@@ -18,6 +19,7 @@ find_library(FMOD_LIBRARY_DEBUG
              PATHS
              ${ARCH_PREBUILT_DIRS_DEBUG}
              )
+endif (FMOD)
 
 if (FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG)
   set(FMOD_LIBRARY
diff --git a/linden/indra/cmake/UnixInstall.cmake b/linden/indra/cmake/UnixInstall.cmake
index 139be0a..0234dee 100644
--- a/linden/indra/cmake/UnixInstall.cmake
+++ b/linden/indra/cmake/UnixInstall.cmake
@@ -21,11 +21,11 @@ if (INSTALL)
   set(INSTALL_SHARE_DIR ${INSTALL_PREFIX}/share CACHE PATH
       "Installation directory for read-only shared files.")
 
-  set(APP_BINARY_DIR ${INSTALL_LIBRARY_DIR}/secondlife-${viewer_VERSION}
+  set(APP_BINARY_DIR ${INSTALL_LIBRARY_DIR}/imprudence-${viewer_VERSION}
       CACHE PATH
       "Installation directory for binaries.")
 
-  set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/secondlife-${viewer_VERSION}
+  set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/imprudence-${viewer_VERSION}
       CACHE PATH
       "Installation directory for read-only data files.")
 endif (INSTALL)
diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake
index 5868e4d..8f33a95 100644
--- a/linden/indra/cmake/Variables.cmake
+++ b/linden/indra/cmake/Variables.cmake
@@ -79,7 +79,7 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 set(GRID agni CACHE STRING "Target Grid")
 
 set(VIEWER ON CACHE BOOL "Build Second Life viewer.")
-set(VIEWER_CHANNEL "Developer" CACHE STRING "Viewer Channel Name")
+set(VIEWER_CHANNEL "Imprudence" CACHE STRING "Viewer Channel Name")
 set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing")
 
 set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.")
diff --git a/linden/indra/copy_win_scripts/start-client.py b/linden/indra/copy_win_scripts/start-client.py
index 5f7ff2f..ea2b67a 100644..100755
--- a/linden/indra/copy_win_scripts/start-client.py
+++ b/linden/indra/copy_win_scripts/start-client.py
@@ -32,7 +32,7 @@ def start_client(grid, slurl, build_config, my_args):
     f = open("start-client.log", "w")
     print >>f, "Viewer startup arguments:"
     llstart.start("viewer", "../../newview", 
-        "%s/newview/%s/secondlife-bin.exe" % (build_path, build_config),
+        "%s/newview/%s/imprudence-bin.exe" % (build_path, build_config),
         viewer_args, f)
     f.close()
 
diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index 8edfccc..a0b11c6 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -503,10 +503,10 @@ class WindowsSetup(PlatformSetup):
             if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0' ]:
                 config = '\"%s|Win32\"' % config
 
-            return "buildconsole Secondlife.sln /build %s" % config
+            return "buildconsole Imprudence.sln /build %s" % config
 
         # devenv.com is CLI friendly, devenv.exe... not so much.
-        return ('"%sdevenv.com" Secondlife.sln /build %s' % 
+        return ('"%sdevenv.com" Imprudence.sln /build %s' % 
                 (self.find_visual_studio(), self.build_type))
 
     # this override of run exists because the PlatformSetup version
@@ -527,9 +527,9 @@ class WindowsSetup(PlatformSetup):
             for build_dir in self.build_dirs():
                 vstool_cmd = os.path.join('tools','vstool','VSTool.exe') \
                              + ' --solution ' \
-                             + os.path.join(build_dir,'SecondLife.sln') \
+                             + os.path.join(build_dir,'Imprudence.sln') \
                              + ' --config RelWithDebInfo' \
-                             + ' --startup secondlife-bin'
+                             + ' --startup imprudence-bin'
                 print 'Running %r in %r' % (vstool_cmd, os.getcwd())
                 self.run(vstool_cmd)        
         
diff --git a/linden/indra/lib/python/indra/util/llversion.py b/linden/indra/lib/python/indra/util/llversion.py
index cf4f3c6..666cce4 100644
--- a/linden/indra/lib/python/indra/util/llversion.py
+++ b/linden/indra/lib/python/indra/util/llversion.py
@@ -45,15 +45,12 @@ def get_version_file_contents(version_type):
 
 def get_version(version_type):
     file_str = get_version_file_contents(version_type)
-    m = re.search('const S32 LL_VERSION_MAJOR = (\d+);', file_str)
+    m = re.search('const S32 IMP_VERSION_MAJOR = (\d+);', file_str)
     VER_MAJOR = m.group(1)
-    m = re.search('const S32 LL_VERSION_MINOR = (\d+);', file_str)
+    m = re.search('const S32 IMP_VERSION_MINOR = (\d+);', file_str)
     VER_MINOR = m.group(1)
-    m = re.search('const S32 LL_VERSION_PATCH = (\d+);', file_str)
-    VER_PATCH = m.group(1)
-    m = re.search('const S32 LL_VERSION_BUILD = (\d+);', file_str)
-    VER_BUILD = m.group(1)
-    version = "%(VER_MAJOR)s.%(VER_MINOR)s.%(VER_PATCH)s.%(VER_BUILD)s" % locals()
+    m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', file_str)
+    version = "%(VER_MAJOR)s.%(VER_MINOR)s.%(VER_PATCH)s" % locals()
     return version
 
 def get_channel(version_type):
diff --git a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
index aa2b82c..c4294d6 100644
--- a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
+++ b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
@@ -53,13 +53,13 @@
 
 // These need to be localized.
 static const char dialog_text[] =
-"Second Life appears to have crashed or frozen last time it ran.\n"
-"This crash reporter collects information about your computer's hardware, operating system, and some Second Life logs, all of which are used for debugging purposes only.\n"
+"Imprudence appears to have crashed or frozen last time it ran.\n"
+"This crash reporter collects information about your computer's hardware, operating system, and some Imprudence logs, all of which are used for debugging purposes only.\n"
 "\n"
 "Send crash report?";
 
 static const char dialog_title[] =
-"Second Life Crash Logger";
+"Imprudence Crash Logger";
 
 #if LL_GTK
 static void response_callback (GtkDialog *dialog,
@@ -90,7 +90,7 @@ static BOOL do_ask_dialog(void)
 
         win = gtk_message_dialog_new(NULL,
                                      flags, messagetype, buttons,
-                                     dialog_text);
+                                     "%s", dialog_text);
         gtk_window_set_type_hint(GTK_WINDOW(win),
                                  GDK_WINDOW_TYPE_HINT_DIALOG);
         gtk_window_set_title(GTK_WINDOW(win), dialog_title);
diff --git a/linden/indra/llcommon/llsecondlifeurls.cpp b/linden/indra/llcommon/llsecondlifeurls.cpp
index ee478fe..b006a6a 100644
--- a/linden/indra/llcommon/llsecondlifeurls.cpp
+++ b/linden/indra/llcommon/llsecondlifeurls.cpp
@@ -84,4 +84,4 @@ const std::string SL_KB_URL (
         "http://secondlife.com/knowledgebase/");
 
 const std::string RELEASE_NOTES_BASE_URL (
-        "http://secondlife.com/app/releasenotes/");
+        "http://imprudenceviewer.org/wiki/Release_Notes/");
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 66462b3..4032c5b 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -37,6 +37,14 @@ const S32 LL_VERSION_MINOR = 21;
 const S32 LL_VERSION_PATCH = 6;
 const S32 LL_VERSION_BUILD = 0;
 
-const char * const LL_CHANNEL = "Second Life Release";
+const char * const LL_CHANNEL = "Imprudence";
+
+const char * const LL_VIEWER_NAME = "Second Life";
+const char * const IMP_VIEWER_NAME = "Imprudence";
+
+const S32 IMP_VERSION_MAJOR = 1;
+const S32 IMP_VERSION_MINOR = 1;
+const S32 IMP_VERSION_PATCH = 0;
+const char * const IMP_VERSION_TEST = "alpha";
 
 #endif
diff --git a/linden/indra/llcrashlogger/llcrashlogger.cpp b/linden/indra/llcrashlogger/llcrashlogger.cpp
index 77274b0..af30136 100755
--- a/linden/indra/llcrashlogger/llcrashlogger.cpp
+++ b/linden/indra/llcrashlogger/llcrashlogger.cpp
@@ -172,7 +172,7 @@ void LLCrashLogger::gatherFiles()
         {
                 // Figure out the filename of the second life log
                 LLCurl::setCAFile(gDirUtilp->getCAFile());
-                mFileMap["SecondLifeLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.log");
+                mFileMap["SecondLifeLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"Imprudence.log");
                 mFileMap["SettingsXml"] = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,"settings.xml");
         }
 
@@ -293,7 +293,7 @@ bool LLCrashLogger::sendCrashLogs()
         updateApplication("Sending reports...");
 
         std::string dump_path = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
-                                                                                                                           "SecondLifeCrashReport");
+                                                                                                                           "ImprudenceCrashReport");
         std::string report_file = dump_path + ".log";
 
         std::ofstream out_file(report_file.c_str());
@@ -327,10 +327,10 @@ void LLCrashLogger::updateApplication(const std::string& message)
 bool LLCrashLogger::init()
 {
         // We assume that all the logs we're looking for reside on the current drive
-        gDirUtilp->initAppDirs("SecondLife");
+        gDirUtilp->initAppDirs("Imprudence");
 
-        // Default to the product name "Second Life" (this is overridden by the -name argument)
-        mProductName = "Second Life";
+        // Default to the product name "Imprudence" (this is overridden by the -name argument)
+        mProductName = "Imprudence";
         
         mCrashSettings.declareS32(CRASH_BEHAVIOR_SETTING, CRASH_BEHAVIOR_ASK, "Controls behavior when viewer crashes "
                 "(0 = ask before sending crash report, 1 = always send crash report, 2 = never send crash report)");
@@ -341,7 +341,7 @@ bool LLCrashLogger::init()
         //Run through command line options
         if(getOption("previous").isDefined())
         {
-                llinfos << "Previous execution did not remove SecondLife.exec_marker" << llendl;
+                llinfos << "Previous execution did not remove Imprudence.exec_marker" << llendl;
                 mCrashInPreviousExec = TRUE;
         }
 
@@ -371,7 +371,7 @@ bool LLCrashLogger::init()
         //If we've opened the crash logger, assume we can delete the marker file if it exists   
         if( gDirUtilp )
         {
-                std::string marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.exec_marker");
+                std::string marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"Imprudence.exec_marker");
                 ll_apr_file_remove( marker_file );
         }
         
diff --git a/linden/indra/llimage/llimagetga.cpp b/linden/indra/llimage/llimagetga.cpp
index 32c2111..21d0fd1 100644
--- a/linden/indra/llimage/llimagetga.cpp
+++ b/linden/indra/llimage/llimagetga.cpp
@@ -104,7 +104,7 @@ LLImageTGA::LLImageTGA(const std::string& file_name)
 
 LLImageTGA::~LLImageTGA()
 {
-        delete mColorMap;
+        delete [] mColorMap;
 }
 
 BOOL LLImageTGA::updateData()
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 51a5bca..5d6a648 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -428,7 +428,7 @@ unload ()
 
         if (mediaData)
         {
-                delete mediaData;
+                delete [] mediaData;
                 mediaData = NULL;
         }
 
diff --git a/linden/indra/llmedia/llmediamanager.cpp b/linden/indra/llmedia/llmediamanager.cpp
index f72e63c..16c731f 100644
--- a/linden/indra/llmedia/llmediamanager.cpp
+++ b/linden/indra/llmedia/llmediamanager.cpp
@@ -150,8 +150,10 @@ LLMediaManager* LLMediaManager::getInstance()
 // (static)
 void LLMediaManager::setBrowserUserAgent(std::string user_agent)
 {
+#if LL_LLMOZLIB_ENABLED
         // *HACK: Breaks encapsulation model, as initClass does above. JC
         LLMediaImplLLMozLib::setBrowserUserAgent(user_agent);
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/llmessage/llassetstorage.cpp b/linden/indra/llmessage/llassetstorage.cpp
index fa14a2b..2d85011 100644
--- a/linden/indra/llmessage/llassetstorage.cpp
+++ b/linden/indra/llmessage/llassetstorage.cpp
@@ -522,16 +522,19 @@ void LLAssetStorage::downloadCompleteCallback(
         S32 result,
         const LLUUID& file_id,
         LLAssetType::EType file_type,
-        void* user_data, LLExtStat ext_status)
+        void* callback_parm_req, LLExtStat ext_status)
 {
         lldebugs << "LLAssetStorage::downloadCompleteCallback() for " << file_id
                  << "," << LLAssetType::lookup(file_type) << llendl;
-        LLAssetRequest* req = (LLAssetRequest*)user_data;
+
+        // be careful! req may be a ptr to memory already freed (a timeout does this)
+        LLAssetRequest* req = (LLAssetRequest*)callback_parm_req;       
         if(!req)
         {
                 llwarns << "LLAssetStorage::downloadCompleteCallback called without"
                         "a valid request." << llendl;
-                return;
+                // we can live with a null pointer, we're not allowed to deref the ptr anyway (see above)
+                // return;  
         }
         if (!gAssetStorage)
         {
@@ -539,12 +542,10 @@ void LLAssetStorage::downloadCompleteCallback(
                 return;
         }
 
-        req->setUUID(file_id);
-        req->setType(file_type);
         if (LL_ERR_NOERR == result)
         {
                 // we might have gotten a zero-size file
-                LLVFile vfile(gAssetStorage->mVFS, req->getUUID(), req->getType());
+                LLVFile vfile(gAssetStorage->mVFS, file_id, file_type);
                 if (vfile.getSize() <= 0)
                 {
                         llwarns << "downloadCompleteCallback has non-existent or zero-size asset " << req->getUUID() << llendl;
@@ -563,7 +564,7 @@ void LLAssetStorage::downloadCompleteCallback(
         {
                 request_list_t::iterator curiter = iter++;
                 LLAssetRequest* tmp = *curiter;
-                if ((tmp->getUUID() == req->getUUID()) && (tmp->getType()== req->getType()))
+                if ((tmp->getUUID() == file_id) && (tmp->getType() == file_type))
                 {
                         requests.push_front(tmp);
                         iter = gAssetStorage->mPendingDownloads.erase(curiter);
@@ -576,7 +577,7 @@ void LLAssetStorage::downloadCompleteCallback(
                 LLAssetRequest* tmp = *curiter;
                 if (tmp->mDownCallback)
                 {
-                        tmp->mDownCallback(gAssetStorage->mVFS, req->getUUID(), req->getType(), tmp->mUserData, result, ext_status);
+                        tmp->mDownCallback(gAssetStorage->mVFS, tmp->getUUID(), tmp->getType(), tmp->mUserData, result, ext_status);
                 }
                 delete tmp;
         }
@@ -672,10 +673,10 @@ void LLAssetStorage::downloadEstateAssetCompleteCallback(
         S32 result,
         const LLUUID& file_id,
         LLAssetType::EType file_type,
-        void* user_data,
+        void* callback_parm_req,
         LLExtStat ext_status)
 {
-        LLEstateAssetRequest *req = (LLEstateAssetRequest*)user_data;
+        LLEstateAssetRequest *req = (LLEstateAssetRequest*)callback_parm_req;
         if(!req)
         {
                 llwarns << "LLAssetStorage::downloadEstateAssetCompleteCallback called"
@@ -689,12 +690,10 @@ void LLAssetStorage::downloadEstateAssetCompleteCallback(
                 return;
         }
 
-        req->setUUID(file_id);
-        req->setType(file_type);
         if (LL_ERR_NOERR == result)
         {
                 // we might have gotten a zero-size file
-                LLVFile vfile(gAssetStorage->mVFS, req->getUUID(), req->getAType());
+                LLVFile vfile(gAssetStorage->mVFS, file_id, file_type);
                 if (vfile.getSize() <= 0)
                 {
                         llwarns << "downloadCompleteCallback has non-existent or zero-size asset!" << llendl;
@@ -704,7 +703,9 @@ void LLAssetStorage::downloadEstateAssetCompleteCallback(
                 }
         }
 
-        req->mDownCallback(gAssetStorage->mVFS, req->getUUID(), req->getAType(), req->mUserData, result, ext_status);
+        req->mDownCallback(gAssetStorage->mVFS, file_id, file_type, req->mUserData, result, ext_status);
+
+        delete req;
 }
 
 void LLAssetStorage::getInvItemAsset(const LLHost &object_sim, const LLUUID &agent_id, const LLUUID &session_id,
@@ -809,10 +810,10 @@ void LLAssetStorage::downloadInvItemCompleteCallback(
         S32 result,
         const LLUUID& file_id,
         LLAssetType::EType file_type,
-        void* user_data,
+        void* callback_parm_req,
         LLExtStat ext_status)
 {
-        LLInvItemRequest *req = (LLInvItemRequest*)user_data;
+        LLInvItemRequest *req = (LLInvItemRequest*)callback_parm_req;
         if(!req)
         {
                 llwarns << "LLAssetStorage::downloadEstateAssetCompleteCallback called"
@@ -825,12 +826,10 @@ void LLAssetStorage::downloadInvItemCompleteCallback(
                 return;
         }
 
-        req->setUUID(file_id);
-        req->setType(file_type);
         if (LL_ERR_NOERR == result)
         {
                 // we might have gotten a zero-size file
-                LLVFile vfile(gAssetStorage->mVFS, req->getUUID(), req->getType());
+                LLVFile vfile(gAssetStorage->mVFS, file_id, file_type);
                 if (vfile.getSize() <= 0)
                 {
                         llwarns << "downloadCompleteCallback has non-existent or zero-size asset!" << llendl;
@@ -840,7 +839,9 @@ void LLAssetStorage::downloadInvItemCompleteCallback(
                 }
         }
 
-        req->mDownCallback(gAssetStorage->mVFS, req->getUUID(), req->getType(), req->mUserData, result, ext_status);
+        req->mDownCallback(gAssetStorage->mVFS, file_id, file_type, req->mUserData, result, ext_status);
+
+        delete req;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index fc2612f..ef163fa 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -160,10 +160,9 @@ namespace
                                 fstream.seekg(0, std::ios::end);
                                 U32 fileSize = fstream.tellg();
                                 fstream.seekg(0, std::ios::beg);
-                                char* fileBuffer;
-                                fileBuffer = new char [fileSize];
-                                fstream.read(fileBuffer, fileSize);
-                                ostream.write(fileBuffer, fileSize);
+                                std::vector<char> fileBuffer(fileSize);
+                                fstream.read(&fileBuffer[0], fileSize);
+                                ostream.write(&fileBuffer[0], fileSize);
                                 fstream.close();
                                 eos = true;
                                 return STATUS_DONE;
@@ -190,10 +189,9 @@ namespace
                         
                         LLVFile vfile(gVFS, mUUID, mAssetType, LLVFile::READ);
                         S32 fileSize = vfile.getSize();
-                        U8* fileBuffer;
-                        fileBuffer = new U8 [fileSize];
-            vfile.read(fileBuffer, fileSize);
-            ostream.write((char*)fileBuffer, fileSize);
+                        std::vector<U8> fileBuffer(fileSize);
+                        vfile.read(&fileBuffer[0], fileSize);
+                        ostream.write((char*)&fileBuffer[0], fileSize);
                         eos = true;
                         return STATUS_DONE;
                 }
diff --git a/linden/indra/llrender/llgl.cpp b/linden/indra/llrender/llgl.cpp
index 843bc79..2cb7adc 100644
--- a/linden/indra/llrender/llgl.cpp
+++ b/linden/indra/llrender/llgl.cpp
@@ -578,7 +578,7 @@ void LLGLManager::initExtensions()
 #else // LL_MESA_HEADLESS
         mHasMultitexture = glh_init_extensions("GL_ARB_multitexture");
         mHasMipMapGeneration = glh_init_extensions("GL_SGIS_generate_mipmap");
-        mHasPalettedTextures = glh_init_extension("GL_EXT_paletted_texture");
+        mHasPalettedTextures = glh_init_extensions("GL_EXT_paletted_texture");
         mHasSeparateSpecularColor = glh_init_extensions("GL_EXT_separate_specular_color");
         mHasAnisotropic = glh_init_extensions("GL_EXT_texture_filter_anisotropic");
         glh_init_extensions("GL_ARB_texture_cube_map");
diff --git a/linden/indra/llrender/llrender.h b/linden/indra/llrender/llrender.h
index 15360a3..ef495ed 100644
--- a/linden/indra/llrender/llrender.h
+++ b/linden/indra/llrender/llrender.h
@@ -214,7 +214,7 @@ public:
 
         LLTexUnit* getTexUnit(U32 index);
 
-        typedef struct Vertex
+        struct Vertex
         {
                 GLfloat v[3];
                 GLubyte c[4];
diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index 0e014d9..8cd2b5c 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -229,7 +229,7 @@ const std::string  LLDir::getCacheDir(bool get_default) const
                 }
                 else
                 {
-                        res = getOSCacheDir() + mDirDelimiter + "SecondLife";
+                        res = getOSCacheDir() + mDirDelimiter + "Imprudence";
                 }
                 return res;
         }
diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp
index fd8f087..548f3da 100644
--- a/linden/indra/llvfs/lldir_mac.cpp
+++ b/linden/indra/llvfs/lldir_mac.cpp
@@ -121,7 +121,7 @@ LLDir_Mac::LLDir_Mac()
         CFStringRef             stringRef = NULL;
         OSStatus                error = noErr;
         FSRef                   fileRef;
-        CFStringRef             secondLifeString = CFSTR("SecondLife");
+        CFStringRef             secondLifeString = CFSTR("Imprudence");
         
         mainBundleRef = CFBundleGetMainBundle();
                 
@@ -172,7 +172,7 @@ LLDir_Mac::LLDir_Mac()
                 if (error == noErr)
                 {
                         FSRefToLLString(&cacheDirRef, mOSCacheDir);
-                        (void)CFCreateDirectory(&cacheDirRef, CFSTR("SecondLife"),NULL);
+                        (void)CFCreateDirectory(&cacheDirRef, CFSTR("Imprudence"),NULL);
                 }
                 
                 // mOSUserAppDir
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index e5d15c4..f0acee5 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -447,7 +447,7 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
 
         // Set the application icon.
         SDL_Surface *bmpsurface;
-        bmpsurface = Load_BMP_Resource("ll_icon.BMP");
+        bmpsurface = Load_BMP_Resource("imprudence_icon.BMP");
         if (bmpsurface)
         {
                 // This attempts to give a black-keyed mask to the icon.
@@ -2530,7 +2530,7 @@ S32 OSMessageBoxSDL(const std::string& text, const std::string& caption, U32 typ
                         buttons = GTK_BUTTONS_YES_NO;
                         break;
                 }
-                win = gtk_message_dialog_new(NULL,flags, messagetype, buttons, text.c_str());
+                win = gtk_message_dialog_new(NULL,flags, messagetype, buttons, "%s", text.c_str());
 
 # if LL_X11
                 // Make GTK tell the window manager to associate this
diff --git a/linden/indra/lscript/lscript_compile/lscript_tree.cpp b/linden/indra/lscript/lscript_compile/lscript_tree.cpp
index 71e7f19..70d8195 100644
--- a/linden/indra/lscript/lscript_compile/lscript_tree.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_tree.cpp
@@ -7885,10 +7885,10 @@ void LLScriptFunctionCall::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
                         {
                                 // Prefix function name with g to distinguish from
                                 // event handlers.
-                                fprintf(fp, gScriptp->getClassName());
+                                fprintf(fp, "%s", gScriptp->getClassName());
                                 fprintf(fp, "::'g");
                         }
-                        fprintf(fp, mIdentifier->mName);
+                        fprintf(fp, "%s", mIdentifier->mName);
                         fprintf(fp, "'(");
                         print_cil_arg_list(fp, mIdentifier->mScopeEntry->mFunctionArgs);
                         fprintf(fp, ")\n");
@@ -9720,7 +9720,7 @@ void LLScriptEventHandler::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
                 // Allows state changing by finding handlers prefixed with new
                 // state name. Prefix disambiguates functions and event handlers.
                 fprintf(fp, "e");
-                fprintf(fp, entry->mIdentifier);
+                fprintf(fp, "%s", entry->mIdentifier);
 
                 // Handler name and arguments.
                 mEventp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -10152,7 +10152,7 @@ void LLScriptGlobalFunctions::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPT
                         fprintf(fp, ".method public hidebysig instance default ");
                         print_cil_type(fp, mType ? mType->mType : LST_NULL);
                         fprintf(fp, " 'g");
-                        fprintf(fp, mIdentifier->mName);
+                        fprintf(fp, "%s", mIdentifier->mName);
                         fprintf(fp, "'");
                         if (mParameters)
                         {
diff --git a/linden/indra/mac_crash_logger/CMakeLists.txt b/linden/indra/mac_crash_logger/CMakeLists.txt
index 9cddb56..371b6fb 100644
--- a/linden/indra/mac_crash_logger/CMakeLists.txt
+++ b/linden/indra/mac_crash_logger/CMakeLists.txt
@@ -47,7 +47,7 @@ set_source_files_properties(
 set_source_files_properties(
   Info.plist
   PROPERTIES
-  MACOSX_PACKAGE_LOCATION . # will it blend? + poppy
+  MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
   )
 SOURCE_GROUP("Resources" FILES ${mac_crash_logger_RESOURCE_FILES})
 list(APPEND mac_crash_logger_SOURCE_FILES ${mac_crash_logger_RESOURCE_FILES})
diff --git a/linden/indra/mac_updater/CMakeLists.txt b/linden/indra/mac_updater/CMakeLists.txt
index 3ac5aee..ef87b29 100644
--- a/linden/indra/mac_updater/CMakeLists.txt
+++ b/linden/indra/mac_updater/CMakeLists.txt
@@ -53,7 +53,7 @@ set_source_files_properties(
 set_source_files_properties(
   Info.plist
   PROPERTIES
-  MACOSX_PACKAGE_LOCATION . # will it blend? + poppy
+  MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
   )
 SOURCE_GROUP("Resources" FILES ${mac_updater_RESOURCE_FILES})
 list(APPEND mac_updater_SOURCE_FILES ${mac_updater_RESOURCE_FILES})
diff --git a/linden/indra/mac_updater/mac_updater.cpp b/linden/indra/mac_updater/mac_updater.cpp
index c2f9f4d..7bffff5 100644
--- a/linden/indra/mac_updater/mac_updater.cpp
+++ b/linden/indra/mac_updater/mac_updater.cpp
@@ -378,7 +378,7 @@ int main(int argc, char **argv)
                 }
                 else
                 {
-                        gProductName = "Second Life";
+                        gProductName = "Imprudence";
                 }
         }
         
@@ -471,7 +471,7 @@ int main(int argc, char **argv)
                 err = CreateStandardAlert(
                                 kAlertStopAlert,
                                 CFSTR("Error"),
-                                CFSTR("An error occurred while updating Second Life.  Please download the latest version from www.secondlife.com."),
+                                CFSTR("An error occurred while updating Imprudence.  Please download the latest version from http://imprudenceviewer.org/download/"),
                                 &params,
                                 &alert);
                 
@@ -934,7 +934,7 @@ void *updatethreadproc(void*)
 
 #endif // 0 *HACK for DEV-11935
                 
-                strncat(temp, "/SecondLifeUpdate_XXXXXX", (sizeof(temp) - strlen(temp)) - 1);
+                strncat(temp, "/ImprudenceUpdate_XXXXXX", (sizeof(temp) - strlen(temp)) - 1);
                 if(mkdtemp(temp) == NULL)
                 {
                         throw 0;
@@ -952,7 +952,7 @@ void *updatethreadproc(void*)
                                 
                 chdir(tempDir);
                 
-                snprintf(temp, sizeof(temp), "SecondLife.dmg");         
+                snprintf(temp, sizeof(temp), "Imprudence.dmg");         
                 
                 downloadFile = LLFile::fopen(temp, "wb");               /* Flawfinder: ignore */
                 if(downloadFile == NULL)
@@ -999,7 +999,7 @@ void *updatethreadproc(void*)
                 // NOTE: we could add -private at the end of this command line to keep the image from showing up in the Finder,
                 //              but if our cleanup fails, this makes it much harder for the user to unmount the image.
                 std::string mountOutput;
-                FILE* mounter = popen("hdiutil attach SecondLife.dmg -mountpoint mnt", "r");            /* Flawfinder: ignore */
+                FILE* mounter = popen("hdiutil attach Imprudence.dmg -mountpoint mnt", "r");            /* Flawfinder: ignore */
                 
                 if(mounter == NULL)
                 {
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index ae0feb6..ddf6897 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -918,6 +918,7 @@ if (WINDOWS)
         res/bitmap2.bmp
         res/circleandline.cur
         res/icon1.ico
+        res/imprudence_icon.png
         res/install_icon.BMP
         res/install_icon.ico
         res/llarrow.cur
@@ -939,7 +940,6 @@ if (WINDOWS)
         res/lltooltranslate.cur
         res/lltoolzoomin.cur
         res/lltoolzoomout.cur
-        res/ll_icon.BMP
         res/ll_icon.ico
         res/loginbackground.bmp
         res/resource.h
@@ -979,7 +979,7 @@ if (WINDOWS)
         comdlg32
         ${DINPUT_LIBRARY}
         ${DXGUID_LIBRARY}
-        fmodvc
+        ${FMOD_LIBRARY}
         gdi32
         kernel32
         odbc32
@@ -1265,15 +1265,15 @@ list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES})
 set_source_files_properties(${viewer_HEADER_FILES}
                             PROPERTIES HEADER_FILE_ONLY TRUE)
 
-add_executable(secondlife-bin
+add_executable(imprudence-bin
     WIN32
     MACOSX_BUNDLE
     ${viewer_SOURCE_FILES}
     )
-check_message_template(secondlife-bin)
+check_message_template(imprudence-bin)
 
 if (LLKDU_LIBRARY)
-  add_dependencies(secondlife-bin ${LLKDU_LIBRARY})
+  add_dependencies(imprudence-bin ${LLKDU_LIBRARY})
 endif (LLKDU_LIBRARY)
 
 set(PACKAGE OFF CACHE BOOL
@@ -1281,12 +1281,12 @@ set(PACKAGE OFF CACHE BOOL
 
 if (WINDOWS)
     if(MSVC71)
-        set(release_flags "/MAP:Release/secondlife-bin.map /MAPINFO:LINES")
+        set(release_flags "/MAP:Release/imprudence-bin.map /MAPINFO:LINES")
     else(MSVC71)
-        set(release_flags "/MAP:Release/secondlife-bin.map")
+        set(release_flags "/MAP:Release/imprudence-bin.map")
     endif(MSVC71)
     
-    set_target_properties(secondlife-bin
+    set_target_properties(imprudence-bin
         PROPERTIES
         LINK_FLAGS "/debug /NODEFAULTLIB:MSVCRT /SUBSYSTEM:WINDOWS"
         LINK_FLAGS_DEBUG "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:MSVCRTD"
@@ -1296,20 +1296,20 @@ if (WINDOWS)
     # sets the 'working directory' for debugging from visual studio.
     if (NOT UNATTENDED)
         add_custom_command(
-            TARGET secondlife-bin PRE_BUILD
+            TARGET imprudence-bin PRE_BUILD
             COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
             ARGS
               --solution 
               ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
               --workingdir
-              secondlife-bin
+              imprudence-bin
               ${CMAKE_CURRENT_SOURCE_DIR}
-            COMMENT "Setting the secondlife-bin working directory for debugging."
+            COMMENT "Setting the imprudence-bin working directory for debugging."
             )
     endif (NOT UNATTENDED)
 
     add_custom_command(
-        TARGET secondlife-bin PRE_BUILD
+        TARGET imprudence-bin PRE_BUILD
         COMMAND ${CMAKE_COMMAND}
         ARGS
           -E
@@ -1320,7 +1320,7 @@ if (WINDOWS)
         )
 
     add_custom_command(
-        TARGET secondlife-bin PRE_BUILD
+        TARGET imprudence-bin PRE_BUILD
         COMMAND ${CMAKE_COMMAND}
         ARGS
           -E
@@ -1330,10 +1330,10 @@ if (WINDOWS)
         COMMENT "Copying message.xml to the runtime folder."
         )
        
-    add_dependencies(secondlife-bin copy_win_libs)
+    add_dependencies(imprudence-bin copy_win_libs)
 
     if (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)
-      add_dependencies(secondlife-bin copy_win_scripts)
+      add_dependencies(imprudence-bin copy_win_scripts)
     endif (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)
         
     add_custom_command(
@@ -1350,7 +1350,7 @@ if (WINDOWS)
               --build=${CMAKE_CURRENT_BINARY_DIR}
               --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
               --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat
-        DEPENDS secondlife-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+        DEPENDS imprudence-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
         )
     if (PACKAGE)
       add_custom_target(package ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat)
@@ -1358,7 +1358,7 @@ if (WINDOWS)
     endif (PACKAGE)
 endif (WINDOWS)
 
-target_link_libraries(secondlife-bin
+target_link_libraries(imprudence-bin
     ${LLAUDIO_LIBRARIES}
     ${LLCHARACTER_LIBRARIES}
     ${LLIMAGE_LIBRARIES}
@@ -1403,13 +1403,13 @@ set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
 
 if (LINUX)
   add_custom_command(
-      OUTPUT secondlife-stripped
+      OUTPUT imprudence-stripped
       COMMAND strip
-      ARGS --strip-debug -o secondlife-stripped secondlife-bin
-      DEPENDS secondlife-bin
+      ARGS --strip-debug -o imprudence-stripped imprudence-bin
+      DEPENDS imprudence-bin
       )
 
-  set(product SecondLife-${ARCH}-${viewer_VERSION})
+  set(product Imprudence-${ARCH}-${viewer_VERSION})
 
   add_custom_command(
       OUTPUT ${product}.tar.bz2
@@ -1426,7 +1426,7 @@ if (LINUX)
         --build=${CMAKE_CURRENT_BINARY_DIR}
         --dest=${CMAKE_CURRENT_BINARY_DIR}/packaged
         --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
-      DEPENDS secondlife-stripped ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+      DEPENDS imprudence-stripped ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
       )
 
   if (NOT INSTALL)
@@ -1436,23 +1436,23 @@ if (LINUX)
 endif (LINUX)
 
 if (DARWIN)
-  set(product "Second Life")
+  set(product "Imprudence")
   set_target_properties(
-    secondlife-bin
+    imprudence-bin
     PROPERTIES
     OUTPUT_NAME "${product}"
     MACOSX_BUNDLE_INFO_STRING "info string - localize me"
     MACOSX_BUNDLE_ICON_FILE "secondlife.icns"
-    MACOSX_BUNDLE_GUI_IDENTIFIER "Second Life"
+    MACOSX_BUNDLE_GUI_IDENTIFIER "Imprudence"
     MACOSX_BUNDLE_LONG_VERSION_STRING "ververver"
-    MACOSX_BUNDLE_BUNDLE_NAME "Second Life"
+    MACOSX_BUNDLE_BUNDLE_NAME "Imprudence"
     MACOSX_BUNDLE_SHORT_VERSION_STRING "asdf"
     MACOSX_BUNDLE_BUNDLE_VERSION "asdf"
     MACOSX_BUNDLE_COPYRIGHT "copyright linden lab 2007 - localize me and run me through a legal wringer"
     )
 
   add_custom_command(
-    TARGET secondlife-bin POST_BUILD
+    TARGET imprudence-bin POST_BUILD
     COMMAND ${PYTHON_EXECUTABLE}
     ARGS
       ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
@@ -1463,7 +1463,7 @@ if (DARWIN)
       --artwork=${ARTWORK_DIR}
       --build=${CMAKE_CURRENT_BINARY_DIR}
       --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app
-    DEPENDS secondlife-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+    DEPENDS imprudence-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
     )
 
   if (PACKAGE)
@@ -1481,7 +1481,7 @@ if (DARWIN)
         --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app
         --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
       DEPENDS
-        secondlife-bin
+        imprudence-bin
         ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
       )
       add_dependencies(package mac-updater mac-crash-logger)
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 881483e..784a1b7 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
-/* Localized versions of Info.plist keys */
-
-CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.20.9.87416";
-CFBundleGetInfoString = "Second Life version 1.20.9.87416, Copyright 2004-2008 Linden Research, Inc.";
-
+/* Localized versions of Info.plist keys */

+

+CFBundleName = "Imprudence";

+CFBundleShortVersionString = "Imprudence version 1.0.0";

+CFBundleGetInfoString = "Imprudence version 1.0.0, Copyright 2004-2008 Linden Research, Inc.";

+

diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist
index b889d45..32bba70 100644
--- a/linden/indra/newview/Info-SecondLife.plist
+++ b/linden/indra/newview/Info-SecondLife.plist
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>CFBundleDevelopmentRegion</key>
-        <string>English</string>
-        <key>CFBundleExecutable</key>
-        <string>Second Life</string>
-        <key>CFBundleIconFile</key>
-        <string>secondlife.icns</string>
-        <key>CFBundleIdentifier</key>
-        <string>com.secondlife.indra.viewer</string>
-        <key>CFBundleInfoDictionaryVersion</key>
-        <string>6.0</string>
-        <key>CFBundleName</key>
-        <string>Second Life</string>
-        <key>CFBundlePackageType</key>
-        <string>APPL</string>
-        <key>CFBundleSignature</key>
-        <string>????</string>
-        <key>CFBundleURLTypes</key>
-        <array>
-                <dict>
-                        <key>CFBundleURLName</key>
-                        <string>Second Life URL</string>
-                        <key>CFBundleURLSchemes</key>
-                        <array>
-                                <string>secondlife</string>
-                        </array>
-                        <key>LSIsAppleDefaultForScheme</key>
-                        <true/>
-                </dict>
-        </array>
-        <key>CFBundleVersion</key>
-        <string>1.20.9.87416</string>
-        <key>CSResourcesFileMapped</key>
-        <true/>
-</dict>
-</plist>
+<?xml version="1.0" encoding="UTF-8"?>

+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">

+<plist version="1.0">

+<dict>

+        <key>CFBundleDevelopmentRegion</key>

+        <string>English</string>

+        <key>CFBundleExecutable</key>

+        <string>Imprudence</string>

+        <key>CFBundleIconFile</key>

+        <string>secondlife.icns</string>

+        <key>CFBundleIdentifier</key>

+        <string>com.secondlife.indra.viewer</string>

+        <key>CFBundleInfoDictionaryVersion</key>

+        <string>6.0</string>

+        <key>CFBundleName</key>

+        <string>Imprudence</string>

+        <key>CFBundlePackageType</key>

+        <string>APPL</string>

+        <key>CFBundleSignature</key>

+        <string>????</string>

+        <key>CFBundleURLTypes</key>

+        <array>

+                <dict>

+                        <key>CFBundleURLName</key>

+                        <string>Second Life URL</string>

+                        <key>CFBundleURLSchemes</key>

+                        <array>

+                                <string>secondlife</string>

+                        </array>

+                        <key>LSIsAppleDefaultForScheme</key>

+                        <true/>

+                </dict>

+        </array>

+        <key>CFBundleVersion</key>

+        <string>1.0.0</string>

+        <key>CSResourcesFileMapped</key>

+        <true/>

+</dict>

+</plist>

diff --git a/linden/indra/newview/SecondLife.nib/objects.xib b/linden/indra/newview/SecondLife.nib/objects.xib
index b7ff30f..07af643 100644
--- a/linden/indra/newview/SecondLife.nib/objects.xib
+++ b/linden/indra/newview/SecondLife.nib/objects.xib
@@ -1,259 +1,259 @@
-<?xml version="1.0" standalone="yes"?>
-<object class="NSIBObjectData">
-  <string name="targetFramework">IBCarbonFramework</string>
-  <object name="rootObject" class="NSCustomObject" id="1">
-    <string name="customClass">NSApplication</string>
-  </object>
-  <array count="31" name="allObjects">
-    <object class="IBCarbonMenu" id="29">
-      <string name="title">SecondLife</string>
-      <array count="4" name="items">
-        <object class="IBCarbonMenuItem" id="182">
-          <string name="title">Second Life</string>
-          <object name="submenu" class="IBCarbonMenu" id="181">
-            <string name="title">Second Life</string>
-            <array count="1" name="items">
-              <object class="IBCarbonMenuItem" id="183">
-                <boolean name="disabled">TRUE</boolean>
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">About Second Life</string>
-                <int name="keyEquivalentModifier">0</int>
-                <ostype name="command">abou</ostype>
-              </object>
-            </array>
-            <string name="name">_NSAppleMenu</string>
-          </object>
-        </object>
-        <object class="IBCarbonMenuItem" id="127">
-          <string name="title">File</string>
-          <object name="submenu" class="IBCarbonMenu" id="131">
-            <string name="title">File</string>
-          </object>
-        </object>
-        <object class="IBCarbonMenuItem" id="152">
-          <string name="title">Edit</string>
-          <object name="submenu" class="IBCarbonMenu" id="147">
-            <string name="title">Edit</string>
-            <array count="10" name="items">
-              <object class="IBCarbonMenuItem" id="141">
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Undo</string>
-                <string name="keyEquivalent">z</string>
-                <ostype name="command">undo</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="146">
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Redo</string>
-                <string name="keyEquivalent">Z</string>
-                <ostype name="command">redo</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="142">
-                <boolean name="separator">TRUE</boolean>
-              </object>
-              <object class="IBCarbonMenuItem" id="143">
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Cut</string>
-                <string name="keyEquivalent">x</string>
-                <ostype name="command">cut </ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="149">
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Copy</string>
-                <string name="keyEquivalent">c</string>
-                <ostype name="command">copy</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="144">
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Paste</string>
-                <string name="keyEquivalent">v</string>
-                <ostype name="command">past</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="151">
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Delete</string>
-                <ostype name="command">clea</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="148">
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Select All</string>
-                <string name="keyEquivalent">a</string>
-                <ostype name="command">sall</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="188">
-                <boolean name="separator">TRUE</boolean>
-              </object>
-              <object class="IBCarbonMenuItem" id="187">
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Special Characters…</string>
-                <ostype name="command">chrp</ostype>
-              </object>
-            </array>
-          </object>
-        </object>
-        <object class="IBCarbonMenuItem" id="153">
-          <string name="title">Window</string>
-          <object name="submenu" class="IBCarbonMenu" id="154">
-            <string name="title">Window</string>
-            <array count="6" name="items">
-              <object class="IBCarbonMenuItem" id="155">
-                <boolean name="dynamic">TRUE</boolean>
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Minimize Window</string>
-                <string name="keyEquivalent">m</string>
-                <ostype name="command">mini</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="184">
-                <boolean name="dynamic">TRUE</boolean>
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Minimize All Windows</string>
-                <string name="keyEquivalent">m</string>
-                <int name="keyEquivalentModifier">1572864</int>
-                <ostype name="command">mina</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="186">
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Zoom</string>
-                <ostype name="command">zoom</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="156">
-                <boolean name="separator">TRUE</boolean>
-              </object>
-              <object class="IBCarbonMenuItem" id="157">
-                <boolean name="dynamic">TRUE</boolean>
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Bring All to Front</string>
-                <ostype name="command">bfrt</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="185">
-                <boolean name="dynamic">TRUE</boolean>
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Arrange in Front</string>
-                <int name="keyEquivalentModifier">1572864</int>
-                <ostype name="command">frnt</ostype>
-              </object>
-            </array>
-            <string name="name">_NSWindowsMenu</string>
-          </object>
-        </object>
-      </array>
-      <string name="name">_NSMainMenu</string>
-    </object>
-    <reference idRef="127"/>
-    <reference idRef="131"/>
-    <reference idRef="141"/>
-    <reference idRef="142"/>
-    <reference idRef="143"/>
-    <reference idRef="144"/>
-    <reference idRef="146"/>
-    <reference idRef="147"/>
-    <reference idRef="148"/>
-    <reference idRef="149"/>
-    <reference idRef="151"/>
-    <reference idRef="152"/>
-    <reference idRef="153"/>
-    <reference idRef="154"/>
-    <reference idRef="155"/>
-    <reference idRef="156"/>
-    <reference idRef="157"/>
-    <reference idRef="181"/>
-    <reference idRef="182"/>
-    <reference idRef="183"/>
-    <reference idRef="184"/>
-    <reference idRef="185"/>
-    <reference idRef="186"/>
-    <reference idRef="187"/>
-    <reference idRef="188"/>
-    <object class="IBCarbonRootControl" id="190">
-      <string name="bounds">0 0 482 694 </string>
-      <string name="viewFrame">0 0 694 482 </string>
-      <array count="2" name="subviews">
-        <object class="IBCarbonButton" id="192">
-          <string name="bounds">442 604 462 674 </string>
-          <string name="viewFrame">604 442 70 20 </string>
-          <string name="title">OK</string>
-          <ostype name="command">ok  </ostype>
-          <object name="layoutInfo" class="IBCarbonHILayoutInfo">
-            <int name="bindingBottomKind">2</int>
-            <int name="bindingRightKind">2</int>
-          </object>
-          <int name="buttonType">1</int>
-        </object>
-        <object class="IBCarbonScrollView" id="201">
-          <string name="bounds">20 20 422 674 </string>
-          <string name="viewFrame">20 20 654 402 </string>
-          <array count="1" name="subviews">
-            <object class="IBCarbonTextView" id="200">
-              <string name="bounds">20 20 422 659 </string>
-              <string name="viewFrame">0 0 639 402 </string>
-              <ostype name="controlSignature">text</ostype>
-              <int name="fontStyle">5</int>
-              <boolean name="readOnly">TRUE</boolean>
-            </object>
-          </array>
-          <boolean name="scrollHorizontally">FALSE</boolean>
-        </object>
-      </array>
-    </object>
-    <object class="IBCarbonWindow" id="191">
-      <string name="windowRect">84 72 566 766 </string>
-      <string name="title">Release Notes</string>
-      <reference name="rootControl" idRef="190"/>
-      <boolean name="receiveUpdates">FALSE</boolean>
-      <boolean name="hasCloseBox">FALSE</boolean>
-      <boolean name="hasCollapseBox">FALSE</boolean>
-      <boolean name="hasHorizontalZoom">FALSE</boolean>
-      <boolean name="isResizable">FALSE</boolean>
-      <boolean name="hasVerticalZoom">FALSE</boolean>
-      <boolean name="liveResize">TRUE</boolean>
-      <boolean name="compositing">TRUE</boolean>
-      <int name="carbonWindowClass">4</int>
-      <int name="windowPosition">1</int>
-      <boolean name="isConstrained">FALSE</boolean>
-    </object>
-    <reference idRef="192"/>
-    <reference idRef="200"/>
-    <reference idRef="201"/>
-  </array>
-  <array count="31" name="allParents">
-    <reference idRef="1"/>
-    <reference idRef="29"/>
-    <reference idRef="127"/>
-    <reference idRef="147"/>
-    <reference idRef="147"/>
-    <reference idRef="147"/>
-    <reference idRef="147"/>
-    <reference idRef="147"/>
-    <reference idRef="152"/>
-    <reference idRef="147"/>
-    <reference idRef="147"/>
-    <reference idRef="147"/>
-    <reference idRef="29"/>
-    <reference idRef="29"/>
-    <reference idRef="153"/>
-    <reference idRef="154"/>
-    <reference idRef="154"/>
-    <reference idRef="154"/>
-    <reference idRef="182"/>
-    <reference idRef="29"/>
-    <reference idRef="181"/>
-    <reference idRef="154"/>
-    <reference idRef="154"/>
-    <reference idRef="154"/>
-    <reference idRef="147"/>
-    <reference idRef="147"/>
-    <reference idRef="191"/>
-    <reference idRef="1"/>
-    <reference idRef="190"/>
-    <reference idRef="201"/>
-    <reference idRef="190"/>
-  </array>
-  <dictionary count="3" name="nameTable">
-    <string>Files Owner</string>
-    <reference idRef="1"/>
-    <string>MenuBar</string>
-    <reference idRef="29"/>
-    <string>Release Notes</string>
-    <reference idRef="191"/>
-  </dictionary>
-  <unsigned_int name="nextObjectID">202</unsigned_int>
-</object>
+<?xml version="1.0" standalone="yes"?>

+<object class="NSIBObjectData">

+  <string name="targetFramework">IBCarbonFramework</string>

+  <object name="rootObject" class="NSCustomObject" id="1">

+    <string name="customClass">NSApplication</string>

+  </object>

+  <array count="31" name="allObjects">

+    <object class="IBCarbonMenu" id="29">

+      <string name="title">Imprudence</string>

+      <array count="4" name="items">

+        <object class="IBCarbonMenuItem" id="182">

+          <string name="title">Imprudence</string>

+          <object name="submenu" class="IBCarbonMenu" id="181">

+            <string name="title">Imprudence</string>

+            <array count="1" name="items">

+              <object class="IBCarbonMenuItem" id="183">

+                <boolean name="disabled">TRUE</boolean>

+                <boolean name="updateSingleItem">TRUE</boolean>

+                <string name="title">About Imprudence</string>

+                <int name="keyEquivalentModifier">0</int>

+                <ostype name="command">abou</ostype>

+              </object>

+            </array>

+            <string name="name">_NSAppleMenu</string>

+          </object>

+        </object>

+        <object class="IBCarbonMenuItem" id="127">

+          <string name="title">File</string>

+          <object name="submenu" class="IBCarbonMenu" id="131">

+            <string name="title">File</string>

+          </object>

+        </object>

+        <object class="IBCarbonMenuItem" id="152">

+          <string name="title">Edit</string>

+          <object name="submenu" class="IBCarbonMenu" id="147">

+            <string name="title">Edit</string>

+            <array count="10" name="items">

+              <object class="IBCarbonMenuItem" id="141">

+                <boolean name="updateSingleItem">TRUE</boolean>

+                <string name="title">Undo</string>

+                <string name="keyEquivalent">z</string>

+                <ostype name="command">undo</ostype>

+              </object>

+              <object class="IBCarbonMenuItem" id="146">

+                <boolean name="updateSingleItem">TRUE</boolean>

+                <string name="title">Redo</string>

+                <string name="keyEquivalent">Z</string>

+                <ostype name="command">redo</ostype>

+              </object>

+              <object class="IBCarbonMenuItem" id="142">

+                <boolean name="separator">TRUE</boolean>

+              </object>

+              <object class="IBCarbonMenuItem" id="143">

+                <boolean name="updateSingleItem">TRUE</boolean>

+                <string name="title">Cut</string>

+                <string name="keyEquivalent">x</string>

+                <ostype name="command">cut </ostype>

+              </object>

+              <object class="IBCarbonMenuItem" id="149">

+                <boolean name="updateSingleItem">TRUE</boolean>

+                <string name="title">Copy</string>

+                <string name="keyEquivalent">c</string>

+                <ostype name="command">copy</ostype>

+              </object>

+              <object class="IBCarbonMenuItem" id="144">

+                <boolean name="updateSingleItem">TRUE</boolean>

+                <string name="title">Paste</string>

+                <string name="keyEquivalent">v</string>

+                <ostype name="command">past</ostype>

+              </object>

+              <object class="IBCarbonMenuItem" id="151">

+                <boolean name="updateSingleItem">TRUE</boolean>

+                <string name="title">Delete</string>

+                <ostype name="command">clea</ostype>

+              </object>

+              <object class="IBCarbonMenuItem" id="148">

+                <boolean name="updateSingleItem">TRUE</boolean>

+                <string name="title">Select All</string>

+                <string name="keyEquivalent">a</string>

+                <ostype name="command">sall</ostype>

+              </object>

+              <object class="IBCarbonMenuItem" id="188">

+                <boolean name="separator">TRUE</boolean>

+              </object>

+              <object class="IBCarbonMenuItem" id="187">

+                <boolean name="updateSingleItem">TRUE</boolean>

+                <string name="title">Special Characters…</string>

+                <ostype name="command">chrp</ostype>

+              </object>

+            </array>

+          </object>

+        </object>

+        <object class="IBCarbonMenuItem" id="153">

+          <string name="title">Window</string>

+          <object name="submenu" class="IBCarbonMenu" id="154">

+            <string name="title">Window</string>

+            <array count="6" name="items">

+              <object class="IBCarbonMenuItem" id="155">

+                <boolean name="dynamic">TRUE</boolean>

+                <boolean name="updateSingleItem">TRUE</boolean>

+                <string name="title">Minimize Window</string>

+                <string name="keyEquivalent">m</string>

+                <ostype name="command">mini</ostype>

+              </object>

+              <object class="IBCarbonMenuItem" id="184">

+                <boolean name="dynamic">TRUE</boolean>

+                <boolean name="updateSingleItem">TRUE</boolean>

+                <string name="title">Minimize All Windows</string>

+                <string name="keyEquivalent">m</string>

+                <int name="keyEquivalentModifier">1572864</int>

+                <ostype name="command">mina</ostype>

+              </object>

+              <object class="IBCarbonMenuItem" id="186">

+                <boolean name="updateSingleItem">TRUE</boolean>

+                <string name="title">Zoom</string>

+                <ostype name="command">zoom</ostype>

+              </object>

+              <object class="IBCarbonMenuItem" id="156">

+                <boolean name="separator">TRUE</boolean>

+              </object>

+              <object class="IBCarbonMenuItem" id="157">

+                <boolean name="dynamic">TRUE</boolean>

+                <boolean name="updateSingleItem">TRUE</boolean>

+                <string name="title">Bring All to Front</string>

+                <ostype name="command">bfrt</ostype>

+              </object>

+              <object class="IBCarbonMenuItem" id="185">

+                <boolean name="dynamic">TRUE</boolean>

+                <boolean name="updateSingleItem">TRUE</boolean>

+                <string name="title">Arrange in Front</string>

+                <int name="keyEquivalentModifier">1572864</int>

+                <ostype name="command">frnt</ostype>

+              </object>

+            </array>

+            <string name="name">_NSWindowsMenu</string>

+          </object>

+        </object>

+      </array>

+      <string name="name">_NSMainMenu</string>

+    </object>

+    <reference idRef="127"/>

+    <reference idRef="131"/>

+    <reference idRef="141"/>

+    <reference idRef="142"/>

+    <reference idRef="143"/>

+    <reference idRef="144"/>

+    <reference idRef="146"/>

+    <reference idRef="147"/>

+    <reference idRef="148"/>

+    <reference idRef="149"/>

+    <reference idRef="151"/>

+    <reference idRef="152"/>

+    <reference idRef="153"/>

+    <reference idRef="154"/>

+    <reference idRef="155"/>

+    <reference idRef="156"/>

+    <reference idRef="157"/>

+    <reference idRef="181"/>

+    <reference idRef="182"/>

+    <reference idRef="183"/>

+    <reference idRef="184"/>

+    <reference idRef="185"/>

+    <reference idRef="186"/>

+    <reference idRef="187"/>

+    <reference idRef="188"/>

+    <object class="IBCarbonRootControl" id="190">

+      <string name="bounds">0 0 482 694 </string>

+      <string name="viewFrame">0 0 694 482 </string>

+      <array count="2" name="subviews">

+        <object class="IBCarbonButton" id="192">

+          <string name="bounds">442 604 462 674 </string>

+          <string name="viewFrame">604 442 70 20 </string>

+          <string name="title">OK</string>

+          <ostype name="command">ok  </ostype>

+          <object name="layoutInfo" class="IBCarbonHILayoutInfo">

+            <int name="bindingBottomKind">2</int>

+            <int name="bindingRightKind">2</int>

+          </object>

+          <int name="buttonType">1</int>

+        </object>

+        <object class="IBCarbonScrollView" id="201">

+          <string name="bounds">20 20 422 674 </string>

+          <string name="viewFrame">20 20 654 402 </string>

+          <array count="1" name="subviews">

+            <object class="IBCarbonTextView" id="200">

+              <string name="bounds">20 20 422 659 </string>

+              <string name="viewFrame">0 0 639 402 </string>

+              <ostype name="controlSignature">text</ostype>

+              <int name="fontStyle">5</int>

+              <boolean name="readOnly">TRUE</boolean>

+            </object>

+          </array>

+          <boolean name="scrollHorizontally">FALSE</boolean>

+        </object>

+      </array>

+    </object>

+    <object class="IBCarbonWindow" id="191">

+      <string name="windowRect">84 72 566 766 </string>

+      <string name="title">Release Notes</string>

+      <reference name="rootControl" idRef="190"/>

+      <boolean name="receiveUpdates">FALSE</boolean>

+      <boolean name="hasCloseBox">FALSE</boolean>

+      <boolean name="hasCollapseBox">FALSE</boolean>

+      <boolean name="hasHorizontalZoom">FALSE</boolean>

+      <boolean name="isResizable">FALSE</boolean>

+      <boolean name="hasVerticalZoom">FALSE</boolean>

+      <boolean name="liveResize">TRUE</boolean>

+      <boolean name="compositing">TRUE</boolean>

+      <int name="carbonWindowClass">4</int>

+      <int name="windowPosition">1</int>

+      <boolean name="isConstrained">FALSE</boolean>

+    </object>

+    <reference idRef="192"/>

+    <reference idRef="200"/>

+    <reference idRef="201"/>

+  </array>

+  <array count="31" name="allParents">

+    <reference idRef="1"/>

+    <reference idRef="29"/>

+    <reference idRef="127"/>

+    <reference idRef="147"/>

+    <reference idRef="147"/>

+    <reference idRef="147"/>

+    <reference idRef="147"/>

+    <reference idRef="147"/>

+    <reference idRef="152"/>

+    <reference idRef="147"/>

+    <reference idRef="147"/>

+    <reference idRef="147"/>

+    <reference idRef="29"/>

+    <reference idRef="29"/>

+    <reference idRef="153"/>

+    <reference idRef="154"/>

+    <reference idRef="154"/>

+    <reference idRef="154"/>

+    <reference idRef="182"/>

+    <reference idRef="29"/>

+    <reference idRef="181"/>

+    <reference idRef="154"/>

+    <reference idRef="154"/>

+    <reference idRef="154"/>

+    <reference idRef="147"/>

+    <reference idRef="147"/>

+    <reference idRef="191"/>

+    <reference idRef="1"/>

+    <reference idRef="190"/>

+    <reference idRef="201"/>

+    <reference idRef="190"/>

+  </array>

+  <dictionary count="3" name="nameTable">

+    <string>Files Owner</string>

+    <reference idRef="1"/>

+    <string>MenuBar</string>

+    <reference idRef="29"/>

+    <string>Release Notes</string>

+    <reference idRef="191"/>

+  </dictionary>

+  <unsigned_int name="nextObjectID">202</unsigned_int>

+</object>

diff --git a/linden/indra/newview/ViewerInstall.cmake b/linden/indra/newview/ViewerInstall.cmake
index 55069ad..bc839c4 100644
--- a/linden/indra/newview/ViewerInstall.cmake
+++ b/linden/indra/newview/ViewerInstall.cmake
@@ -1,4 +1,4 @@
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/secondlife-bin
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/imprudence-bin
         DESTINATION ${APP_BINARY_DIR}
         )
 
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 2083877..ca3dd81 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -664,27 +664,38 @@
         <integer>0</integer>
       </array>
     </map>
-    <key>BeaconAlwaysOn</key>
+    <key>BeaconsEnabled</key>
     <map>
       <key>Comment</key>
       <string>Beacons / highlighting always on</string>
       <key>Persist</key>
-      <integer>1</integer>
+      <integer>0</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>BrowserHomePage</key>
+    <key>BrowserHome</key>
     <map>
       <key>Comment</key>
-      <string>[NOT USED]</string>
+      <string>Inworld browser home page</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://www.secondlife.com</string>
+      <string>http://www.imprudenceviewer.org</string>
+    </map>
+    <key>BrowserLastVisited</key>
+    <map>
+      <key>Comment</key>
+      <string>Last visited page</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string></string>
     </map>
     <key>BlockAvatarAppearanceMessages</key>
         <map>
@@ -3472,7 +3483,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>profontwindows.ttf</string>
+      <string>VeraMono.ttf</string>
     </map>
     <key>FontSansSerif</key>
     <map>
@@ -3483,7 +3494,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>MtBkLfRg.ttf</string>
+      <string>LiberationSans-Regular.ttf</string>
     </map>
     <key>FontSansSerifBold</key>
     <map>
@@ -3494,7 +3505,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>MtBdLfRg.ttf</string>
+      <string>LiberationSans-Bold.ttf</string>
     </map>
     <key>FontSansSerifFallback</key>
     <map>
@@ -3538,7 +3549,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>16.0</real>
+      <real>15.2</real>
     </map>
     <key>FontSizeLarge</key>
     <map>
@@ -3549,7 +3560,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>12.0</real>
+      <real>11.5</real>
     </map>
     <key>FontSizeMedium</key>
     <map>
@@ -3560,7 +3571,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>10.0</real>
+      <real>9.5</real>
     </map>
     <key>FontSizeMonospace</key>
     <map>
@@ -3571,7 +3582,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>9.0</real>
+      <real>8.0</real>
     </map>
     <key>FontSizeSmall</key>
     <map>
@@ -3582,7 +3593,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>9.0</real>
+      <real>8.5</real>
     </map>
     <key>ForceShowGrid</key>
     <map>
@@ -6676,6 +6687,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>SelectCopyableOnly</key>
+    <map>
+      <key>Comment</key>
+      <string>Select only objects you can copy</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>SelectOwnedOnly</key>
     <map>
       <key>Comment</key>
@@ -9533,7 +9555,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>Second Life Release</string>
+      <string>Imprudence</string>
     </map>
     <key>VertexShaderEnable</key>
     <map>
diff --git a/linden/indra/newview/fonts/GPL.txt b/linden/indra/newview/fonts/GPL.txt
new file mode 100644
index 0000000..d60c31a
--- /dev/null
+++ b/linden/indra/newview/fonts/GPL.txt
@@ -0,0 +1,340 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+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 give any other recipients of the Program a copy of this License
+along with the Program.
+
+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 Program or any portion
+of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+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 Program, 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 Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) 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; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, 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 executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or 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 counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program 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.
+
+  5. 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 Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. 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 Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program 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 Program.
+
+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.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program 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.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the 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 Program
+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 Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, 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
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), 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 Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  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 program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/linden/indra/newview/fonts/Liberation-License.txt b/linden/indra/newview/fonts/Liberation-License.txt
new file mode 100644
index 0000000..f178728
--- /dev/null
+++ b/linden/indra/newview/fonts/Liberation-License.txt
@@ -0,0 +1,19 @@
+LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY
+LIBERATION FONT SOFTWARE
+
+This agreement governs the use of the Software and any updates to the Software, regardless of the delivery mechanism. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to the user ("Client") a license to this work pursuant to the GNU General Public License v.2 with the exceptions set forth below and such other terms as are set forth in this End User License Agreement.
+
+ 1. The Software and License Exception. LIBERATION font software  (the "Software") consists of TrueType-OpenType formatted font software for rendering LIBERATION typefaces in sans-serif, serif, and monospaced character styles. You are licensed to use, modify, copy, and distribute the Software pursuant to the GNU General Public License v.2 with the following exceptions:  
+
+  (a) As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version.
+
+  (b) As a further exception, any distribution of the object code of the Software in a physical product must provide you the right to access and modify the source code for the Software and to reinstall that modified version of the Software in object code form on the same physical product on which you received it.
+
+ 2. Intellectual Property Rights. The Software and each of its components, including the source code, documentation, appearance, structure and organization are owned by Red Hat and others and are protected under copyright and other laws. Title to the Software and any component, or to any copy, modification, or merged portion shall remain with the aforementioned, subject to the applicable license. The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other countries. This agreement does not permit Client to distribute modified versions of the Software using Red Hat's trademarks. If Client makes a redistribution of a modified version of the Software, then Client must modify the files names to remove any reference to the Red Hat trademarks and must not use the Red Hat trademarks in any way to reference or promote the modified Software. 
+
+ 3. Limited Warranty. To the maximum extent permitted under applicable law, the Software is provided and licensed "as is" without warranty of any kind, expressed or implied, including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. Red Hat does not warrant that the functions contained in the Software will meet Client's requirements or that the operation of the Software will be entirely error free or appear precisely as described in the accompanying documentation. 
+
+ 4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential damages, including lost profits or lost savings arising out of the use or inability to use the Software, even if Red Hat or such dealer has been advised of the possibility of such damages. 
+
+ 5. General. If any provision of this agreement is held to be unenforceable, that shall not affect the enforceability of the remaining provisions. This agreement shall be governed by the laws of the State of North Carolina and of the United States, without regard to any conflict of laws provisions, except that the United Nations Convention on the International Sale of Goods shall not apply.
+Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark of Red Hat, Inc.
diff --git a/linden/indra/newview/fonts/LiberationSans-Bold.ttf b/linden/indra/newview/fonts/LiberationSans-Bold.ttf
new file mode 100644
index 0000000..53200d9
--- /dev/null
+++ b/linden/indra/newview/fonts/LiberationSans-Bold.ttf
diff --git a/linden/indra/newview/fonts/LiberationSans-Regular.ttf b/linden/indra/newview/fonts/LiberationSans-Regular.ttf
new file mode 100644
index 0000000..09fac2f
--- /dev/null
+++ b/linden/indra/newview/fonts/LiberationSans-Regular.ttf
diff --git a/linden/indra/newview/fonts/Vera-License.txt b/linden/indra/newview/fonts/Vera-License.txt
new file mode 100644
index 0000000..e651be1
--- /dev/null
+++ b/linden/indra/newview/fonts/Vera-License.txt
@@ -0,0 +1,124 @@
+Bitstream Vera Fonts Copyright
+
+The fonts have a generous copyright, allowing derivative works (as
+long as "Bitstream" or "Vera" are not in the names), and full
+redistribution (so long as they are not *sold* by themselves). They
+can be be bundled, redistributed and sold with any software.
+
+The fonts are distributed under the following copyright:
+
+Copyright
+=========
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream
+Vera is a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute
+the Font Software, including without limitation the rights to use,
+copy, merge, publish, distribute, and/or sell copies of the Font
+Software, and to permit persons to whom the Font Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software
+typefaces.
+
+The Font Software may be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may be
+modified and additional glyphs or characters may be added to the
+Fonts, only if the fonts are renamed to names not containing either
+the words "Bitstream" or the word "Vera".
+
+This License becomes null and void to the extent applicable to Fonts
+or Font Software that has been modified and is distributed under the
+"Bitstream Vera" names.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
+OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font
+Software without prior written authorization from the Gnome Foundation
+or Bitstream Inc., respectively. For further information, contact:
+fonts at gnome dot org.
+
+Copyright FAQ
+=============
+
+   1. I don't understand the resale restriction... What gives?
+
+      Bitstream is giving away these fonts, but wishes to ensure its
+      competitors can't just drop the fonts as is into a font sale system
+      and sell them as is. It seems fair that if Bitstream can't make money
+      from the Bitstream Vera fonts, their competitors should not be able to
+      do so either. You can sell the fonts as part of any software package,
+      however.
+
+   2. I want to package these fonts separately for distribution and
+      sale as part of a larger software package or system.  Can I do so?
+
+      Yes. A RPM or Debian package is a "larger software package" to begin 
+      with, and you aren't selling them independently by themselves. 
+      See 1. above.
+
+   3. Are derivative works allowed?
+      Yes!
+
+   4. Can I change or add to the font(s)?
+      Yes, but you must change the name(s) of the font(s).
+
+   5. Under what terms are derivative works allowed?
+
+      You must change the name(s) of the fonts. This is to ensure the
+      quality of the fonts, both to protect Bitstream and Gnome. We want to
+      ensure that if an application has opened a font specifically of these
+      names, it gets what it expects (though of course, using fontconfig,
+      substitutions could still could have occurred during font
+      opening). You must include the Bitstream copyright. Additional
+      copyrights can be added, as per copyright law. Happy Font Hacking!
+
+   6. If I have improvements for Bitstream Vera, is it possible they might get 
+       adopted in future versions?
+
+      Yes. The contract between the Gnome Foundation and Bitstream has
+      provisions for working with Bitstream to ensure quality additions to
+      the Bitstream Vera font family. Please contact us if you have such
+      additions. Note, that in general, we will want such additions for the
+      entire family, not just a single font, and that you'll have to keep
+      both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add
+      glyphs to the font, they must be stylistically in keeping with Vera's
+      design. Vera cannot become a "ransom note" font. Jim Lyles will be
+      providing a document describing the design elements used in Vera, as a
+      guide and aid for people interested in contributing to Vera.
+
+   7. I want to sell a software package that uses these fonts: Can I do so?
+
+      Sure. Bundle the fonts with your software and sell your software
+      with the fonts. That is the intent of the copyright.
+
+   8. If applications have built the names "Bitstream Vera" into them, 
+      can I override this somehow to use fonts of my choosing?
+
+      This depends on exact details of the software. Most open source
+      systems and software (e.g., Gnome, KDE, etc.) are now converting to
+      use fontconfig (see www.fontconfig.org) to handle font configuration,
+      selection and substitution; it has provisions for overriding font
+      names and subsituting alternatives. An example is provided by the
+      supplied local.conf file, which chooses the family Bitstream Vera for
+      "sans", "serif" and "monospace".  Other software (e.g., the XFree86
+      core server) has other mechanisms for font substitution.
+
diff --git a/linden/indra/newview/fonts/VeraMono.ttf b/linden/indra/newview/fonts/VeraMono.ttf
new file mode 100644
index 0000000..139f0b4
--- /dev/null
+++ b/linden/indra/newview/fonts/VeraMono.ttf
diff --git a/linden/indra/newview/installers/windows/installer_template.nsi b/linden/indra/newview/installers/windows/installer_template.nsi
index c795507..53c607c 100644
--- a/linden/indra/newview/installers/windows/installer_template.nsi
+++ b/linden/indra/newview/installers/windows/installer_template.nsi
@@ -1,990 +1,990 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; secondlife setup.nsi
-;; Copyright 2004-2007, Linden Research, Inc.
-;; For info, see http://www.nullsoft.com/free/nsis/
-;;
-;; NSIS 2.22 or higher required
-;; Author: James Cook, Don Kjer, Callum Prentice
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Detect NSIS compiler version
-!define "NSIS${NSIS_VERSION}"
-!ifdef "NSISv2.02" | "NSISv2.03" | "NSISv2.04" | "NSISv2.05" | "NSISv2.06"
-    ;; before 2.07 defaulted lzma to solid (whole file)
-    SetCompressor lzma
-!else
-    ;; after 2.07 required /solid for whole file compression
-    SetCompressor /solid lzma
-!endif
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Compiler flags
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-SetOverwrite on                         ; overwrite files
-SetCompress auto                        ; compress iff saves space
-SetDatablockOptimize off        ; only saves us 0.1%, not worth it
-XPStyle on                  ; add an XP manifest to the installer
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Project flags
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-%%VERSION%%
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; - language files - one for each language (or flavor thereof)
-;; (these files are in the same place as the nsi template but the python script generates a new nsi file in the 
-;; application directory so we have to add a path to these include files)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-!include "%%SOURCE%%\installers\windows\lang_de.nsi"
-!include "%%SOURCE%%\installers\windows\lang_en-us.nsi"
-!include "%%SOURCE%%\installers\windows\lang_ja.nsi"
-!include "%%SOURCE%%\installers\windows\lang_ko.nsi"
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Tweak for different servers/builds (this placeholder is replaced by viewer_manifest.py)
-%%GRID_VARS%%
-
-Name ${INSTNAME}
-
-SubCaption 0 $(LicenseSubTitleSetup)    ; override "license agreement" text
-
-BrandingText " "                                                ; bottom of window text
-Icon %%SOURCE%%\res\install_icon.ico    ; our custom icon
-UninstallIcon %%SOURCE%%\res\uninstall_icon.ico    ; our custom icon
-WindowIcon on                                                   ; show our icon in left corner
-BGGradient off                                                  ; no big background window
-CRCCheck on                                                             ; make sure CRC is OK
-InstProgressFlags smooth colored                ; new colored smooth look
-ShowInstDetails nevershow                               ; no details, no "show" button
-SetOverwrite on                                                 ; stomp files by default
-AutoCloseWindow true                                    ; after all files install, close window
-
-InstallDir "$PROGRAMFILES\${INSTNAME}"
-InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" ""
-!ifdef UPDATE
-DirText $(DirectoryChooseTitle) $(DirectoryChooseUpdate)
-!else
-DirText $(DirectoryChooseTitle) $(DirectoryChooseSetup)
-!endif
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Variables
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Var INSTPROG
-Var INSTEXE
-Var INSTFLAGS
-Var LANGFLAGS
-Var INSTSHORTCUT
-
-;;; Function definitions should go before file includes, because the NSIS package
-;;; is a single stream of bytecodes + file data.  So if your function definitions are at
-;;; the end of the file it has to decompress the whole thing before it can call a function. JC
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; PostInstallExe
-; This just runs any post installation scripts.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function PostInstallExe
-push $0
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "PostInstallExe"
-  ;MessageBox MB_OK '$0'
-  ExecWait '$0'
-pop $0
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; CheckStartupParameters
-; Sets INSTFLAGS, INSTPROG, and INSTEXE.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function CheckStartupParams
-push $0
-push $R0
-
-  ; Look for a registry entry with info about where to update.
-  Call GetProgramName
-  pop $R0
-  StrCpy $INSTPROG "$R0"
-  StrCpy $INSTEXE "$R0.exe"
-
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""
-  ; If key doesn't exist, skip install
-  IfErrors ABORT
-  StrCpy $INSTDIR "$0"
-
-  ; We now have a directory to install to.  Get the startup parameters and shortcut as well.
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags"
-  IfErrors +2
-  StrCpy $INSTFLAGS "$0"
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut"
-  IfErrors +2
-  StrCpy $INSTSHORTCUT "$0"
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe"
-  IfErrors +2
-  StrCpy $INSTEXE "$0"
-  Goto FINISHED
-
-ABORT:
-  MessageBox MB_OK $(CheckStartupParamsMB)
-  Quit
-
-FINISHED:
-  ;MessageBox MB_OK "INSTPROG: $INSTPROG, INSTEXE: $INSTEXE, INSTFLAGS: $INSTFLAGS"
-pop $R0
-pop $0
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function un.CheckStartupParams
-push $0
-push $R0
-
-  ; Look for a registry entry with info about where to update.
-  Call un.GetProgramName
-  pop $R0
-  StrCpy $INSTPROG "$R0"
-  StrCpy $INSTEXE "$R0.exe"
-
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""
-  ; If key doesn't exist, skip install
-  IfErrors ABORT
-  StrCpy $INSTDIR "$0"
-
-  ; We now have a directory to install to.  Get the startup parameters and shortcut as well.
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags"
-  IfErrors +2
-  StrCpy $INSTFLAGS "$0"
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut"
-  IfErrors +2
-  StrCpy $INSTSHORTCUT "$0"
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe"
-  IfErrors +2
-  StrCpy $INSTEXE "$0"
-  Goto FINISHED
-
-ABORT:
-  MessageBox MB_OK $(CheckStartupParamsMB)
-  Quit
-
-FINISHED:
-  ;MessageBox MB_OK "INSTPROG: $INSTPROG, INSTEXE: $INSTEXE, INSTFLAGS: $INSTFLAGS"
-pop $R0
-pop $0
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; After install completes, offer readme file
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function .onInstSuccess
-        MessageBox MB_YESNO \
-        $(InstSuccesssQuestion) /SD IDYES IDNO NoReadme
-                ; Assumes SetOutPath $INSTDIR
-                Exec '"$INSTDIR\$INSTEXE" $INSTFLAGS'
-        NoReadme:
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Remove old NSIS version. Modifies no variables.
-; Does NOT delete the LindenWorld directory, or any
-; user files in that directory.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function RemoveNSIS
-  Push $0
-  ; Grab the installation directory of the old version
-  DetailPrint $(RemoveOldNSISVersion)
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""
-
-  ; If key doesn't exist, skip uninstall
-  IfErrors NO_NSIS
-
-  ; Clean up legacy beta shortcuts
-  Delete "$SMPROGRAMS\Second Life Beta.lnk"
-  Delete "$DESKTOP\Second Life Beta.lnk"
-  Delete "$SMPROGRAMS\Second Life.lnk"
-  
-  ; Clean up old newview.exe file
-  Delete "$INSTDIR\newview.exe"
-
-  ; Intentionally don't delete the stuff in
-  ; Documents and Settings, so we keep the user's settings
-
-  NO_NSIS:
-  Pop $0
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Make sure we're not on Windows 98 / ME
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function CheckWindowsVersion
-        DetailPrint "Checking Windows version..."
-        Call GetWindowsVersion
-        Pop $R0
-        ; Just get first two characters, ignore 4.0 part of "NT 4.0"
-        StrCpy $R0 $R0 2
-        ; Blacklist certain OS versions
-        StrCmp $R0 "95" win_ver_bad
-        StrCmp $R0 "98" win_ver_bad
-        StrCmp $R0 "ME" win_ver_bad
-        StrCmp $R0 "NT" win_ver_bad
-        Return
-win_ver_bad:
-        MessageBox MB_YESNO $(CheckWindowsVersionMB) IDNO win_ver_abort
-        Return
-win_ver_abort:
-        Quit
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Make sure the user can install/uninstall
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function CheckIfAdministrator
-                DetailPrint $(CheckAdministratorInstDP)
-         UserInfo::GetAccountType
-         Pop $R0
-         StrCmp $R0 "Admin" is_admin
-         MessageBox MB_OK $(CheckAdministratorInstMB)
-         Quit
-is_admin:
-         Return
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function un.CheckIfAdministrator
-        DetailPrint $(CheckAdministratorUnInstDP)
-         UserInfo::GetAccountType
-         Pop $R0
-         StrCmp $R0 "Admin" is_admin
-         MessageBox MB_OK $(CheckAdministratorUnInstMB)
-         Quit
-is_admin:
-         Return
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Checks to see if the current version has already been installed (according to the registry).
-; If it has, allow user to bail out of install process.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function CheckIfAlreadyCurrent
-  Push $0
-        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version"
-    StrCmp $0 ${VERSION_LONG} 0 DONE
-        MessageBox MB_OKCANCEL $(CheckIfCurrentMB) /SD IDOK IDOK DONE
-    Quit
-
-  DONE:
-    Pop $0
-    Return
-FunctionEnd
-        
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Close the program, if running. Modifies no variables.
-; Allows user to bail out of install process.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function CloseSecondLife
-  Push $0
-  FindWindow $0 "Second Life" ""
-  IntCmp $0 0 DONE
-  MessageBox MB_OKCANCEL $(CloseSecondLifeInstMB) IDOK CLOSE IDCANCEL CANCEL_INSTALL
-
-  CANCEL_INSTALL:
-    Quit
-
-  CLOSE:
-    DetailPrint $(CloseSecondLifeInstDP)
-    SendMessage $0 16 0 0
-
-  LOOP:
-          FindWindow $0 "Second Life" ""
-          IntCmp $0 0 DONE
-          Sleep 500
-          Goto LOOP
-
-  DONE:
-    Pop $0
-    Return
-FunctionEnd
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Delete files in Documents and Settings\<user>\SecondLife\cache
-; Delete files in Documents and Settings\All Users\SecondLife\cache
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;Function RemoveCacheFiles
-;
-;; Delete files in Documents and Settings\<user>\SecondLife
-;Push $0
-;Push $1
-;Push $2
-;  DetailPrint $(RemoveCacheFilesDP)
-;
-;  StrCpy $0 0 ; Index number used to iterate via EnumRegKey
-;
-;  LOOP:
-;    EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0
-;    StrCmp $1 "" DONE               ; no more users
-;
-;    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 
-;    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing
-;
-;    ; Required since ProfileImagePath is of type REG_EXPAND_SZ
-;    ExpandEnvStrings $2 $2
-;
-;       ; When explicitly uninstalling, everything goes away
-;    RMDir /r "$2\Application Data\SecondLife\cache"
-;
-;  CONTINUE:
-;    IntOp $0 $0 + 1
-;    Goto LOOP
-;  DONE:
-;Pop $2
-;Pop $1
-;Pop $0
-;
-;; Delete files in Documents and Settings\All Users\SecondLife
-;Push $0
-;  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"
-;  StrCmp $0 "" +2
-;  RMDir /r "$0\SecondLife\cache"
-;Pop $0
-;
-;; Delete filse in C:\Windows\Application Data\SecondLife
-;; If the user is running on a pre-NT system, Application Data lives here instead of
-;; in Documents and Settings.
-;RMDir /r "$WINDIR\Application Data\SecondLife\cache"
-;
-;FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Delete the installed shader files
-;;; Since shaders are in active development, we'll likely need to shuffle them
-;;; around a bit from build to build.  This ensures that shaders that we move
-;;; or rename in the dev tree don't get left behind in the install.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function RemoveOldShaders
-
-;; Remove old shader files first so fallbacks will work. see DEV-5663
-RMDir /r "$INSTDIR\app_settings\shaders\*"
-
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Delete the installed XUI files
-;;; We've changed the directory hierarchy for skins, putting all XUI and texture
-;;; files under a specific skin directory, i.e. skins/default/xui/en-us as opposed
-;;; to skins/xui/en-us.  Need to clean up the old path when upgrading
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function RemoveOldXUI
-
-;; remove old XUI and texture files
-RmDir /r "$INSTDIR\skins\html"
-RmDir /r "$INSTDIR\skins\xui"
-RmDir /r "$INSTDIR\skins\textures"
-Delete "$INSTDIR\skins\*.txt"
-
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Remove any releasenotes files.
-;;; We are no longer including release notes with the viewer. This will delete
-;;; any that were left behind by an older installer. Delete will not fail if
-;;; the files do not exist
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function RemoveOldReleaseNotes
-
-;; remove releasenotes.txt file from application directory, and the shortcut
-;; from the start menu.
-Delete "$SMPROGRAMS\$INSTSHORTCUT\SL Release Notes.lnk"
-Delete "$INSTDIR\releasenotes.txt"
-
-FunctionEnd
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Delete files in Documents and Settings\<user>\SecondLife
-; Delete files in Documents and Settings\All Users\SecondLife
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function un.DocumentsAndSettingsFolder
-
-; Delete files in Documents and Settings\<user>\SecondLife
-Push $0
-Push $1
-Push $2
-
-  DetailPrint "Deleting files in Documents and Settings folder"
-
-  StrCpy $0 0 ; Index number used to iterate via EnumRegKey
-
-  LOOP:
-    EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0
-    StrCmp $1 "" DONE               ; no more users
-
-    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 
-    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing
-
-    ; Required since ProfileImagePath is of type REG_EXPAND_SZ
-    ExpandEnvStrings $2 $2
-
-        ; If uninstalling a normal install remove everything
-        ; Otherwise (preview/dmz etc) just remove cache
-    StrCmp $INSTFLAGS "" RM_ALL RM_CACHE
-      RM_ALL:
-        RMDir /r "$2\Application Data\SecondLife"
-        GoTo CONTINUE
-      RM_CACHE:
-        RMDir /r "$2\Application Data\SecondLife\Cache"
-        Delete "$2\Application Data\SecondLife\user_settings\settings_windlight.xml"
-
-  CONTINUE:
-    IntOp $0 $0 + 1
-    Goto LOOP
-  DONE:
-
-Pop $2
-Pop $1
-Pop $0
-
-; Delete files in Documents and Settings\All Users\SecondLife
-Push $0
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"
-  StrCmp $0 "" +2
-  RMDir /r "$0\SecondLife"
-Pop $0
-
-; Delete filse in C:\Windows\Application Data\SecondLife
-; If the user is running on a pre-NT system, Application Data lives here instead of
-; in Documents and Settings.
-RMDir /r "$WINDIR\Application Data\SecondLife"
-
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Close the program, if running. Modifies no variables.
-; Allows user to bail out of uninstall process.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function un.CloseSecondLife
-  Push $0
-  FindWindow $0 "Second Life" ""
-  IntCmp $0 0 DONE
-  MessageBox MB_OKCANCEL $(CloseSecondLifeUnInstMB) IDOK CLOSE IDCANCEL CANCEL_UNINSTALL
-
-  CANCEL_UNINSTALL:
-    Quit
-
-  CLOSE:
-    DetailPrint $(CloseSecondLifeUnInstDP)
-    SendMessage $0 16 0 0
-
-  LOOP:
-          FindWindow $0 "Second Life" ""
-          IntCmp $0 0 DONE
-          Sleep 500
-          Goto LOOP
-
-  DONE:
-    Pop $0
-    Return
-FunctionEnd
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;
-;   Delete the stored password for the current Windows user
-;   DEV-10821 -- Unauthorised user can gain access to an SL account after a real user has uninstalled
-;
-Function un.RemovePassword
-
-DetailPrint "Removing Second Life password"
-
-SetShellVarContext current
-Delete "$APPDATA\SecondLife\user_settings\password.dat"
-SetShellVarContext all
-
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Delete the installed files
-;;; This deletes the uninstall executable, but it works 
-;;; because it is copied to temp directory before running
-;;;
-;;; Note:  You must list all files here, because we only
-;;; want to delete our files, not things users left in the
-;;; application directories.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function un.ProgramFiles
-
-;; Remove mozilla file first so recursive directory deletion doesn't get hung up
-Delete "$INSTDIR\app_settings\mozilla\components"
-
-;; This placeholder is replaced by the complete list of files to uninstall by viewer_manifest.py
-%%DELETE_FILES%%
-
-;; Optional/obsolete files.  Delete won't fail if they don't exist.
-Delete "$INSTDIR\dronesettings.ini"
-Delete "$INSTDIR\message_template.msg"
-Delete "$INSTDIR\newview.pdb"
-Delete "$INSTDIR\newview.map"
-Delete "$INSTDIR\SecondLife.pdb"
-Delete "$INSTDIR\SecondLife.map"
-Delete "$INSTDIR\comm.dat"
-Delete "$INSTDIR\*.glsl"
-Delete "$INSTDIR\motions\*.lla"
-Delete "$INSTDIR\trial\*.html"
-Delete "$INSTDIR\newview.exe"
-;; Remove entire help directory
-Delete "$INSTDIR\help\Advanced\*"
-RMDir  "$INSTDIR\help\Advanced"
-Delete "$INSTDIR\help\basics\*"
-RMDir  "$INSTDIR\help\basics"
-Delete "$INSTDIR\help\Concepts\*"
-RMDir  "$INSTDIR\help\Concepts"
-Delete "$INSTDIR\help\welcome\*"
-RMDir  "$INSTDIR\help\welcome"
-Delete "$INSTDIR\help\*"
-RMDir  "$INSTDIR\help"
-
-Delete "$INSTDIR\uninst.exe"
-RMDir "$INSTDIR"
-
-IfFileExists "$INSTDIR" FOLDERFOUND NOFOLDER
-
-FOLDERFOUND:
-  MessageBox MB_YESNO $(DeleteProgramFilesMB) IDNO NOFOLDER
-  RMDir /r "$INSTDIR"
-
-NOFOLDER:
-
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Uninstall settings
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-UninstallText $(UninstallTextMsg)
-ShowUninstDetails show
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Uninstall section
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Section Uninstall
-
-; Start with some default values.
-StrCpy $INSTFLAGS ""
-StrCpy $INSTPROG "${INSTNAME}"
-StrCpy $INSTEXE "${INSTEXE}"
-StrCpy $INSTSHORTCUT "${SHORTCUT}"
-Call un.CheckStartupParams              ; Figure out where, what and how to uninstall.
-Call un.CheckIfAdministrator            ; Make sure the user can install/uninstall
-
-; uninstall for all users (if you change this, change it in the install as well)
-SetShellVarContext all                  
-
-; Make sure we're not running
-Call un.CloseSecondLife
-
-; Clean up registry keys (these should all be !defines somewhere)
-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG"
-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG"
-DeleteRegKey HKEY_LOCAL_MACHINE "Software\Linden Research, Inc.\Installer Language" 
-
-; Clean up shortcuts
-Delete "$SMPROGRAMS\$INSTSHORTCUT\*.*"
-RMDir  "$SMPROGRAMS\$INSTSHORTCUT"
-
-Delete "$DESKTOP\$INSTSHORTCUT.lnk"
-Delete "$INSTDIR\$INSTSHORTCUT.lnk"
-Delete "$INSTDIR\Uninstall $INSTSHORTCUT.lnk"
-
-; Clean up cache and log files.
-; Leave them in-place for non AGNI installs.
-
-!ifdef UNINSTALL_SETTINGS
-Call un.DocumentsAndSettingsFolder
-!endif
-
-; remove stored password on uninstall
-Call un.RemovePassword
-
-Call un.ProgramFiles
-
-SectionEnd                              ; end of uninstall section
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; (From the NSIS wiki, DK)
-; GetParameterValue
-;
-; Usage:
-; !insertmacro GetParameterValue "/L=" "1033"
-; pop $R0
-;
-; Returns on top of stack
-;
-; Example command lines:
-; foo.exe /S /L=1033 /D=C:\Program Files\Foo
-; or:
-; foo.exe /S "/L=1033" /D="C:\Program Files\Foo"
-; gpv "/L=" "1033"
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
- !macro GetParameterValue SWITCH DEFAULT
-   Push $0
-   Push $1
-   Push $2
-   Push $3
-   Push $4
-
- ;$CMDLINE='"My Setup\Setup.exe" /L=1033 /S'
-   Push "$CMDLINE"
-   Push '${SWITCH}"'
-   !insertmacro StrStr
-   Pop $0
-   StrCmp "$0" "" gpv_notquoted
- ;$0='/L="1033" /S'
-   StrLen $2 "$0"
-   Strlen $1 "${SWITCH}"
-   IntOp $1 $1 + 1
-   StrCpy $0 "$0" $2 $1
- ;$0='1033" /S'
-   Push "$0"
-   Push '"'
-   !insertmacro StrStr
-   Pop $1
-   StrLen $2 "$0"
-   StrLen $3 "$1"
-   IntOp $4 $2 - $3
-   StrCpy $0 $0 $4 0
-   Goto gpv_done
-
-   gpv_notquoted:
-   Push "$CMDLINE"
-   Push "${SWITCH}"
-   !insertmacro StrStr
-   Pop $0
-   StrCmp "$0" "" gpv_done
- ;$0='/L="1033" /S'
-   StrLen $2 "$0"
-   Strlen $1 "${SWITCH}"
-   StrCpy $0 "$0" $2 $1
- ;$0=1033 /S'
-   Push "$0"
-   Push ' '
-   !insertmacro StrStr
-   Pop $1
-   StrLen $2 "$0"
-   StrLen $3 "$1"
-   IntOp $4 $2 - $3
-   StrCpy $0 $0 $4 0
-   Goto gpv_done
-
-   gpv_done:
-   StrCmp "$0" "" 0 +2
-   StrCpy $0 "${DEFAULT}"
-
-   Pop $4
-   Pop $3
-   Pop $2
-   Pop $1
-   Exch $0
- !macroend
-
-; And I had to modify StrStr a tiny bit.
-; Possible upgrade switch the goto's to use ${__LINE__}
-
-!macro STRSTR
-  Exch $R1 ; st=haystack,old$R1, $R1=needle
-  Exch    ; st=old$R1,haystack
-  Exch $R2 ; st=old$R1,old$R2, $R2=haystack
-  Push $R3
-  Push $R4
-  Push $R5
-  StrLen $R3 $R1
-  StrCpy $R4 0
-  ; $R1=needle
-  ; $R2=haystack
-  ; $R3=len(needle)
-  ; $R4=cnt
-  ; $R5=tmp
- ;  loop;
-    StrCpy $R5 $R2 $R3 $R4
-    StrCmp $R5 $R1 +4
-    StrCmp $R5 "" +3
-    IntOp $R4 $R4 + 1
-    Goto -4
- ;  done;
-  StrCpy $R1 $R2 "" $R4
-  Pop $R5
-  Pop $R4
-  Pop $R3
-  Pop $R2
-  Exch $R1
-!macroend
-
-Function GetProgramName
-  !insertmacro GetParameterValue "/P=" "SecondLife"
-FunctionEnd
-
-Function un.GetProgramName
-  !insertmacro GetParameterValue "/P=" "SecondLife"
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; (From the NSIS documentation, JC)
-; GetWindowsVersion
-;
-; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/
-; Updated by Joost Verburg
-;
-; Returns on top of stack
-;
-; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003)
-; or
-; '' (Unknown Windows Version)
-;
-; Usage:
-;   Call GetWindowsVersion
-;   Pop $R0
-;   ; at this point $R0 is "NT 4.0" or whatnot
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function GetWindowsVersion
- 
-   Push $R0
-   Push $R1
- 
-   ReadRegStr $R0 HKLM \
-   "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-
-   IfErrors 0 lbl_winnt
-   
-   ; we are not NT
-   ReadRegStr $R0 HKLM \
-   "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber
- 
-   StrCpy $R1 $R0 1
-   StrCmp $R1 '4' 0 lbl_error
- 
-   StrCpy $R1 $R0 3
- 
-   StrCmp $R1 '4.0' lbl_win32_95
-   StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98
- 
-   lbl_win32_95:
-     StrCpy $R0 '95'
-   Goto lbl_done
- 
-   lbl_win32_98:
-     StrCpy $R0 '98'
-   Goto lbl_done
- 
-   lbl_win32_ME:
-     StrCpy $R0 'ME'
-   Goto lbl_done
- 
-   lbl_winnt:
- 
-   StrCpy $R1 $R0 1
- 
-   StrCmp $R1 '3' lbl_winnt_x
-   StrCmp $R1 '4' lbl_winnt_x
- 
-   StrCpy $R1 $R0 3
- 
-   StrCmp $R1 '5.0' lbl_winnt_2000
-   StrCmp $R1 '5.1' lbl_winnt_XP
-   StrCmp $R1 '5.2' lbl_winnt_2003 lbl_error
- 
-   lbl_winnt_x:
-     StrCpy $R0 "NT $R0" 6
-   Goto lbl_done
- 
-   lbl_winnt_2000:
-     Strcpy $R0 '2000'
-   Goto lbl_done
- 
-   lbl_winnt_XP:
-     Strcpy $R0 'XP'
-   Goto lbl_done
- 
-   lbl_winnt_2003:
-     Strcpy $R0 '2003'
-   Goto lbl_done
- 
-   lbl_error:
-     Strcpy $R0 ''
-   lbl_done:
- 
-   Pop $R1
-   Exch $R0
- 
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;  Note: to add new languages, add a language file include to the list 
-;;  at the top of this file, add an entry to the menu and then add an 
-;;  entry to the language ID selector below
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function .onInit
-
-        ; read the language from registry (ok if not there) and set langauge menu
-        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"
-        StrCpy $LANGUAGE $0
-
-        Push ""
-        Push ${LANG_ENGLISH}
-        Push English
-        Push ${LANG_GERMAN}
-        Push German
-        Push ${LANG_JAPANESE}
-        Push Japanese
-        Push ${LANG_KOREAN}
-        Push Korean
-        Push A ; A means auto count languages for the auto count to work the first empty push (Push "") must remain
-        LangDLL::LangDialog "Installer Language" "Please select the language of the installer"
-        Pop $LANGUAGE
-        StrCmp $LANGUAGE "cancel" 0 +2
-                Abort
-
-        ; save language in registry             
-        WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage" $LANGUAGE
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Function un.onInit
-
-        ; read language from registry and set for ininstaller
-        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"
-        StrCpy $LANGUAGE $0
-
-FunctionEnd
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Sections
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-Section ""                                              ; (default section)
-
-SetShellVarContext all                  ; install for all users (if you change this, change it in the uninstall as well)
-
-; Start with some default values.
-StrCpy $INSTFLAGS "${INSTFLAGS}"
-StrCpy $INSTPROG "${INSTNAME}"
-StrCpy $INSTEXE "${INSTEXE}"
-StrCpy $INSTSHORTCUT "${SHORTCUT}"
-
-IfSilent +2
-Goto NOT_SILENT
-  Call CheckStartupParams                 ; Figure out where, what and how to install.
-NOT_SILENT:
-Call CheckWindowsVersion                ; warn if on Windows 98/ME
-Call CheckIfAdministrator               ; Make sure the user can install/uninstall
-Call CheckIfAlreadyCurrent              ; Make sure that we haven't already installed this version
-Call CloseSecondLife                    ; Make sure we're not running
-Call RemoveNSIS                                 ; Check for old NSIS install to remove
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Don't remove cache files during a regular install, removing the inventory cache on upgrades results in lots of damage to the servers.
-;Call RemoveCacheFiles                  ; Installing over removes potentially corrupted
-                                                                ; VFS and cache files.
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Need to clean out shader files from previous installs to fix DEV-5663
-Call RemoveOldShaders
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Need to clean out old XUI files that predate skinning
-Call RemoveOldXUI
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Clear out old releasenotes.txt files. These are now on the public wiki.
-Call RemoveOldReleaseNotes
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Files
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; This placeholder is replaced by the complete list of all the files in the installer, by viewer_manifest.py
-%%INSTALL_FILES%%
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; If this is a silent update, we don't need to re-create these shortcuts or registry entries.
-IfSilent POST_INSTALL
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Shortcuts in start menu
-CreateDirectory "$SMPROGRAMS\$INSTSHORTCUT"
-SetOutPath "$INSTDIR"
-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT.lnk" \
-                                "$INSTDIR\$INSTEXE" "$INSTFLAGS"
-
-!ifdef MUSEUM
-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT Museum.lnk" \
-
-                                "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"
-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT Museum Spanish.lnk" \
-
-                                "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"
-!endif
-
-WriteINIStr             "$SMPROGRAMS\$INSTSHORTCUT\SL Create Trial Account.url" \
-                                "InternetShortcut" "URL" \
-                                "http://www.secondlife.com/registration/"
-WriteINIStr             "$SMPROGRAMS\$INSTSHORTCUT\SL Your Account.url" \
-                                "InternetShortcut" "URL" \
-                                "http://www.secondlife.com/account/"
-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\SL Scripting Language Help.lnk" \
-                                "$INSTDIR\lsl_guide.html"
-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\Uninstall $INSTSHORTCUT.lnk" \
-                                '"$INSTDIR\uninst.exe"' '/P="$INSTPROG"'
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Other shortcuts
-SetOutPath "$INSTDIR"
-CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS"
-CreateShortCut "$INSTDIR\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS"
-CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \
-                                '"$INSTDIR\uninst.exe"' '/P="$INSTPROG"'
-
-!ifdef MUSEUM
-CreateShortCut "$DESKTOP\$INSTSHORTCUT Museum.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"
-
-CreateShortCut "$DESKTOP\$INSTSHORTCUT Museum Spanish.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"
-
-CreateShortCut "$INSTDIR\$INSTSHORTCUT Museum.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"
-
-CreateShortCut "$INSTDIR\$INSTSHORTCUT Museum Spanish.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"
-
-!endif
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Write registry
-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "" "$INSTDIR"
-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version" "${VERSION_LONG}"
-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags" "$INSTFLAGS"
-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut" "$INSTSHORTCUT"
-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe" "$INSTEXE"
-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayName" "$INSTPROG (remove only)"
-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "UninstallString" '"$INSTDIR\uninst.exe" /P="$INSTPROG"'
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Write URL registry info
-WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "(default)" "URL:Second Life"
-WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "URL Protocol" ""
-WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}\DefaultIcon" "" '"$INSTDIR\$INSTEXE"'
-WriteRegExpandStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open\command" "" '"$INSTDIR\$INSTEXE" $INSTFLAGS -url "%1"'
-
-Goto WRITE_UNINST
-
-POST_INSTALL:
-; Run a post-executable script if necessary.
-Call PostInstallExe
-
-WRITE_UNINST:
-; write out uninstaller
-WriteUninstaller "$INSTDIR\uninst.exe"
-
-; end of default section
-SectionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; EOF  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;; imprudence setup.nsi

+;; Copyright 2004-2007, Linden Research, Inc.

+;; For info, see http://www.nullsoft.com/free/nsis/

+;;

+;; NSIS 2.22 or higher required

+;; Author: James Cook, Don Kjer, Callum Prentice

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Detect NSIS compiler version

+!define "NSIS${NSIS_VERSION}"

+!ifdef "NSISv2.02" | "NSISv2.03" | "NSISv2.04" | "NSISv2.05" | "NSISv2.06"

+    ;; before 2.07 defaulted lzma to solid (whole file)

+    SetCompressor lzma

+!else

+    ;; after 2.07 required /solid for whole file compression

+    SetCompressor /solid lzma

+!endif

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;; Compiler flags

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+SetOverwrite on                         ; overwrite files

+SetCompress auto                        ; compress iff saves space

+SetDatablockOptimize off        ; only saves us 0.1%, not worth it

+XPStyle on                  ; add an XP manifest to the installer

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Project flags

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+

+%%VERSION%%

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;; - language files - one for each language (or flavor thereof)

+;; (these files are in the same place as the nsi template but the python script generates a new nsi file in the 

+;; application directory so we have to add a path to these include files)

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+!include "%%SOURCE%%\installers\windows\lang_de.nsi"

+!include "%%SOURCE%%\installers\windows\lang_en-us.nsi"

+!include "%%SOURCE%%\installers\windows\lang_ja.nsi"

+!include "%%SOURCE%%\installers\windows\lang_ko.nsi"

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;; Tweak for different servers/builds (this placeholder is replaced by viewer_manifest.py)

+%%GRID_VARS%%

+

+Name ${INSTNAME}

+

+SubCaption 0 $(LicenseSubTitleSetup)    ; override "license agreement" text

+

+BrandingText " "                                                ; bottom of window text

+Icon %%SOURCE%%\res\install_icon.ico    ; our custom icon

+UninstallIcon %%SOURCE%%\res\uninstall_icon.ico    ; our custom icon

+WindowIcon on                                                   ; show our icon in left corner

+BGGradient off                                                  ; no big background window

+CRCCheck on                                                             ; make sure CRC is OK

+InstProgressFlags smooth colored                ; new colored smooth look

+ShowInstDetails nevershow                               ; no details, no "show" button

+SetOverwrite on                                                 ; stomp files by default

+AutoCloseWindow true                                    ; after all files install, close window

+

+InstallDir "$PROGRAMFILES\${INSTNAME}"

+InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" ""

+!ifdef UPDATE

+DirText $(DirectoryChooseTitle) $(DirectoryChooseUpdate)

+!else

+DirText $(DirectoryChooseTitle) $(DirectoryChooseSetup)

+!endif

+

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Variables

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Var INSTPROG

+Var INSTEXE

+Var INSTFLAGS

+Var LANGFLAGS

+Var INSTSHORTCUT

+

+;;; Function definitions should go before file includes, because the NSIS package

+;;; is a single stream of bytecodes + file data.  So if your function definitions are at

+;;; the end of the file it has to decompress the whole thing before it can call a function. JC

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; PostInstallExe

+; This just runs any post installation scripts.

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function PostInstallExe

+push $0

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "PostInstallExe"

+  ;MessageBox MB_OK '$0'

+  ExecWait '$0'

+pop $0

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; CheckStartupParameters

+; Sets INSTFLAGS, INSTPROG, and INSTEXE.

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function CheckStartupParams

+push $0

+push $R0

+

+  ; Look for a registry entry with info about where to update.

+  Call GetProgramName

+  pop $R0

+  StrCpy $INSTPROG "$R0"

+  StrCpy $INSTEXE "$R0.exe"

+

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""

+  ; If key doesn't exist, skip install

+  IfErrors ABORT

+  StrCpy $INSTDIR "$0"

+

+  ; We now have a directory to install to.  Get the startup parameters and shortcut as well.

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags"

+  IfErrors +2

+  StrCpy $INSTFLAGS "$0"

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut"

+  IfErrors +2

+  StrCpy $INSTSHORTCUT "$0"

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe"

+  IfErrors +2

+  StrCpy $INSTEXE "$0"

+  Goto FINISHED

+

+ABORT:

+  MessageBox MB_OK $(CheckStartupParamsMB)

+  Quit

+

+FINISHED:

+  ;MessageBox MB_OK "INSTPROG: $INSTPROG, INSTEXE: $INSTEXE, INSTFLAGS: $INSTFLAGS"

+pop $R0

+pop $0

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function un.CheckStartupParams

+push $0

+push $R0

+

+  ; Look for a registry entry with info about where to update.

+  Call un.GetProgramName

+  pop $R0

+  StrCpy $INSTPROG "$R0"

+  StrCpy $INSTEXE "$R0.exe"

+

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""

+  ; If key doesn't exist, skip install

+  IfErrors ABORT

+  StrCpy $INSTDIR "$0"

+

+  ; We now have a directory to install to.  Get the startup parameters and shortcut as well.

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags"

+  IfErrors +2

+  StrCpy $INSTFLAGS "$0"

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut"

+  IfErrors +2

+  StrCpy $INSTSHORTCUT "$0"

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe"

+  IfErrors +2

+  StrCpy $INSTEXE "$0"

+  Goto FINISHED

+

+ABORT:

+  MessageBox MB_OK $(CheckStartupParamsMB)

+  Quit

+

+FINISHED:

+  ;MessageBox MB_OK "INSTPROG: $INSTPROG, INSTEXE: $INSTEXE, INSTFLAGS: $INSTFLAGS"

+pop $R0

+pop $0

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; After install completes, offer readme file

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function .onInstSuccess

+        MessageBox MB_YESNO \

+        $(InstSuccesssQuestion) /SD IDYES IDNO NoReadme

+                ; Assumes SetOutPath $INSTDIR

+                Exec '"$INSTDIR\$INSTEXE" $INSTFLAGS'

+        NoReadme:

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Remove old NSIS version. Modifies no variables.

+; Does NOT delete the LindenWorld directory, or any

+; user files in that directory.

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function RemoveNSIS

+  Push $0

+  ; Grab the installation directory of the old version

+  DetailPrint $(RemoveOldNSISVersion)

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""

+

+  ; If key doesn't exist, skip uninstall

+  IfErrors NO_NSIS

+

+  ; Clean up legacy beta shortcuts

+  Delete "$SMPROGRAMS\Second Life Beta.lnk"

+  Delete "$DESKTOP\Second Life Beta.lnk"

+  Delete "$SMPROGRAMS\Second Life.lnk"

+  

+  ; Clean up old newview.exe file

+  Delete "$INSTDIR\newview.exe"

+

+  ; Intentionally don't delete the stuff in

+  ; Documents and Settings, so we keep the user's settings

+

+  NO_NSIS:

+  Pop $0

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Make sure we're not on Windows 98 / ME

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function CheckWindowsVersion

+        DetailPrint "Checking Windows version..."

+        Call GetWindowsVersion

+        Pop $R0

+        ; Just get first two characters, ignore 4.0 part of "NT 4.0"

+        StrCpy $R0 $R0 2

+        ; Blacklist certain OS versions

+        StrCmp $R0 "95" win_ver_bad

+        StrCmp $R0 "98" win_ver_bad

+        StrCmp $R0 "ME" win_ver_bad

+        StrCmp $R0 "NT" win_ver_bad

+        Return

+win_ver_bad:

+        MessageBox MB_YESNO $(CheckWindowsVersionMB) IDNO win_ver_abort

+        Return

+win_ver_abort:

+        Quit

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Make sure the user can install/uninstall

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function CheckIfAdministrator

+                DetailPrint $(CheckAdministratorInstDP)

+         UserInfo::GetAccountType

+         Pop $R0

+         StrCmp $R0 "Admin" is_admin

+         MessageBox MB_OK $(CheckAdministratorInstMB)

+         Quit

+is_admin:

+         Return

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function un.CheckIfAdministrator

+        DetailPrint $(CheckAdministratorUnInstDP)

+         UserInfo::GetAccountType

+         Pop $R0

+         StrCmp $R0 "Admin" is_admin

+         MessageBox MB_OK $(CheckAdministratorUnInstMB)

+         Quit

+is_admin:

+         Return

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Checks to see if the current version has already been installed (according to the registry).

+; If it has, allow user to bail out of install process.

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function CheckIfAlreadyCurrent

+  Push $0

+        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version"

+    StrCmp $0 ${VERSION_LONG} 0 DONE

+        MessageBox MB_OKCANCEL $(CheckIfCurrentMB) /SD IDOK IDOK DONE

+    Quit

+

+  DONE:

+    Pop $0

+    Return

+FunctionEnd

+        

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Close the program, if running. Modifies no variables.

+; Allows user to bail out of install process.

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function CloseSecondLife

+  Push $0

+  FindWindow $0 "Imprudence" ""

+  IntCmp $0 0 DONE

+  MessageBox MB_OKCANCEL $(CloseSecondLifeInstMB) IDOK CLOSE IDCANCEL CANCEL_INSTALL

+

+  CANCEL_INSTALL:

+    Quit

+

+  CLOSE:

+    DetailPrint $(CloseSecondLifeInstDP)

+    SendMessage $0 16 0 0

+

+  LOOP:

+          FindWindow $0 "Imprudence" ""

+          IntCmp $0 0 DONE

+          Sleep 500

+          Goto LOOP

+

+  DONE:

+    Pop $0

+    Return

+FunctionEnd

+

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Delete files in Documents and Settings\<user>\SecondLife\cache

+; Delete files in Documents and Settings\All Users\SecondLife\cache

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;Function RemoveCacheFiles

+;

+;; Delete files in Documents and Settings\<user>\SecondLife

+;Push $0

+;Push $1

+;Push $2

+;  DetailPrint $(RemoveCacheFilesDP)

+;

+;  StrCpy $0 0 ; Index number used to iterate via EnumRegKey

+;

+;  LOOP:

+;    EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0

+;    StrCmp $1 "" DONE               ; no more users

+;

+;    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 

+;    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing

+;

+;    ; Required since ProfileImagePath is of type REG_EXPAND_SZ

+;    ExpandEnvStrings $2 $2

+;

+;       ; When explicitly uninstalling, everything goes away

+;    RMDir /r "$2\Application Data\SecondLife\cache"

+;

+;  CONTINUE:

+;    IntOp $0 $0 + 1

+;    Goto LOOP

+;  DONE:

+;Pop $2

+;Pop $1

+;Pop $0

+;

+;; Delete files in Documents and Settings\All Users\SecondLife

+;Push $0

+;  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"

+;  StrCmp $0 "" +2

+;  RMDir /r "$0\SecondLife\cache"

+;Pop $0

+;

+;; Delete filse in C:\Windows\Application Data\SecondLife

+;; If the user is running on a pre-NT system, Application Data lives here instead of

+;; in Documents and Settings.

+;RMDir /r "$WINDIR\Application Data\SecondLife\cache"

+;

+;FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Delete the installed shader files

+;;; Since shaders are in active development, we'll likely need to shuffle them

+;;; around a bit from build to build.  This ensures that shaders that we move

+;;; or rename in the dev tree don't get left behind in the install.

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function RemoveOldShaders

+

+;; Remove old shader files first so fallbacks will work. see DEV-5663

+RMDir /r "$INSTDIR\app_settings\shaders\*"

+

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Delete the installed XUI files

+;;; We've changed the directory hierarchy for skins, putting all XUI and texture

+;;; files under a specific skin directory, i.e. skins/default/xui/en-us as opposed

+;;; to skins/xui/en-us.  Need to clean up the old path when upgrading

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function RemoveOldXUI

+

+;; remove old XUI and texture files

+RmDir /r "$INSTDIR\skins\html"

+RmDir /r "$INSTDIR\skins\xui"

+RmDir /r "$INSTDIR\skins\textures"

+Delete "$INSTDIR\skins\*.txt"

+

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Remove any releasenotes files.

+;;; We are no longer including release notes with the viewer. This will delete

+;;; any that were left behind by an older installer. Delete will not fail if

+;;; the files do not exist

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function RemoveOldReleaseNotes

+

+;; remove releasenotes.txt file from application directory, and the shortcut

+;; from the start menu.

+Delete "$SMPROGRAMS\$INSTSHORTCUT\SL Release Notes.lnk"

+Delete "$INSTDIR\releasenotes.txt"

+

+FunctionEnd

+

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Delete files in Documents and Settings\<user>\SecondLife

+; Delete files in Documents and Settings\All Users\SecondLife

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function un.DocumentsAndSettingsFolder

+

+; Delete files in Documents and Settings\<user>\SecondLife

+Push $0

+Push $1

+Push $2

+

+  DetailPrint "Deleting files in Documents and Settings folder"

+

+  StrCpy $0 0 ; Index number used to iterate via EnumRegKey

+

+  LOOP:

+    EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0

+    StrCmp $1 "" DONE               ; no more users

+

+    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 

+    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing

+

+    ; Required since ProfileImagePath is of type REG_EXPAND_SZ

+    ExpandEnvStrings $2 $2

+

+        ; If uninstalling a normal install remove everything

+        ; Otherwise (preview/dmz etc) just remove cache

+    StrCmp $INSTFLAGS "" RM_ALL RM_CACHE

+      RM_ALL:

+        RMDir /r "$2\Application Data\SecondLife"

+        GoTo CONTINUE

+      RM_CACHE:

+        RMDir /r "$2\Application Data\SecondLife\Cache"

+        Delete "$2\Application Data\SecondLife\user_settings\settings_windlight.xml"

+

+  CONTINUE:

+    IntOp $0 $0 + 1

+    Goto LOOP

+  DONE:

+

+Pop $2

+Pop $1

+Pop $0

+

+; Delete files in Documents and Settings\All Users\SecondLife

+Push $0

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"

+  StrCmp $0 "" +2

+  RMDir /r "$0\SecondLife"

+Pop $0

+

+; Delete filse in C:\Windows\Application Data\SecondLife

+; If the user is running on a pre-NT system, Application Data lives here instead of

+; in Documents and Settings.

+RMDir /r "$WINDIR\Application Data\SecondLife"

+

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Close the program, if running. Modifies no variables.

+; Allows user to bail out of uninstall process.

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function un.CloseSecondLife

+  Push $0

+  FindWindow $0 "Imprudence" ""

+  IntCmp $0 0 DONE

+  MessageBox MB_OKCANCEL $(CloseSecondLifeUnInstMB) IDOK CLOSE IDCANCEL CANCEL_UNINSTALL

+

+  CANCEL_UNINSTALL:

+    Quit

+

+  CLOSE:

+    DetailPrint $(CloseSecondLifeUnInstDP)

+    SendMessage $0 16 0 0

+

+  LOOP:

+          FindWindow $0 "Imprudence" ""

+          IntCmp $0 0 DONE

+          Sleep 500

+          Goto LOOP

+

+  DONE:

+    Pop $0

+    Return

+FunctionEnd

+

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;

+;   Delete the stored password for the current Windows user

+;   DEV-10821 -- Unauthorised user can gain access to an SL account after a real user has uninstalled

+;

+Function un.RemovePassword

+

+DetailPrint "Removing Second Life password"

+

+SetShellVarContext current

+Delete "$APPDATA\SecondLife\user_settings\password.dat"

+SetShellVarContext all

+

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Delete the installed files

+;;; This deletes the uninstall executable, but it works 

+;;; because it is copied to temp directory before running

+;;;

+;;; Note:  You must list all files here, because we only

+;;; want to delete our files, not things users left in the

+;;; application directories.

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function un.ProgramFiles

+

+;; Remove mozilla file first so recursive directory deletion doesn't get hung up

+Delete "$INSTDIR\app_settings\mozilla\components"

+

+;; This placeholder is replaced by the complete list of files to uninstall by viewer_manifest.py

+%%DELETE_FILES%%

+

+;; Optional/obsolete files.  Delete won't fail if they don't exist.

+Delete "$INSTDIR\dronesettings.ini"

+Delete "$INSTDIR\message_template.msg"

+Delete "$INSTDIR\newview.pdb"

+Delete "$INSTDIR\newview.map"

+Delete "$INSTDIR\SecondLife.pdb"

+Delete "$INSTDIR\SecondLife.map"

+Delete "$INSTDIR\comm.dat"

+Delete "$INSTDIR\*.glsl"

+Delete "$INSTDIR\motions\*.lla"

+Delete "$INSTDIR\trial\*.html"

+Delete "$INSTDIR\newview.exe"

+;; Remove entire help directory

+Delete "$INSTDIR\help\Advanced\*"

+RMDir  "$INSTDIR\help\Advanced"

+Delete "$INSTDIR\help\basics\*"

+RMDir  "$INSTDIR\help\basics"

+Delete "$INSTDIR\help\Concepts\*"

+RMDir  "$INSTDIR\help\Concepts"

+Delete "$INSTDIR\help\welcome\*"

+RMDir  "$INSTDIR\help\welcome"

+Delete "$INSTDIR\help\*"

+RMDir  "$INSTDIR\help"

+

+Delete "$INSTDIR\uninst.exe"

+RMDir "$INSTDIR"

+

+IfFileExists "$INSTDIR" FOLDERFOUND NOFOLDER

+

+FOLDERFOUND:

+  MessageBox MB_YESNO $(DeleteProgramFilesMB) IDNO NOFOLDER

+  RMDir /r "$INSTDIR"

+

+NOFOLDER:

+

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Uninstall settings

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+UninstallText $(UninstallTextMsg)

+ShowUninstDetails show

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Uninstall section

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Section Uninstall

+

+; Start with some default values.

+StrCpy $INSTFLAGS ""

+StrCpy $INSTPROG "${INSTNAME}"

+StrCpy $INSTEXE "${INSTEXE}"

+StrCpy $INSTSHORTCUT "${SHORTCUT}"

+Call un.CheckStartupParams              ; Figure out where, what and how to uninstall.

+Call un.CheckIfAdministrator            ; Make sure the user can install/uninstall

+

+; uninstall for all users (if you change this, change it in the install as well)

+SetShellVarContext all                  

+

+; Make sure we're not running

+Call un.CloseSecondLife

+

+; Clean up registry keys (these should all be !defines somewhere)

+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG"

+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG"

+DeleteRegKey HKEY_LOCAL_MACHINE "Software\Linden Research, Inc.\Installer Language" 

+

+; Clean up shortcuts

+Delete "$SMPROGRAMS\$INSTSHORTCUT\*.*"

+RMDir  "$SMPROGRAMS\$INSTSHORTCUT"

+

+Delete "$DESKTOP\$INSTSHORTCUT.lnk"

+Delete "$INSTDIR\$INSTSHORTCUT.lnk"

+Delete "$INSTDIR\Uninstall $INSTSHORTCUT.lnk"

+

+; Clean up cache and log files.

+; Leave them in-place for non AGNI installs.

+

+!ifdef UNINSTALL_SETTINGS

+Call un.DocumentsAndSettingsFolder

+!endif

+

+; remove stored password on uninstall

+Call un.RemovePassword

+

+Call un.ProgramFiles

+

+SectionEnd                              ; end of uninstall section

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; (From the NSIS wiki, DK)

+; GetParameterValue

+;

+; Usage:

+; !insertmacro GetParameterValue "/L=" "1033"

+; pop $R0

+;

+; Returns on top of stack

+;

+; Example command lines:

+; foo.exe /S /L=1033 /D=C:\Program Files\Foo

+; or:

+; foo.exe /S "/L=1033" /D="C:\Program Files\Foo"

+; gpv "/L=" "1033"

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+

+ !macro GetParameterValue SWITCH DEFAULT

+   Push $0

+   Push $1

+   Push $2

+   Push $3

+   Push $4

+

+ ;$CMDLINE='"My Setup\Setup.exe" /L=1033 /S'

+   Push "$CMDLINE"

+   Push '${SWITCH}"'

+   !insertmacro StrStr

+   Pop $0

+   StrCmp "$0" "" gpv_notquoted

+ ;$0='/L="1033" /S'

+   StrLen $2 "$0"

+   Strlen $1 "${SWITCH}"

+   IntOp $1 $1 + 1

+   StrCpy $0 "$0" $2 $1

+ ;$0='1033" /S'

+   Push "$0"

+   Push '"'

+   !insertmacro StrStr

+   Pop $1

+   StrLen $2 "$0"

+   StrLen $3 "$1"

+   IntOp $4 $2 - $3

+   StrCpy $0 $0 $4 0

+   Goto gpv_done

+

+   gpv_notquoted:

+   Push "$CMDLINE"

+   Push "${SWITCH}"

+   !insertmacro StrStr

+   Pop $0

+   StrCmp "$0" "" gpv_done

+ ;$0='/L="1033" /S'

+   StrLen $2 "$0"

+   Strlen $1 "${SWITCH}"

+   StrCpy $0 "$0" $2 $1

+ ;$0=1033 /S'

+   Push "$0"

+   Push ' '

+   !insertmacro StrStr

+   Pop $1

+   StrLen $2 "$0"

+   StrLen $3 "$1"

+   IntOp $4 $2 - $3

+   StrCpy $0 $0 $4 0

+   Goto gpv_done

+

+   gpv_done:

+   StrCmp "$0" "" 0 +2

+   StrCpy $0 "${DEFAULT}"

+

+   Pop $4

+   Pop $3

+   Pop $2

+   Pop $1

+   Exch $0

+ !macroend

+

+; And I had to modify StrStr a tiny bit.

+; Possible upgrade switch the goto's to use ${__LINE__}

+

+!macro STRSTR

+  Exch $R1 ; st=haystack,old$R1, $R1=needle

+  Exch    ; st=old$R1,haystack

+  Exch $R2 ; st=old$R1,old$R2, $R2=haystack

+  Push $R3

+  Push $R4

+  Push $R5

+  StrLen $R3 $R1

+  StrCpy $R4 0

+  ; $R1=needle

+  ; $R2=haystack

+  ; $R3=len(needle)

+  ; $R4=cnt

+  ; $R5=tmp

+ ;  loop;

+    StrCpy $R5 $R2 $R3 $R4

+    StrCmp $R5 $R1 +4

+    StrCmp $R5 "" +3

+    IntOp $R4 $R4 + 1

+    Goto -4

+ ;  done;

+  StrCpy $R1 $R2 "" $R4

+  Pop $R5

+  Pop $R4

+  Pop $R3

+  Pop $R2

+  Exch $R1

+!macroend

+

+Function GetProgramName

+  !insertmacro GetParameterValue "/P=" "Imprudence"

+FunctionEnd

+

+Function un.GetProgramName

+  !insertmacro GetParameterValue "/P=" "Imprudence"

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; (From the NSIS documentation, JC)

+; GetWindowsVersion

+;

+; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/

+; Updated by Joost Verburg

+;

+; Returns on top of stack

+;

+; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003)

+; or

+; '' (Unknown Windows Version)

+;

+; Usage:

+;   Call GetWindowsVersion

+;   Pop $R0

+;   ; at this point $R0 is "NT 4.0" or whatnot

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function GetWindowsVersion

+ 

+   Push $R0

+   Push $R1

+ 

+   ReadRegStr $R0 HKLM \

+   "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion

+

+   IfErrors 0 lbl_winnt

+   

+   ; we are not NT

+   ReadRegStr $R0 HKLM \

+   "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber

+ 

+   StrCpy $R1 $R0 1

+   StrCmp $R1 '4' 0 lbl_error

+ 

+   StrCpy $R1 $R0 3

+ 

+   StrCmp $R1 '4.0' lbl_win32_95

+   StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98

+ 

+   lbl_win32_95:

+     StrCpy $R0 '95'

+   Goto lbl_done

+ 

+   lbl_win32_98:

+     StrCpy $R0 '98'

+   Goto lbl_done

+ 

+   lbl_win32_ME:

+     StrCpy $R0 'ME'

+   Goto lbl_done

+ 

+   lbl_winnt:

+ 

+   StrCpy $R1 $R0 1

+ 

+   StrCmp $R1 '3' lbl_winnt_x

+   StrCmp $R1 '4' lbl_winnt_x

+ 

+   StrCpy $R1 $R0 3

+ 

+   StrCmp $R1 '5.0' lbl_winnt_2000

+   StrCmp $R1 '5.1' lbl_winnt_XP

+   StrCmp $R1 '5.2' lbl_winnt_2003 lbl_error

+ 

+   lbl_winnt_x:

+     StrCpy $R0 "NT $R0" 6

+   Goto lbl_done

+ 

+   lbl_winnt_2000:

+     Strcpy $R0 '2000'

+   Goto lbl_done

+ 

+   lbl_winnt_XP:

+     Strcpy $R0 'XP'

+   Goto lbl_done

+ 

+   lbl_winnt_2003:

+     Strcpy $R0 '2003'

+   Goto lbl_done

+ 

+   lbl_error:

+     Strcpy $R0 ''

+   lbl_done:

+ 

+   Pop $R1

+   Exch $R0

+ 

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;  Note: to add new languages, add a language file include to the list 

+;;  at the top of this file, add an entry to the menu and then add an 

+;;  entry to the language ID selector below

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function .onInit

+

+        ; read the language from registry (ok if not there) and set langauge menu

+        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"

+        StrCpy $LANGUAGE $0

+

+        Push ""

+        Push ${LANG_ENGLISH}

+        Push English

+        Push ${LANG_GERMAN}

+        Push German

+        Push ${LANG_JAPANESE}

+        Push Japanese

+        Push ${LANG_KOREAN}

+        Push Korean

+        Push A ; A means auto count languages for the auto count to work the first empty push (Push "") must remain

+        LangDLL::LangDialog "Installer Language" "Please select the language of the installer"

+        Pop $LANGUAGE

+        StrCmp $LANGUAGE "cancel" 0 +2

+                Abort

+

+        ; save language in registry             

+        WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage" $LANGUAGE

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function un.onInit

+

+        ; read language from registry and set for ininstaller

+        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"

+        StrCpy $LANGUAGE $0

+

+FunctionEnd

+

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Sections

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Section ""                                              ; (default section)

+

+SetShellVarContext all                  ; install for all users (if you change this, change it in the uninstall as well)

+

+; Start with some default values.

+StrCpy $INSTFLAGS "${INSTFLAGS}"

+StrCpy $INSTPROG "${INSTNAME}"

+StrCpy $INSTEXE "${INSTEXE}"

+StrCpy $INSTSHORTCUT "${SHORTCUT}"

+

+IfSilent +2

+Goto NOT_SILENT

+  Call CheckStartupParams                 ; Figure out where, what and how to install.

+NOT_SILENT:

+Call CheckWindowsVersion                ; warn if on Windows 98/ME

+Call CheckIfAdministrator               ; Make sure the user can install/uninstall

+Call CheckIfAlreadyCurrent              ; Make sure that we haven't already installed this version

+Call CloseSecondLife                    ; Make sure we're not running

+Call RemoveNSIS                                 ; Check for old NSIS install to remove

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Don't remove cache files during a regular install, removing the inventory cache on upgrades results in lots of damage to the servers.

+;Call RemoveCacheFiles                  ; Installing over removes potentially corrupted

+                                                                ; VFS and cache files.

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Need to clean out shader files from previous installs to fix DEV-5663

+Call RemoveOldShaders

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Need to clean out old XUI files that predate skinning

+Call RemoveOldXUI

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Clear out old releasenotes.txt files. These are now on the public wiki.

+Call RemoveOldReleaseNotes

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Files

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;; This placeholder is replaced by the complete list of all the files in the installer, by viewer_manifest.py

+%%INSTALL_FILES%%

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; If this is a silent update, we don't need to re-create these shortcuts or registry entries.

+IfSilent POST_INSTALL

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Shortcuts in start menu

+CreateDirectory "$SMPROGRAMS\$INSTSHORTCUT"

+SetOutPath "$INSTDIR"

+CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT.lnk" \

+                                "$INSTDIR\$INSTEXE" "$INSTFLAGS"

+

+!ifdef MUSEUM

+CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT Museum.lnk" \

+

+                                "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"

+CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT Museum Spanish.lnk" \

+

+                                "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"

+!endif

+

+WriteINIStr             "$SMPROGRAMS\$INSTSHORTCUT\SL Create Trial Account.url" \

+                                "InternetShortcut" "URL" \

+                                "http://www.secondlife.com/registration/"

+WriteINIStr             "$SMPROGRAMS\$INSTSHORTCUT\SL Your Account.url" \

+                                "InternetShortcut" "URL" \

+                                "http://www.secondlife.com/account/"

+CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\SL Scripting Language Help.lnk" \

+                                "$INSTDIR\lsl_guide.html"

+CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\Uninstall $INSTSHORTCUT.lnk" \

+                                '"$INSTDIR\uninst.exe"' '/P="$INSTPROG"'

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Other shortcuts

+SetOutPath "$INSTDIR"

+CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS"

+CreateShortCut "$INSTDIR\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS"

+CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \

+                                '"$INSTDIR\uninst.exe"' '/P="$INSTPROG"'

+

+!ifdef MUSEUM

+CreateShortCut "$DESKTOP\$INSTSHORTCUT Museum.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"

+

+CreateShortCut "$DESKTOP\$INSTSHORTCUT Museum Spanish.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"

+

+CreateShortCut "$INSTDIR\$INSTSHORTCUT Museum.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"

+

+CreateShortCut "$INSTDIR\$INSTSHORTCUT Museum Spanish.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"

+

+!endif

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Write registry

+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "" "$INSTDIR"

+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version" "${VERSION_LONG}"

+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags" "$INSTFLAGS"

+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut" "$INSTSHORTCUT"

+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe" "$INSTEXE"

+WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayName" "$INSTPROG (remove only)"

+WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "UninstallString" '"$INSTDIR\uninst.exe" /P="$INSTPROG"'

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Write URL registry info

+WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "(default)" "URL:Second Life"

+WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "URL Protocol" ""

+WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}\DefaultIcon" "" '"$INSTDIR\$INSTEXE"'

+WriteRegExpandStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open\command" "" '"$INSTDIR\$INSTEXE" $INSTFLAGS -url "%1"'

+

+Goto WRITE_UNINST

+

+POST_INSTALL:

+; Run a post-executable script if necessary.

+Call PostInstallExe

+

+WRITE_UNINST:

+; write out uninstaller

+WriteUninstaller "$INSTDIR\uninst.exe"

+

+; end of default section

+SectionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; EOF  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

diff --git a/linden/indra/newview/installers/windows/lang_de.nsi b/linden/indra/newview/installers/windows/lang_de.nsi
index c410128..6be219e 100644
--- a/linden/indra/newview/installers/windows/lang_de.nsi
+++ b/linden/indra/newview/installers/windows/lang_de.nsi
@@ -1,57 +1,57 @@
-; First is default
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\German.nlf"
-
-; subtitle on license text caption (setup new version or update current one
-LangString LicenseSubTitleUpdate ${LANG_GERMAN} " Update"
-LangString LicenseSubTitleSetup ${LANG_GERMAN} " Setup"
-
-; description on license page
-LangString LicenseDescUpdate ${LANG_GERMAN} "Dieses Paket wird das bereits installierte Second Life mit Version ${VERSION_LONG}. ersetzen."
-LangString LicenseDescSetup ${LANG_GERMAN} "Dieses Paket wird Second Life auf Ihrem Computer installieren."
-LangString LicenseDescNext ${LANG_GERMAN} "Weiter"
-
-; installation directory text
-LangString DirectoryChooseTitle ${LANG_GERMAN} "Installations-Ordner"
-LangString DirectoryChooseUpdate ${LANG_GERMAN} "Wählen Sie den Second Life Ordner für dieses Update:"
-LangString DirectoryChooseSetup ${LANG_GERMAN} "Pfad in dem Second Life installieren werden soll:"
-
-; CheckStartupParams message box
-LangString CheckStartupParamsMB ${LANG_GERMAN} "Konnte Programm '$INSTPROG' nicht finden. Stilles Update fehlgeschlagen."
-
-; installation success dialog
-LangString InstSuccesssQuestion ${LANG_GERMAN} "Second Life starten?"
-
-; remove old NSIS version
-LangString RemoveOldNSISVersion ${LANG_GERMAN} "Überprüfe alte Version ..."
-
-; check windows version
-LangString CheckWindowsVersionDP ${LANG_GERMAN} "Überprüfung der Windows Version ..."
-LangString CheckWindowsVersionMB ${LANG_GERMAN} 'Second Life unterstützt nur Windows XP, Windows 2000 und Mac OS X.$\n$\nDer Versuch es auf Windows $R0 zu installieren, könnte zu unvorhersehbaren Abstürzen und Datenverlust führen.$\n$\nTrotzdem installieren?'
-
-; checkifadministrator function (install)
-LangString CheckAdministratorInstDP ${LANG_GERMAN} "Überprüfung der Installations-Berechtigungen ..."
-LangString CheckAdministratorInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um Second Life installieren zu können.'
-
-; checkifadministrator function (uninstall)
-LangString CheckAdministratorUnInstDP ${LANG_GERMAN} "Überprüfung der Entfernungs-Berechtigungen ..."
-LangString CheckAdministratorUnInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um Second Life entfernen zu können..'
-
-; checkifalreadycurrent
-LangString CheckIfCurrentMB ${LANG_GERMAN} "Anscheinend ist Second Life ${VERSION_LONG} bereits installiert.$\n$\nWürden Sie es gerne erneut installieren?"
-
-; closesecondlife function (install)
-LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Second Life ..."
-LangString CloseSecondLifeInstMB ${LANG_GERMAN} "Second Life kann nicht installiert oder ersetzt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Second Life zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen."
-
-; closesecondlife function (uninstall)
-LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Second Life ..."
-LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "Second Life kann nicht entfernt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Second Life zu beenden.$\nKlicken Sie CANCEL, um abzubrechen."
-
-; removecachefiles
-LangString RemoveCacheFilesDP ${LANG_GERMAN} "Löschung aller Cache Dateien in Dokumente und Einstellungen."
-
-; delete program files
-LangString DeleteProgramFilesMB ${LANG_GERMAN} "Es existieren weiterhin Dateien in Ihrem SecondLife Programm Ordner.$\n$\nDies sind möglicherweise Dateien, die sie modifiziert oder bewegt haben:$\n$INSTDIR$\n$\nMöchten Sie diese ebenfalls löschen?"
-
-; uninstall text
-LangString UninstallTextMsg ${LANG_GERMAN} "Dies wird Second Life ${VERSION_LONG} von Ihrem System entfernen."
+; First is default

+LoadLanguageFile "${NSISDIR}\Contrib\Language files\German.nlf"

+

+; subtitle on license text caption (setup new version or update current one

+LangString LicenseSubTitleUpdate ${LANG_GERMAN} " Update"

+LangString LicenseSubTitleSetup ${LANG_GERMAN} " Setup"

+

+; description on license page

+LangString LicenseDescUpdate ${LANG_GERMAN} "Dieses Paket wird das bereits installierte Imprudence mit Version ${VERSION_LONG}. ersetzen."

+LangString LicenseDescSetup ${LANG_GERMAN} "Dieses Paket wird Imprudence auf Ihrem Computer installieren."

+LangString LicenseDescNext ${LANG_GERMAN} "Weiter"

+

+; installation directory text

+LangString DirectoryChooseTitle ${LANG_GERMAN} "Installations-Ordner"

+LangString DirectoryChooseUpdate ${LANG_GERMAN} "Wählen Sie den Imprudence Ordner für dieses Update:"

+LangString DirectoryChooseSetup ${LANG_GERMAN} "Pfad in dem Imprudence installieren werden soll:"

+

+; CheckStartupParams message box

+LangString CheckStartupParamsMB ${LANG_GERMAN} "Konnte Programm '$INSTPROG' nicht finden. Stilles Update fehlgeschlagen."

+

+; installation success dialog

+LangString InstSuccesssQuestion ${LANG_GERMAN} "Imprudence starten?"

+

+; remove old NSIS version

+LangString RemoveOldNSISVersion ${LANG_GERMAN} "Überprüfe alte Version ..."

+

+; check windows version

+LangString CheckWindowsVersionDP ${LANG_GERMAN} "Überprüfung der Windows Version ..."

+LangString CheckWindowsVersionMB ${LANG_GERMAN} 'Imprudence unterstützt nur Windows XP, Windows 2000 und Mac OS X.$\n$\nDer Versuch es auf Windows $R0 zu installieren, könnte zu unvorhersehbaren Abstürzen und Datenverlust führen.$\n$\nTrotzdem installieren?'

+

+; checkifadministrator function (install)

+LangString CheckAdministratorInstDP ${LANG_GERMAN} "Überprüfung der Installations-Berechtigungen ..."

+LangString CheckAdministratorInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um Imprudence installieren zu können.'

+

+; checkifadministrator function (uninstall)

+LangString CheckAdministratorUnInstDP ${LANG_GERMAN} "Überprüfung der Entfernungs-Berechtigungen ..."

+LangString CheckAdministratorUnInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um Imprudence entfernen zu können..'

+

+; checkifalreadycurrent

+LangString CheckIfCurrentMB ${LANG_GERMAN} "Anscheinend ist Imprudence ${VERSION_LONG} bereits installiert.$\n$\nWürden Sie es gerne erneut installieren?"

+

+; closeimprudence function (install)

+LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Imprudence ..."

+LangString CloseSecondLifeInstMB ${LANG_GERMAN} "Imprudence kann nicht installiert oder ersetzt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Imprudence zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen."

+

+; closeimprudence function (uninstall)

+LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Imprudence ..."

+LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "Imprudence kann nicht entfernt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Imprudence zu beenden.$\nKlicken Sie CANCEL, um abzubrechen."

+

+; removecachefiles

+LangString RemoveCacheFilesDP ${LANG_GERMAN} "Löschung aller Cache Dateien in Dokumente und Einstellungen."

+

+; delete program files

+LangString DeleteProgramFilesMB ${LANG_GERMAN} "Es existieren weiterhin Dateien in Ihrem Imprudence Programm Ordner.$\n$\nDies sind möglicherweise Dateien, die sie modifiziert oder bewegt haben:$\n$INSTDIR$\n$\nMöchten Sie diese ebenfalls löschen?"

+

+; uninstall text

+LangString UninstallTextMsg ${LANG_GERMAN} "Dies wird Imprudence ${VERSION_LONG} von Ihrem System entfernen."

diff --git a/linden/indra/newview/installers/windows/lang_en-us.nsi b/linden/indra/newview/installers/windows/lang_en-us.nsi
index 218f1c6..e203fb6 100644
--- a/linden/indra/newview/installers/windows/lang_en-us.nsi
+++ b/linden/indra/newview/installers/windows/lang_en-us.nsi
@@ -1,52 +1,52 @@
-; First is default
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
-
-; subtitle on license text caption
-LangString LicenseSubTitleUpdate ${LANG_ENGLISH} " Update"
-LangString LicenseSubTitleSetup ${LANG_ENGLISH} " Setup"
-
-; installation directory text
-LangString DirectoryChooseTitle ${LANG_ENGLISH} "Installation Directory" 
-LangString DirectoryChooseUpdate ${LANG_ENGLISH} "Select the Second Life directory to update to version ${VERSION_LONG}.(XXX):"
-LangString DirectoryChooseSetup ${LANG_ENGLISH} "Select the directory to install Second Life in:"
-
-; CheckStartupParams message box
-LangString CheckStartupParamsMB ${LANG_ENGLISH} "Could not find the program '$INSTPROG'. Silent update failed."
-
-; installation success dialog
-LangString InstSuccesssQuestion ${LANG_ENGLISH} "Start Second Life now?"
-
-; remove old NSIS version
-LangString RemoveOldNSISVersion ${LANG_ENGLISH} "Checking for old version..."
-
-; check windows version
-LangString CheckWindowsVersionDP ${LANG_ENGLISH} "Checking Windows version..."
-LangString CheckWindowsVersionMB ${LANG_ENGLISH} 'Second Life only supports Windows XP, Windows 2000, and Mac OS X.$\n$\nAttempting to install on Windows $R0 can result in crashes and data loss.$\n$\nInstall anyway?'
-
-; checkifadministrator function (install)
-LangString CheckAdministratorInstDP ${LANG_ENGLISH} "Checking for permission to install..."
-LangString CheckAdministratorInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to install Second Life.'
-
-; checkifadministrator function (uninstall)
-LangString CheckAdministratorUnInstDP ${LANG_ENGLISH} "Checking for permission to uninstall..."
-LangString CheckAdministratorUnInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to uninstall Second Life.'
-
-; checkifalreadycurrent
-LangString CheckIfCurrentMB ${LANG_ENGLISH} "It appears that Second Life ${VERSION_LONG} is already installed.$\n$\nWould you like to install it again?"
-
-; closesecondlife function (install)
-LangString CloseSecondLifeInstDP ${LANG_ENGLISH} "Waiting for Second Life to shut down..."
-LangString CloseSecondLifeInstMB ${LANG_ENGLISH} "Second Life can't be installed while it is already running.$\n$\nFinish what you're doing then select OK to close Second Life and continue.$\nSelect CANCEL to cancel installation."
-
-; closesecondlife function (uninstall)
-LangString CloseSecondLifeUnInstDP ${LANG_ENGLISH} "Waiting for Second Life to shut down..."
-LangString CloseSecondLifeUnInstMB ${LANG_ENGLISH} "Second Life can't be uninstalled while it is already running.$\n$\nFinish what you're doing then select OK to close Second Life and continue.$\nSelect CANCEL to cancel."
-
-; removecachefiles
-LangString RemoveCacheFilesDP ${LANG_ENGLISH} "Deleting cache files in Documents and Settings folder"
-
-; delete program files
-LangString DeleteProgramFilesMB ${LANG_ENGLISH} "There are still files in your SecondLife program directory.$\n$\nThese are possibly files you created or moved to:$\n$INSTDIR$\n$\nDo you want to remove them?"
-
-; uninstall text
-LangString UninstallTextMsg ${LANG_ENGLISH} "This will uninstall Second Life ${VERSION_LONG} from your system."
+; First is default

+LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"

+

+; subtitle on license text caption

+LangString LicenseSubTitleUpdate ${LANG_ENGLISH} " Update"

+LangString LicenseSubTitleSetup ${LANG_ENGLISH} " Setup"

+

+; installation directory text

+LangString DirectoryChooseTitle ${LANG_ENGLISH} "Installation Directory" 

+LangString DirectoryChooseUpdate ${LANG_ENGLISH} "Select the Imprudence directory to update to version ${VERSION_LONG}.(XXX):"

+LangString DirectoryChooseSetup ${LANG_ENGLISH} "Select the directory to install Imprudence in:"

+

+; CheckStartupParams message box

+LangString CheckStartupParamsMB ${LANG_ENGLISH} "Could not find the program '$INSTPROG'. Silent update failed."

+

+; installation success dialog

+LangString InstSuccesssQuestion ${LANG_ENGLISH} "Start Imprudence now?"

+

+; remove old NSIS version

+LangString RemoveOldNSISVersion ${LANG_ENGLISH} "Checking for old version..."

+

+; check windows version

+LangString CheckWindowsVersionDP ${LANG_ENGLISH} "Checking Windows version..."

+LangString CheckWindowsVersionMB ${LANG_ENGLISH} 'Imprudence only supports Windows XP, Windows 2000, and Mac OS X.$\n$\nAttempting to install on Windows $R0 can result in crashes and data loss.$\n$\nInstall anyway?'

+

+; checkifadministrator function (install)

+LangString CheckAdministratorInstDP ${LANG_ENGLISH} "Checking for permission to install..."

+LangString CheckAdministratorInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to install Imprudence.'

+

+; checkifadministrator function (uninstall)

+LangString CheckAdministratorUnInstDP ${LANG_ENGLISH} "Checking for permission to uninstall..."

+LangString CheckAdministratorUnInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to uninstall Imprudence.'

+

+; checkifalreadycurrent

+LangString CheckIfCurrentMB ${LANG_ENGLISH} "It appears that Imprudence ${VERSION_LONG} is already installed.$\n$\nWould you like to install it again?"

+

+; closeimprudence function (install)

+LangString CloseSecondLifeInstDP ${LANG_ENGLISH} "Waiting for Imprudence to shut down..."

+LangString CloseSecondLifeInstMB ${LANG_ENGLISH} "Imprudence can't be installed while it is already running.$\n$\nFinish what you're doing then select OK to close Imprudence and continue.$\nSelect CANCEL to cancel installation."

+

+; closeimprudence function (uninstall)

+LangString CloseSecondLifeUnInstDP ${LANG_ENGLISH} "Waiting for Imprudence to shut down..."

+LangString CloseSecondLifeUnInstMB ${LANG_ENGLISH} "Imprudence can't be uninstalled while it is already running.$\n$\nFinish what you're doing then select OK to close Imprudence and continue.$\nSelect CANCEL to cancel."

+

+; removecachefiles

+LangString RemoveCacheFilesDP ${LANG_ENGLISH} "Deleting cache files in Documents and Settings folder"

+

+; delete program files

+LangString DeleteProgramFilesMB ${LANG_ENGLISH} "There are still files in your Imprudence program directory.$\n$\nThese are possibly files you created or moved to:$\n$INSTDIR$\n$\nDo you want to remove them?"

+

+; uninstall text

+LangString UninstallTextMsg ${LANG_ENGLISH} "This will uninstall Imprudence ${VERSION_LONG} from your system."

diff --git a/linden/indra/newview/installers/windows/lang_ja.nsi b/linden/indra/newview/installers/windows/lang_ja.nsi
index 5e0496e..f59957a 100644
--- a/linden/indra/newview/installers/windows/lang_ja.nsi
+++ b/linden/indra/newview/installers/windows/lang_ja.nsi
@@ -1,57 +1,57 @@
-; First is default
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\Japanese.nlf"
-
-; subtitle on license text caption
-LangString LicenseSubTitleUpdate ${LANG_JAPANESE} " ƒAƒbƒvƒf�[ƒg" 
-LangString LicenseSubTitleSetup ${LANG_JAPANESE} " ƒZƒbƒgƒAƒbƒv" 
-
-; description on license page
-LangString LicenseDescUpdate ${LANG_JAPANESE} "‚±‚̃pƒbƒP�[ƒW‚̓ZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒo�[ƒWƒ‡ƒ“${VERSION_LONG}.‚ɃAƒbƒvƒf�[ƒg‚µ‚Ü‚·�B" 
-LangString LicenseDescSetup ${LANG_JAPANESE} "‚±‚̃pƒbƒP�[ƒW‚Í‚ ‚È‚½‚̃Rƒ“ƒsƒ…�[ƒ^‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ü‚·�B" 
-LangString LicenseDescNext ${LANG_JAPANESE} "ŽŸ" 
-
-; installation directory text
-LangString DirectoryChooseTitle ${LANG_JAPANESE} "ƒCƒ“ƒXƒg�[ƒ‹�EƒfƒBƒŒƒNƒgƒŠ" 
-LangString DirectoryChooseUpdate ${LANG_JAPANESE} "ƒAƒbƒvƒf�[ƒg‚·‚éƒZƒJƒ“ƒhƒ‰ƒCƒt‚̃fƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢�B:" 
-LangString DirectoryChooseSetup ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚éƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢�B: " 
-
-; CheckStartupParams message box
-LangString CheckStartupParamsMB ${LANG_JAPANESE} "ƒvƒ�ƒOƒ‰ƒ€–¼'$INSTPROG'‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ�BƒTƒCƒŒƒ“ƒg�EƒAƒbƒvƒf�[ƒg‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B" 
-
-; installation success dialog
-LangString InstSuccesssQuestion ${LANG_JAPANESE} "’¼‚¿‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ðŠJŽn‚µ‚Ü‚·‚©�H " 
-
-; remove old NSIS version
-LangString RemoveOldNSISVersion ${LANG_JAPANESE} "ŒÃ‚¢ƒo�[ƒWƒ‡ƒ“�î•ñ‚ðƒ`ƒFƒbƒN’†‚Å‚·�c" 
-
-; check windows version
-LangString CheckWindowsVersionDP ${LANG_JAPANESE} "ƒEƒBƒ“ƒhƒEƒY‚̃o�[ƒWƒ‡ƒ“�î•ñ‚ðƒ`ƒFƒbƒN’†‚Å‚·..." 
-LangString CheckWindowsVersionMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ÍWindows XP�AWindows 2000�AMac OS X‚Ì‚Ý‚ðƒTƒ|�[ƒg‚µ‚Ä‚¢‚Ü‚·�BWindows $R0‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚鎖‚Í�Aƒf�[ƒ^‚Ì�ÁŽ¸‚âƒNƒ‰ƒbƒVƒ…‚ÌŒ´ˆö‚É‚È‚é‰Â”\�«‚ª‚ ‚è‚Ü‚·�BƒCƒ“ƒXƒg�[ƒ‹‚𑱂¯‚Ü‚·‚©�H" 
-
-; checkifadministrator function (install)
-LangString CheckAdministratorInstDP ${LANG_JAPANESE} "ƒCƒ“ƒXƒg�[ƒ‹‚Ì‚½‚ß‚ÌŒ ŒÀ‚ðƒ`ƒFƒbƒN’†‚Å‚·..." 
-LangString CheckAdministratorInstMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚é‚É‚ÍŠÇ—�ŽÒŒ ŒÀ‚ª•K—v‚Å‚·�B"
-
-; checkifadministrator function (uninstall)
-LangString CheckAdministratorUnInstDP ${LANG_JAPANESE} "ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚Ì‚½‚ß‚ÌŒ ŒÀ‚ðƒ`ƒFƒbƒN’†‚Å‚·..." 
-LangString CheckAdministratorUnInstMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚·‚é‚É‚ÍŠÇ—�ŽÒŒ ŒÀ‚ª•K—v‚Å‚·�B" 
-
-; checkifalreadycurrent
-LangString CheckIfCurrentMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt${VERSION_LONG} ‚̓Cƒ“ƒXƒg�[ƒ‹�Ï‚Ý‚Å‚·�B�Ä“xƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ü‚·‚©�H " 
-
-; closesecondlife function (install)
-LangString CloseSecondLifeInstDP ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ð�I—¹’†‚Å‚·..." 
-LangString CloseSecondLifeInstMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚Ì‹N“®’†‚ɃCƒ“ƒXƒg�[ƒ‹‚Í�o—ˆ‚Ü‚¹‚ñ�B’¼‚¿‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ð�I—¹‚µ‚ăCƒ“ƒXƒg�[ƒ‹‚ðŠJŽn‚·‚é�ê�‡‚ÍOKƒ{ƒ^ƒ“‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢�BCANCEL‚ð‰Ÿ‚·‚Æ’†Ž~‚µ‚Ü‚·�B"
-
-; closesecondlife function (uninstall)
-LangString CloseSecondLifeUnInstDP ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ð�I—¹’†‚Å‚·..." 
-LangString CloseSecondLifeUnInstMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚Ì‹N“®’†‚ɃAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚Í�o—ˆ‚Ü‚¹‚ñ�B’¼‚¿‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ð�I—¹‚µ‚ăAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚ðŠJŽn‚·‚é�ê�‡‚ÍOKƒ{ƒ^ƒ“‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢�BCANCEL‚ð‰Ÿ‚·‚Æ’†Ž~‚µ‚Ü‚·�B" 
-
-; removecachefiles
-LangString RemoveCacheFilesDP ${LANG_JAPANESE} " Documents and Settings ƒtƒHƒ‹ƒ_‚̃LƒƒƒbƒVƒ…ƒtƒ@ƒCƒ‹‚ðƒfƒŠ�[ƒg’†‚Å‚·�B" 
-
-; delete program files
-LangString DeleteProgramFilesMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚̃fƒBƒŒƒNƒgƒŠ‚É‚Í�A‚Ü‚¾ƒtƒ@ƒCƒ‹‚ªŽc‚³‚ê‚Ä‚¢‚Ü‚·�B$\n$INSTDIR$\n‚É‚ ‚È‚½‚ª�ì�¬�A‚Ü‚½‚͈ړ®‚³‚¹‚½ƒtƒ@ƒCƒ‹‚ª‚ ‚é‰Â”\�«‚ª‚ ‚è‚Ü‚·�B‘S‚Ä�í�œ‚µ‚Ü‚·‚©�H " 
-
-; uninstall text
-LangString UninstallTextMsg ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt${VERSION_LONG}‚ðƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ü‚·�B"
+; First is default

+LoadLanguageFile "${NSISDIR}\Contrib\Language files\Japanese.nlf"

+

+; subtitle on license text caption

+LangString LicenseSubTitleUpdate ${LANG_JAPANESE} " ƒAƒbƒvƒf�[ƒg" 

+LangString LicenseSubTitleSetup ${LANG_JAPANESE} " ƒZƒbƒgƒAƒbƒv" 

+

+; description on license page

+LangString LicenseDescUpdate ${LANG_JAPANESE} "‚±‚̃pƒbƒP�[ƒW‚̓ZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒo�[ƒWƒ‡ƒ“${VERSION_LONG}.‚ɃAƒbƒvƒf�[ƒg‚µ‚Ü‚·�B" 

+LangString LicenseDescSetup ${LANG_JAPANESE} "‚±‚̃pƒbƒP�[ƒW‚Í‚ ‚È‚½‚̃Rƒ“ƒsƒ…�[ƒ^‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ü‚·�B" 

+LangString LicenseDescNext ${LANG_JAPANESE} "ŽŸ" 

+

+; installation directory text

+LangString DirectoryChooseTitle ${LANG_JAPANESE} "ƒCƒ“ƒXƒg�[ƒ‹�EƒfƒBƒŒƒNƒgƒŠ" 

+LangString DirectoryChooseUpdate ${LANG_JAPANESE} "ƒAƒbƒvƒf�[ƒg‚·‚éƒZƒJƒ“ƒhƒ‰ƒCƒt‚̃fƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢�B:" 

+LangString DirectoryChooseSetup ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚éƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢�B: " 

+

+; CheckStartupParams message box

+LangString CheckStartupParamsMB ${LANG_JAPANESE} "ƒvƒ�ƒOƒ‰ƒ€–¼'$INSTPROG'‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ�BƒTƒCƒŒƒ“ƒg�EƒAƒbƒvƒf�[ƒg‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B" 

+

+; installation success dialog

+LangString InstSuccesssQuestion ${LANG_JAPANESE} "’¼‚¿‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ðŠJŽn‚µ‚Ü‚·‚©�H " 

+

+; remove old NSIS version

+LangString RemoveOldNSISVersion ${LANG_JAPANESE} "ŒÃ‚¢ƒo�[ƒWƒ‡ƒ“�î•ñ‚ðƒ`ƒFƒbƒN’†‚Å‚·�c" 

+

+; check windows version

+LangString CheckWindowsVersionDP ${LANG_JAPANESE} "ƒEƒBƒ“ƒhƒEƒY‚̃o�[ƒWƒ‡ƒ“�î•ñ‚ðƒ`ƒFƒbƒN’†‚Å‚·..." 

+LangString CheckWindowsVersionMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ÍWindows XP�AWindows 2000�AMac OS X‚Ì‚Ý‚ðƒTƒ|�[ƒg‚µ‚Ä‚¢‚Ü‚·�BWindows $R0‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚鎖‚Í�Aƒf�[ƒ^‚Ì�ÁŽ¸‚âƒNƒ‰ƒbƒVƒ…‚ÌŒ´ˆö‚É‚È‚é‰Â”\�«‚ª‚ ‚è‚Ü‚·�BƒCƒ“ƒXƒg�[ƒ‹‚𑱂¯‚Ü‚·‚©�H" 

+

+; checkifadministrator function (install)

+LangString CheckAdministratorInstDP ${LANG_JAPANESE} "ƒCƒ“ƒXƒg�[ƒ‹‚Ì‚½‚ß‚ÌŒ ŒÀ‚ðƒ`ƒFƒbƒN’†‚Å‚·..." 

+LangString CheckAdministratorInstMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚é‚É‚ÍŠÇ—�ŽÒŒ ŒÀ‚ª•K—v‚Å‚·�B"

+

+; checkifadministrator function (uninstall)

+LangString CheckAdministratorUnInstDP ${LANG_JAPANESE} "ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚Ì‚½‚ß‚ÌŒ ŒÀ‚ðƒ`ƒFƒbƒN’†‚Å‚·..." 

+LangString CheckAdministratorUnInstMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚·‚é‚É‚ÍŠÇ—�ŽÒŒ ŒÀ‚ª•K—v‚Å‚·�B" 

+

+; checkifalreadycurrent

+LangString CheckIfCurrentMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt${VERSION_LONG} ‚̓Cƒ“ƒXƒg�[ƒ‹�Ï‚Ý‚Å‚·�B�Ä“xƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ü‚·‚©�H " 

+

+; closeimprudence function (install)

+LangString CloseSecondLifeInstDP ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ð�I—¹’†‚Å‚·..." 

+LangString CloseSecondLifeInstMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚Ì‹N“®’†‚ɃCƒ“ƒXƒg�[ƒ‹‚Í�o—ˆ‚Ü‚¹‚ñ�B’¼‚¿‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ð�I—¹‚µ‚ăCƒ“ƒXƒg�[ƒ‹‚ðŠJŽn‚·‚é�ê�‡‚ÍOKƒ{ƒ^ƒ“‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢�BCANCEL‚ð‰Ÿ‚·‚Æ’†Ž~‚µ‚Ü‚·�B"

+

+; closeimprudence function (uninstall)

+LangString CloseSecondLifeUnInstDP ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ð�I—¹’†‚Å‚·..." 

+LangString CloseSecondLifeUnInstMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚Ì‹N“®’†‚ɃAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚Í�o—ˆ‚Ü‚¹‚ñ�B’¼‚¿‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ð�I—¹‚µ‚ăAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚ðŠJŽn‚·‚é�ê�‡‚ÍOKƒ{ƒ^ƒ“‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢�BCANCEL‚ð‰Ÿ‚·‚Æ’†Ž~‚µ‚Ü‚·�B" 

+

+; removecachefiles

+LangString RemoveCacheFilesDP ${LANG_JAPANESE} " Documents and Settings ƒtƒHƒ‹ƒ_‚̃LƒƒƒbƒVƒ…ƒtƒ@ƒCƒ‹‚ðƒfƒŠ�[ƒg’†‚Å‚·�B" 

+

+; delete program files

+LangString DeleteProgramFilesMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚̃fƒBƒŒƒNƒgƒŠ‚É‚Í�A‚Ü‚¾ƒtƒ@ƒCƒ‹‚ªŽc‚³‚ê‚Ä‚¢‚Ü‚·�B$\n$INSTDIR$\n‚É‚ ‚È‚½‚ª�ì�¬�A‚Ü‚½‚͈ړ®‚³‚¹‚½ƒtƒ@ƒCƒ‹‚ª‚ ‚é‰Â”\�«‚ª‚ ‚è‚Ü‚·�B‘S‚Ä�í�œ‚µ‚Ü‚·‚©�H " 

+

+; uninstall text

+LangString UninstallTextMsg ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt${VERSION_LONG}‚ðƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ü‚·�B"

diff --git a/linden/indra/newview/installers/windows/lang_ko.nsi b/linden/indra/newview/installers/windows/lang_ko.nsi
index b570315..2530e4b 100644
--- a/linden/indra/newview/installers/windows/lang_ko.nsi
+++ b/linden/indra/newview/installers/windows/lang_ko.nsi
@@ -1,57 +1,57 @@
-; First is default
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\Korean.nlf"
-
-; subtitle on license text caption
-LangString LicenseSubTitleUpdate ${LANG_KOREAN} "¾÷µ¥ÀÌÆ®"
-LangString LicenseSubTitleSetup ${LANG_KOREAN} " ¼³Ä¡Çϱâ"
-
-; description on license page
-LangString LicenseDescUpdate ${LANG_KOREAN} "ÀÌ ÆÑÅ°Áö´Â ¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¹öÀü${VERSION_LONG}.À¸·Î ¾÷µ¥ÀÌÆ® ÇÕ´Ï´Ù. "
-LangString LicenseDescSetup ${LANG_KOREAN} "ÀÌ ÆÑÅ°Áö´Â ¼¼ÄÁµå¶óÀÌÇÁ¸¦ ÄÄÇ»ÅÍ¿¡ ¼³Ä¡ÇÕ´Ï´Ù."
-LangString LicenseDescNext ${LANG_KOREAN} "´ÙÀ½"
-
-; installation directory text
-LangString DirectoryChooseTitle ${LANG_KOREAN} "¼³Ä¡ µð·ºÅ丮"
-LangString DirectoryChooseUpdate ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¾÷µ¥ÀÌÆ®ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä. "
-LangString DirectoryChooseSetup ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¼³Ä¡ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä:"
-
-; CheckStartupParams message box
-LangString CheckStartupParamsMB ${LANG_KOREAN} " ¡®$INSTPROG¡¯ ÇÁ·Î±×·¥À» ãÁö ¸øÇß½À´Ï´Ù. ÀÚµ¿ ¾÷µ¥ÀÌÆ®¿¡ ½ÇÆÐÇß½À´Ï´Ù."
-
-; installation success dialog
-LangString InstSuccesssQuestion ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ ½ÃÀÛÇÏ°Ú½À´Ï±î?"
-
-; remove old NSIS version
-LangString RemoveOldNSISVersion ${LANG_KOREAN} "ÀÌÀü ¹öÀüÀ» ã°í ÀÖ½À´Ï´Ù¡¦ "
-
-; check windows version
-LangString CheckWindowsVersionDP ${LANG_KOREAN} "À©µµ¿ì ¹öÀüÀ» È®ÀÎÇÏ°í ÀÖ½À´Ï´Ù."
-LangString CheckWindowsVersionMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ´Â À©µµ¿ì XP, À©µµ¿ì 2000, ±×¸®°í ¸Æ OS X¸¦ Áö¿øÇÕ´Ï´Ù. À©µµ¿ì $R0¿¡ ¼³Ä¡¸¦ ½ÃµµÇÏ¸é ¿ÀÀÛµ¿°ú µ¥ÀÌÅÍ ºÐ½ÇÀÌ ÀϾ ¼ö ÀÖ½À´Ï´Ù. °è¼Ó ¼³Ä¡ÇÏ°Ú½À´Ï±î? "
-
-; checkifadministrator function (install)
-LangString CheckAdministratorInstDP ${LANG_KOREAN} "¼³Ä¡ ±ÇÇÑÀ» È®ÀÎ ÁßÀÔ´Ï´Ù... "
-LangString CheckAdministratorInstMB ${LANG_KOREAN} "ÇöÀç ¡®¼Õ´Ô¡¯°èÁ¤À» »ç¿ë ÁßÀÔ´Ï´Ù. ¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¼³Ä¡Çϱâ À§Çؼ± ¡®¿î¿µÀÚ¡± °èÁ¤À» »ç¿ëÇØ¾ß ÇÕ´Ï´Ù."
-
-; checkifadministrator function (uninstall)
-LangString CheckAdministratorUnInstDP ${LANG_KOREAN} "Á¦°Å ±ÇÇÑÀ» È®ÀÎ ÁßÀÔ´Ï´Ù. "
-LangString CheckAdministratorUnInstMB ${LANG_KOREAN} " ÇöÀç ¡®¼Õ´Ô¡¯°èÁ¤À» »ç¿ë ÁßÀÔ´Ï´Ù. ¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¦°ÅÇϱâ À§Çؼ± ¡®¿î¿µÀÚ¡± °èÁ¤À» »ç¿ëÇØ¾ß ÇÕ´Ï´Ù. "
-
-; checkifalreadycurrent
-LangString CheckIfCurrentMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ ¹öÀü ${VERSION_LONG}ÀÌ ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù. ´Ù½Ã ¼³Ä¡ÇϽðڽÀ´Ï±î? "
-
-; closesecondlife function (install)
-LangString CloseSecondLifeInstDP ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÒ ¶§ ±îÁö ´ë±â Áß¡¦ "
-LangString CloseSecondLifeInstMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ°¡ ÀÌ¹Ì ÀÛµ¿ ÁßÀÏ °æ¿ì ¼³Ä¡¸¦ °è¼Ó ÇÒ ¼ö ¾ø½À´Ï´Ù. ÇöÀç ÀÛ¾÷À» ¸ØÃß°í ¡®È®ÀΡ¯À» ´­·¯ ¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÑ ´ÙÀ½ ÁøÇàÇϱ⠹ٶø´Ï´Ù. ¼³Ä¡¸¦ Ãë¼ÒÇÏ·Á¸é ¡®Ãë¼Ò¡¯¸¦ ´©¸£¼¼¿ä." 
-
-; closesecondlife function (uninstall)
-LangString CloseSecondLifeUnInstDP ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÒ ¶§ ±îÁö ´ë±â Áß¡¦¡±"
-LangString CloseSecondLifeUnInstMB ${LANG_KOREAN} " ¼¼ÄÁµå¶óÀÌÇÁ°¡ ÀÌ¹Ì ÀÛµ¿ ÁßÀÏ °æ¿ì Á¦°Å¸¦ °è¼Ó ÇÒ ¼ö ¾ø½À´Ï´Ù. ÇöÀç ÀÛ¾÷À» ¸ØÃß°í ¡®È®ÀΡ¯À» ´­·¯ ¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÑ ´ÙÀ½ ÁøÇàÇϱ⠹ٶø´Ï´Ù. ¼³Ä¡¸¦ ÃëÇÏ·Á¸é ¡®Ãë¼Ò¡¯¸¦ ´©¸£¼¼¿ä. "
-
-; removecachefiles
-LangString RemoveCacheFilesDP ${LANG_KOREAN} " Documents and Settings Æú´õ ³»ÀÇ Ä³½Ã ÆÄÀϵéÀ» Áö¿ó´Ï´Ù."
-
-; delete program files
-LangString DeleteProgramFilesMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ ÇÁ·Î±×·¥ µð·ºÅ丮¿¡ ¾ÆÁ÷ ÆÄÀϵéÀÌ ³²¾Æ ÀÖ½À´Ï´Ù. ÀÌ ÆÄÀϵéÀº »ç¿ëÀÚ°¡ ¸¸µç °ÍµéÀ̰ųª$\n$INSTDIR$\n$\n·Î À̵¿ÇÑ ÆÄÀϵéÀÏ ¼ö ÀÖ½À´Ï´Ù. ÀÌ ÆÄÀϵéÀ» Á¦°ÅÇÏ°Ú½À´Ï±î?" 
-
-; uninstall text
-LangString UninstallTextMsg ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ${VERSION_LONG}À» ½Ã½ºÅÛ¿¡¼­ Á¦°ÅÇÕ´Ï´Ù."
+; First is default

+LoadLanguageFile "${NSISDIR}\Contrib\Language files\Korean.nlf"

+

+; subtitle on license text caption

+LangString LicenseSubTitleUpdate ${LANG_KOREAN} "¾÷µ¥ÀÌÆ®"

+LangString LicenseSubTitleSetup ${LANG_KOREAN} " ¼³Ä¡Çϱâ"

+

+; description on license page

+LangString LicenseDescUpdate ${LANG_KOREAN} "ÀÌ ÆÑÅ°Áö´Â ¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¹öÀü${VERSION_LONG}.À¸·Î ¾÷µ¥ÀÌÆ® ÇÕ´Ï´Ù. "

+LangString LicenseDescSetup ${LANG_KOREAN} "ÀÌ ÆÑÅ°Áö´Â ¼¼ÄÁµå¶óÀÌÇÁ¸¦ ÄÄÇ»ÅÍ¿¡ ¼³Ä¡ÇÕ´Ï´Ù."

+LangString LicenseDescNext ${LANG_KOREAN} "´ÙÀ½"

+

+; installation directory text

+LangString DirectoryChooseTitle ${LANG_KOREAN} "¼³Ä¡ µð·ºÅ丮"

+LangString DirectoryChooseUpdate ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¾÷µ¥ÀÌÆ®ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä. "

+LangString DirectoryChooseSetup ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¼³Ä¡ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä:"

+

+; CheckStartupParams message box

+LangString CheckStartupParamsMB ${LANG_KOREAN} " ¡®$INSTPROG¡¯ ÇÁ·Î±×·¥À» ãÁö ¸øÇß½À´Ï´Ù. ÀÚµ¿ ¾÷µ¥ÀÌÆ®¿¡ ½ÇÆÐÇß½À´Ï´Ù."

+

+; installation success dialog

+LangString InstSuccesssQuestion ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ ½ÃÀÛÇÏ°Ú½À´Ï±î?"

+

+; remove old NSIS version

+LangString RemoveOldNSISVersion ${LANG_KOREAN} "ÀÌÀü ¹öÀüÀ» ã°í ÀÖ½À´Ï´Ù¡¦ "

+

+; check windows version

+LangString CheckWindowsVersionDP ${LANG_KOREAN} "À©µµ¿ì ¹öÀüÀ» È®ÀÎÇÏ°í ÀÖ½À´Ï´Ù."

+LangString CheckWindowsVersionMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ´Â À©µµ¿ì XP, À©µµ¿ì 2000, ±×¸®°í ¸Æ OS X¸¦ Áö¿øÇÕ´Ï´Ù. À©µµ¿ì $R0¿¡ ¼³Ä¡¸¦ ½ÃµµÇÏ¸é ¿ÀÀÛµ¿°ú µ¥ÀÌÅÍ ºÐ½ÇÀÌ ÀϾ ¼ö ÀÖ½À´Ï´Ù. °è¼Ó ¼³Ä¡ÇÏ°Ú½À´Ï±î? "

+

+; checkifadministrator function (install)

+LangString CheckAdministratorInstDP ${LANG_KOREAN} "¼³Ä¡ ±ÇÇÑÀ» È®ÀÎ ÁßÀÔ´Ï´Ù... "

+LangString CheckAdministratorInstMB ${LANG_KOREAN} "ÇöÀç ¡®¼Õ´Ô¡¯°èÁ¤À» »ç¿ë ÁßÀÔ´Ï´Ù. ¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¼³Ä¡Çϱâ À§Çؼ± ¡®¿î¿µÀÚ¡± °èÁ¤À» »ç¿ëÇØ¾ß ÇÕ´Ï´Ù."

+

+; checkifadministrator function (uninstall)

+LangString CheckAdministratorUnInstDP ${LANG_KOREAN} "Á¦°Å ±ÇÇÑÀ» È®ÀÎ ÁßÀÔ´Ï´Ù. "

+LangString CheckAdministratorUnInstMB ${LANG_KOREAN} " ÇöÀç ¡®¼Õ´Ô¡¯°èÁ¤À» »ç¿ë ÁßÀÔ´Ï´Ù. ¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¦°ÅÇϱâ À§Çؼ± ¡®¿î¿µÀÚ¡± °èÁ¤À» »ç¿ëÇØ¾ß ÇÕ´Ï´Ù. "

+

+; checkifalreadycurrent

+LangString CheckIfCurrentMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ ¹öÀü ${VERSION_LONG}ÀÌ ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù. ´Ù½Ã ¼³Ä¡ÇϽðڽÀ´Ï±î? "

+

+; closeimprudence function (install)

+LangString CloseSecondLifeInstDP ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÒ ¶§ ±îÁö ´ë±â Áß¡¦ "

+LangString CloseSecondLifeInstMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ°¡ ÀÌ¹Ì ÀÛµ¿ ÁßÀÏ °æ¿ì ¼³Ä¡¸¦ °è¼Ó ÇÒ ¼ö ¾ø½À´Ï´Ù. ÇöÀç ÀÛ¾÷À» ¸ØÃß°í ¡®È®ÀΡ¯À» ´­·¯ ¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÑ ´ÙÀ½ ÁøÇàÇϱ⠹ٶø´Ï´Ù. ¼³Ä¡¸¦ Ãë¼ÒÇÏ·Á¸é ¡®Ãë¼Ò¡¯¸¦ ´©¸£¼¼¿ä." 

+

+; closeimprudence function (uninstall)

+LangString CloseSecondLifeUnInstDP ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÒ ¶§ ±îÁö ´ë±â Áß¡¦¡±"

+LangString CloseSecondLifeUnInstMB ${LANG_KOREAN} " ¼¼ÄÁµå¶óÀÌÇÁ°¡ ÀÌ¹Ì ÀÛµ¿ ÁßÀÏ °æ¿ì Á¦°Å¸¦ °è¼Ó ÇÒ ¼ö ¾ø½À´Ï´Ù. ÇöÀç ÀÛ¾÷À» ¸ØÃß°í ¡®È®ÀΡ¯À» ´­·¯ ¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÑ ´ÙÀ½ ÁøÇàÇϱ⠹ٶø´Ï´Ù. ¼³Ä¡¸¦ ÃëÇÏ·Á¸é ¡®Ãë¼Ò¡¯¸¦ ´©¸£¼¼¿ä. "

+

+; removecachefiles

+LangString RemoveCacheFilesDP ${LANG_KOREAN} " Documents and Settings Æú´õ ³»ÀÇ Ä³½Ã ÆÄÀϵéÀ» Áö¿ó´Ï´Ù."

+

+; delete program files

+LangString DeleteProgramFilesMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ ÇÁ·Î±×·¥ µð·ºÅ丮¿¡ ¾ÆÁ÷ ÆÄÀϵéÀÌ ³²¾Æ ÀÖ½À´Ï´Ù. ÀÌ ÆÄÀϵéÀº »ç¿ëÀÚ°¡ ¸¸µç °ÍµéÀ̰ųª$\n$INSTDIR$\n$\n·Î À̵¿ÇÑ ÆÄÀϵéÀÏ ¼ö ÀÖ½À´Ï´Ù. ÀÌ ÆÄÀϵéÀ» Á¦°ÅÇÏ°Ú½À´Ï±î?" 

+

+; uninstall text

+LangString UninstallTextMsg ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ${VERSION_LONG}À» ½Ã½ºÅÛ¿¡¼­ Á¦°ÅÇÕ´Ï´Ù."

diff --git a/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh b/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh
index 7ff86d1..3613070 100755
--- a/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh
+++ b/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh
@@ -13,5 +13,5 @@ fi
 RUN_PATH=`dirname "$0" || echo .`
 cd "${RUN_PATH}"
 
-exec ./secondlife -url \'"${URL}"\'
+exec ./imprudence -url \'"${URL}"\'
 
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index 9d2e06b..e1c68b9 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -103,7 +103,7 @@ if [ -n "$LL_TCMALLOC" ]; then
 fi
 
 export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"'
-export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-secondlife-bin'
+export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-imprudence-bin'
 export SL_OPT="`cat gridargs.dat` $@"
 
 # Run the program
@@ -118,9 +118,9 @@ if [ -n "$LL_RUN_ERR" ]; then
                 if [ "`uname -m`" = "x86_64" ]; then
                         echo
                         cat << EOFMARKER
-You are running the Second Life Viewer on a x86_64 platform.  The
+You are running the Imprudence Viewer on a x86_64 platform.  The
 most common problems when launching the Viewer (particularly
-'bin/do-not-directly-run-secondlife-bin: not found' and 'error while
+'bin/do-not-directly-run-imprudence-bin: not found' and 'error while
 loading shared libraries') may be solved by installing your Linux
 distribution's 32-bit compatibility packages.
 For example, on Ubuntu and other Debian-based Linuxes you might run:
@@ -129,11 +129,3 @@ EOFMARKER
                 fi
         fi
 fi
-        
-
-echo
-echo '*******************************************************'
-echo 'This is a BETA release of the Second Life linux client.'
-echo 'Thank you for testing!'
-echo 'Please see README-linux.txt before reporting problems.'
-echo
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index f1b2e32..14214b5 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -293,10 +293,10 @@ BOOL gLogoutInProgress = FALSE;
 // Internal globals... that should be removed.
 static std::string gArgs;
 
-const std::string MARKER_FILE_NAME("SecondLife.exec_marker");
-const std::string ERROR_MARKER_FILE_NAME("SecondLife.error_marker");
-const std::string LLERROR_MARKER_FILE_NAME("SecondLife.llerror_marker");
-const std::string LOGOUT_MARKER_FILE_NAME("SecondLife.logout_marker");
+const std::string MARKER_FILE_NAME("Imprudence.exec_marker");
+const std::string ERROR_MARKER_FILE_NAME("Imprudence.error_marker");
+const std::string LLERROR_MARKER_FILE_NAME("Imprudence.llerror_marker");
+const std::string LOGOUT_MARKER_FILE_NAME("Imprudence.logout_marker");
 static BOOL gDoDisconnect = FALSE;
 static std::string gLaunchFileOnQuit;
 
@@ -308,7 +308,7 @@ const char *VFS_INDEX_FILE_BASE = "index.db2.x.";
 static std::string gSecondLife;
 static std::string gWindowTitle;
 #ifdef LL_WINDOWS
-        static char sWindowClass[] = "Second Life";
+        static char sWindowClass[] = "Imprudence";
 #endif
 
 std::string gLoginPage;
@@ -580,7 +580,7 @@ bool LLAppViewer::init()
         
         // Need to do this initialization before we do anything else, since anything
         // that touches files should really go through the lldir API
-        gDirUtilp->initAppDirs("SecondLife");
+        gDirUtilp->initAppDirs(IMP_VIEWER_NAME);
         // set skin search path to default, will be overridden later
         // this allows simple skinned file lookups to work
         gDirUtilp->setSkinFolder("default");
@@ -602,8 +602,13 @@ bool LLAppViewer::init()
     writeSystemInfo();
 
         // Build a string representing the current version number.
-    gCurrentVersion = llformat("%s %d.%d.%d.%d", 
+    gCurrentVersion = llformat("%s %d.%d.%d %s / %s %d.%d.%d.%d", 
         gSavedSettings.getString("VersionChannelName").c_str(), 
+        IMP_VERSION_MAJOR, 
+        IMP_VERSION_MINOR, 
+        IMP_VERSION_PATCH,
+                IMP_VERSION_TEST,
+        LL_VIEWER_NAME,
         LL_VERSION_MAJOR, 
         LL_VERSION_MINOR, 
         LL_VERSION_PATCH, 
@@ -1470,15 +1475,15 @@ bool LLAppViewer::initLogging()
         
         // Remove the last ".old" log file.
         std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
-                                                             "SecondLife.old");
+                                                             "Imprudence.old");
         LLFile::remove(old_log_file);
 
         // Rename current log file to ".old"
         std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
-                                                             "SecondLife.log");
+                                                             "Imprudence.log");
         LLFile::rename(log_file, old_log_file);
 
-        // Set the log file to SecondLife.log
+        // Set the log file to Imprudence.log
 
         LLError::logToFile(log_file);
 
@@ -1598,12 +1603,7 @@ bool LLAppViewer::initConfiguration()
         gSavedSettings.setString("ClientSettingsFile", 
         gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFileName("Global")));
 
-        gSavedSettings.setString("VersionChannelName", LL_CHANNEL);
-
-#ifndef LL_RELEASE_FOR_DOWNLOAD
-        gSavedSettings.setBOOL("ShowConsoleWindow", TRUE);
-        gSavedSettings.setBOOL("AllowMultipleViewers", TRUE);
-#endif
+        gSavedSettings.setString("VersionChannelName", IMP_VIEWER_NAME);
 
 #if !LL_DYNAMIC_FONT_DISCOVERY
         // static font discovery - user settings can override.
@@ -1683,7 +1683,7 @@ bool LLAppViewer::initConfiguration()
                 llinfos << "Command     line usage:\n" << clp << llendl;
 
                 std::ostringstream msg;
-                msg << "Second Life found an error parsing the command line. \n" 
+                msg << gSecondLife << " found an error parsing the command line. \n" 
                         << "Please see: http://wiki.secondlife.com/wiki/Client_parameters \n"
                         << "Error: " << clp.getErrorMessage();
 
@@ -1865,7 +1865,7 @@ bool LLAppViewer::initConfiguration()
     mYieldTime = gSavedSettings.getS32("YieldTime");
              
         // XUI:translate
-        gSecondLife = "Second Life";
+        gSecondLife = IMP_VIEWER_NAME;
 
         // Read skin/branding settings if specified.
         //if (! gDirUtilp->getSkinDir().empty() )
@@ -2111,7 +2111,7 @@ bool LLAppViewer::initWindow()
 
         // always start windowed
         BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth");
-        gViewerWindow = new LLViewerWindow(gWindowTitle, "Second Life",
+        gViewerWindow = new LLViewerWindow(gWindowTitle, gWindowTitle,
                 gSavedSettings.getS32("WindowX"), gSavedSettings.getS32("WindowY"),
                 gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight"),
                 FALSE, ignorePixelDepth);
@@ -2245,6 +2245,10 @@ void LLAppViewer::writeSystemInfo()
         gDebugInfo["SLLog"] = LLError::logFileName();
 
         gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
+        gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR;
+        gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR;
+        gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH;
+        gDebugInfo["ClientInfo"]["ImpTestVersion"] = IMP_VERSION_TEST;
         gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
         gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
@@ -2274,9 +2278,7 @@ void LLAppViewer::writeSystemInfo()
 #endif
 
         // Dump some debugging info
-        LL_INFOS("SystemInfo") << gSecondLife
-                        << " version " << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH
-                        << LL_ENDL;
+        LL_INFOS("SystemInfo") << gCurrentVersion << LL_ENDL;
 
         // Dump the local time and time zone
         time_t now;
@@ -2327,6 +2329,10 @@ void LLAppViewer::handleViewerCrash()
         //to check against no matter what
         gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
 
+        gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR;
+        gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR;
+        gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH;
+        gDebugInfo["ClientInfo"]["ImpTestVersion"] = IMP_VERSION_TEST;
         gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
         gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
@@ -2680,7 +2686,7 @@ bool LLAppViewer::initCache()
                         std::string cache_dir = gDirUtilp->getOSUserAppDir();
                         std::string new_cache_dir = gDirUtilp->getOSCacheDir();
                         cache_dir = cache_dir + "/cache";
-                        new_cache_dir = new_cache_dir + "/SecondLife";
+                        new_cache_dir = new_cache_dir + "/" + gSecondLife;
                         if (gDirUtilp->fileExists(cache_dir))
                         {
                                 gDirUtilp->setCacheDir(cache_dir);
@@ -2973,7 +2979,7 @@ void LLAppViewer::badNetworkHandler()
         message <<
                 "The viewer has detected mangled network data indicative\n"
                 "of a bad upstream network connection or an incomplete\n"
-                "local installation of " << LLAppViewer::instance()->getSecondLifeTitle() << ". \n"
+                "local installation of " << gSecondLife << ". \n"
                 " \n"
                 "Try uninstalling and reinstalling to see if this resolves \n"
                 "the issue. \n"
diff --git a/linden/indra/newview/llcolorscheme.cpp b/linden/indra/newview/llcolorscheme.cpp
index ef8b4a8..460f1a2 100644
--- a/linden/indra/newview/llcolorscheme.cpp
+++ b/linden/indra/newview/llcolorscheme.cpp
@@ -37,8 +37,6 @@
 
 LLColor4 gTrackColor;
 LLColor4 gSelfMapColor;
-LLColor4 gAvatarMapColor;
-LLColor4 gFriendMapColor;
 LLColor4 gLandmarkMapColor;
 LLColor4 gLocationMapColor;
 LLColor4 gTelehubMapColor;
@@ -56,8 +54,7 @@ void init_colors()
         gDisabledTrackColor.setVec(             0.5f, 0.f, 0.f, 1.f );
 
         gSelfMapColor     = LLColor4::white;
-        gAvatarMapColor   = LLColor4::green;
-        gFriendMapColor   = LLColor4::yellow;
+
         // fleshy color
         //gAvatarMapColor.setVec( 255.f/255.f, 223.f/255.f, 170.f/255.f, 1.f);
 
diff --git a/linden/indra/newview/llcolorscheme.h b/linden/indra/newview/llcolorscheme.h
index e772b11..bf1e053 100644
--- a/linden/indra/newview/llcolorscheme.h
+++ b/linden/indra/newview/llcolorscheme.h
@@ -36,8 +36,6 @@
 
 extern LLColor4 gTrackColor;
 extern LLColor4 gSelfMapColor;
-extern LLColor4 gAvatarMapColor;
-extern LLColor4 gFriendMapColor;
 extern LLColor4 gLandmarkMapColor;
 extern LLColor4 gLocationMapColor;
 extern LLColor4 gTelehubMapColor;
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index 0f89585..5e4aafc 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -951,6 +951,9 @@ BOOL LLDrawable::isVisible() const
                 return TRUE;
         }
         
+#if 0
+        //disabling this code fixes DEV-20105.  Leaving in place in case some other bug pops up as a a result.
+        //should be safe to just always ask the spatial group for visibility.
         if (isActive())
         {
                 if (isRoot())
@@ -973,6 +976,7 @@ BOOL LLDrawable::isVisible() const
                 }
         }
         else
+#endif
         {
                 LLSpatialGroup* group = getSpatialGroup();
                 if (group && group->isVisible())
diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp
index 0dd11d6..73d88f7 100644
--- a/linden/indra/newview/lldrawpoolbump.cpp
+++ b/linden/indra/newview/lldrawpoolbump.cpp
@@ -139,7 +139,7 @@ void LLStandardBumpmap::restoreGL()
                         return;
                 }
 
-//              llinfos << "Loading bumpmap: " << bump_file << " from viewerart" << llendl;
+                llinfos << "Loading bumpmap: " << bump_file << " from viewerart" << llendl;
                 gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mLabel = label;
                 gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage = 
                         gImageList.getImageFromFile(bump_file,
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 76586ed..af436c5 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -109,11 +109,14 @@ LLFloaterAbout::LLFloaterAbout()
         viewer_link_style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
 
         // Version string
-        std::string version = LLAppViewer::instance()->getSecondLifeTitle()
-                + llformat(" %d.%d.%d (%d) %s %s (%s)\n",
-                                   LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
-                                   __DATE__, __TIME__,
-                                   gSavedSettings.getString("VersionChannelName").c_str());
+        std::string version = llformat(
+          "%s %d.%d.%d %s / %s %d.%d.%d (%d), %s %s\n",
+                IMP_VIEWER_NAME,
+          IMP_VERSION_MAJOR, IMP_VERSION_MINOR, IMP_VERSION_PATCH, IMP_VERSION_TEST,
+                LL_VIEWER_NAME,
+          LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
+          __DATE__, __TIME__);
+
         support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
         support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), FALSE, FALSE, &viewer_link_style);
 
@@ -259,17 +262,16 @@ void LLFloaterAbout::show(void*)
 static std::string get_viewer_release_notes_url()
 {
         std::ostringstream version;
-        version << LL_VERSION_MAJOR << "."
-                << LL_VERSION_MINOR << "."
-                << LL_VERSION_PATCH << "."
-                << LL_VERSION_BUILD;
+        version << IMP_VERSION_MAJOR << "."
+                << IMP_VERSION_MINOR << "."
+                << IMP_VERSION_PATCH;
 
-        LLSD query;
-        query["channel"] = gSavedSettings.getString("VersionChannelName");
-        query["version"] = version.str();
+        // Append the test version if it's not empty
+        if( strcmp(IMP_VERSION_TEST, "") != 0 )
+                version << "-" << IMP_VERSION_TEST;
 
         std::ostringstream url;
-        url << RELEASE_NOTES_BASE_URL << LLURI::mapToQueryString(query);
+        url << RELEASE_NOTES_BASE_URL << version.str();
 
         return url.str();
 }
diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp
index 2352be3..4561110 100644
--- a/linden/indra/newview/llfloateractivespeakers.cpp
+++ b/linden/indra/newview/llfloateractivespeakers.cpp
@@ -1363,7 +1363,7 @@ void LLLocalSpeakerMgr::updateSpeakerList()
         for(avatar_it = LLCharacter::sInstances.begin(); avatar_it != LLCharacter::sInstances.end(); ++avatar_it)
         {
                 LLVOAvatar* avatarp = (LLVOAvatar*)*avatar_it;
-                if (dist_vec(avatarp->getPositionAgent(), gAgent.getPositionAgent()) <= CHAT_NORMAL_RADIUS)
+                if (!avatarp->isDead() &&  dist_vec(avatarp->getPositionAgent(), gAgent.getPositionAgent()) <= CHAT_NORMAL_RADIUS)
                 {
                         setSpeaker(avatarp->getID());
                 }
@@ -1377,7 +1377,7 @@ void LLLocalSpeakerMgr::updateSpeakerList()
                 if (speakerp->mStatus == LLSpeaker::STATUS_TEXT_ONLY)
                 {
                         LLVOAvatar* avatarp = (LLVOAvatar*)gObjectList.findObject(speaker_id);
-                        if (!avatarp || dist_vec(avatarp->getPositionAgent(), gAgent.getPositionAgent()) > CHAT_NORMAL_RADIUS)
+                        if (!avatarp || avatarp->isDead() || dist_vec(avatarp->getPositionAgent(), gAgent.getPositionAgent()) > CHAT_NORMAL_RADIUS)
                         {
                                 speakerp->mStatus = LLSpeaker::STATUS_NOT_IN_CHANNEL;
                                 speakerp->mDotColor = INACTIVE_COLOR;
diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp
index 305a029..9a0c2fc 100644
--- a/linden/indra/newview/llfloaterdirectory.cpp
+++ b/linden/indra/newview/llfloaterdirectory.cpp
@@ -383,10 +383,6 @@ void LLFloaterDirectory::showPanel(const std::string& tabname)
 // static
 void LLFloaterDirectory::toggleFind(void*)
 {
-#ifndef LL_RELEASE_FOR_DOWNLOAD
-        delete sInstance;
-        sInstance = NULL;
-#endif
         if (!sInstance)
         {
                 std::string panel = gSavedSettings.getString("LastFindPanel");
diff --git a/linden/indra/newview/llfloatergroupinvite.cpp b/linden/indra/newview/llfloatergroupinvite.cpp
index 643abf7..1644050 100644
--- a/linden/indra/newview/llfloatergroupinvite.cpp
+++ b/linden/indra/newview/llfloatergroupinvite.cpp
@@ -34,7 +34,7 @@
 #include "llfloatergroupinvite.h"
 #include "llpanelgroupinvite.h"
 
-const char FLOATER_TITLE[] = "Group Invitation";
+const char FLOATER_TITLE[] = "Invite to ";
 const LLRect FGI_RECT(0, 380, 210, 0);
 
 class LLFloaterGroupInvite::impl
@@ -132,6 +132,11 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUU
                                                                            group_id);
 
                 impl::sInstances[group_id] = fgi;
+                
+                // Look up the group name.
+                // The callback will insert it into the title.
+                const BOOL is_group = TRUE;
+                gCacheName->get(group_id, is_group, callbackLoadGroupName, NULL);
 
                 fgi->mImpl->mInvitePanelp->clear();
         }
@@ -145,3 +150,16 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUU
         fgi->open();    /*Flawfinder: ignore*/
         fgi->mImpl->mInvitePanelp->update();
 }
+
+void LLFloaterGroupInvite::callbackLoadGroupName(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* data)
+{
+        LLFloaterGroupInvite *fgi = get_if_there(impl::sInstances, id, (LLFloaterGroupInvite*)NULL);
+
+        if (fgi)
+        {
+                // Build a new title including the group name.
+                std::ostringstream title;
+                title << FLOATER_TITLE << first;
+                fgi->setTitle(title.str());
+        }
+}
diff --git a/linden/indra/newview/llfloatergroupinvite.h b/linden/indra/newview/llfloatergroupinvite.h
index 621b5dd..96b9161 100644
--- a/linden/indra/newview/llfloatergroupinvite.h
+++ b/linden/indra/newview/llfloatergroupinvite.h
@@ -52,6 +52,12 @@ protected:
 
         class impl;
         impl* mImpl;
+private:
+        static void callbackLoadGroupName(const LLUUID& id, 
+                                const std::string& first, 
+                                const std::string& last, 
+                                BOOL is_group, 
+                                void* data);
 };
 
 #endif
diff --git a/linden/indra/newview/llfloaterhtmlhelp.cpp b/linden/indra/newview/llfloaterhtmlhelp.cpp
index d6d249e..7fe4d59 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.cpp
+++ b/linden/indra/newview/llfloaterhtmlhelp.cpp
@@ -58,7 +58,9 @@ LLFloaterMediaBrowser::LLFloaterMediaBrowser(const LLSD& media_data)
 
 void LLFloaterMediaBrowser::draw()
 {
-        childSetEnabled("go", !mAddressCombo->getValue().asString().empty());
+        BOOL url_exists = !mAddressCombo->getValue().asString().empty();
+        childSetEnabled("go", url_exists);
+        childSetEnabled("set_home", url_exists);
         LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
         if(parcel)
         {
@@ -84,6 +86,8 @@ BOOL LLFloaterMediaBrowser::postBuild()
         childSetAction("close", onClickClose, this);
         childSetAction("open_browser", onClickOpenWebBrowser, this);
         childSetAction("assign", onClickAssign, this);
+        childSetAction("home", onClickHome, this);
+        childSetAction("set_home", onClickSetHome, this);
 
         buildURLHistory();
         return TRUE;
@@ -146,6 +150,7 @@ void LLFloaterMediaBrowser::onLocationChange( const EventType& eventIn )
         childSetEnabled("back", mBrowser->canNavigateBack());
         childSetEnabled("forward", mBrowser->canNavigateForward());
         childSetEnabled("reload", TRUE);
+        gSavedSettings.setString("BrowserLastVisited", truncated_url);
 }
 
 LLFloaterMediaBrowser* LLFloaterMediaBrowser::showInstance(const LLSD& media_url)
@@ -156,6 +161,14 @@ LLFloaterMediaBrowser* LLFloaterMediaBrowser::showInstance(const LLSD& media_url
         return floaterp;
 }
 
+void LLFloaterMediaBrowser::show()
+{
+        //Show home url if new session, last visited if not
+        std::string last_url = gSavedSettings.getString("BrowserLastVisited");
+        if(last_url.empty()) 
+                last_url = gSavedSettings.getString("BrowserHome");
+        showInstance(last_url);
+}
 //static 
 void LLFloaterMediaBrowser::onEnterAddress(LLUICtrl* ctrl, void* user_data)
 {
@@ -238,6 +251,29 @@ void LLFloaterMediaBrowser::onClickAssign(void* user_data)
 
 }
 
+void LLFloaterMediaBrowser::onClickHome(void* user_data)
+{
+        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+        if (self)
+        {
+                if (self->mBrowser)
+                {
+                        std::string home_url = gSavedSettings.getString("BrowserHome");
+                        self->mBrowser->navigateTo(home_url);
+                }
+        }
+}
+
+void LLFloaterMediaBrowser::onClickSetHome(void* user_data)
+{
+        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+        std::string url = self->mCurrentURL;
+        if(!url.empty())
+        {
+                gSavedSettings.setString("BrowserHome", url);
+        }
+}
+
 void LLFloaterMediaBrowser::openMedia(const std::string& media_url)
 {
         mBrowser->setHomePageUrl(media_url);
diff --git a/linden/indra/newview/llfloaterhtmlhelp.h b/linden/indra/newview/llfloaterhtmlhelp.h
index 7257566..d726b77 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.h
+++ b/linden/indra/newview/llfloaterhtmlhelp.h
@@ -65,6 +65,7 @@ public:
         void buildURLHistory();
 
         static LLFloaterMediaBrowser* showInstance(const LLSD& id);
+        static void show();
         static void onEnterAddress(LLUICtrl* ctrl, void* user_data);
         static void onClickRefresh(void* user_data);
         static void onClickBack(void* user_data);
@@ -73,6 +74,8 @@ public:
         static void onClickClose(void* user_data);
         static void onClickOpenWebBrowser(void* user_data);
         static void onClickAssign(void* user_data);
+        static void onClickHome(void* user_data);
+        static void onClickSetHome(void* user_data);
 
 private:
         LLWebBrowserCtrl* mBrowser;
diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp
index d308210..8a665b5 100644
--- a/linden/indra/newview/llfloaterinspect.cpp
+++ b/linden/indra/newview/llfloaterinspect.cpp
@@ -206,8 +206,9 @@ void LLFloaterInspect::refresh()
         mObjectList->operateOnAll(LLScrollListCtrl::OP_DELETE);
         //List all transient objects, then all linked objects
 
-        for (LLObjectSelection::iterator iter = mObjectSelection->begin();
-                 iter != mObjectSelection->end(); iter++)
+        //Crash fix for VWR-10823
+        for (LLObjectSelection::valid_iterator iter = mObjectSelection->valid_begin(); 
+                                iter != mObjectSelection->valid_end(); iter++) 
         {
                 LLSelectNode* obj = *iter;
                 LLSD row;
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index b277998..22dee9d 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -69,7 +69,7 @@
 
 #include "llglheaders.h"
 
-const F32 MAP_SCALE_MIN = 64;
+const F32 MAP_SCALE_MIN = 32;
 const F32 MAP_SCALE_MID = 172;
 const F32 MAP_SCALE_MAX = 512;
 const F32 MAP_SCALE_INCREMENT = 16;
@@ -97,6 +97,9 @@ LLNetMap::LLNetMap(
         mPixelsPerMeter = gMiniMapScale / REGION_WIDTH_METERS;
 
         LLNetMap::sRotateMap = gSavedSettings.getBOOL( "MiniMapRotate" );
+
+        glyph_color_avatar = gColors.getColor("NetMapGlyphColorAvatar");
+        glyph_color_friend = gColors.getColor("NetMapGlyphColorFriend");
         
         // Surface texture is dynamically generated/updated.
 //      createObjectImage();
@@ -411,7 +414,7 @@ void LLNetMap::draw()
                                 }
                                 LLWorldMapView::drawAvatar(
                                         pos_map.mV[VX], pos_map.mV[VY], 
-                                        show_as_friend ? gFriendMapColor : gAvatarMapColor, 
+                                        show_as_friend ? glyph_color_friend : glyph_color_avatar, 
                                         pos_map.mV[VZ]);
                         }
                 }
diff --git a/linden/indra/newview/llnetmap.h b/linden/indra/newview/llnetmap.h
index 3fb20cc..91027c5 100644
--- a/linden/indra/newview/llnetmap.h
+++ b/linden/indra/newview/llnetmap.h
@@ -84,7 +84,10 @@ protected:
 
 public:
         LLHandle<LLView>        mPopupMenuHandle;
+
         LLColor4                mBackgroundColor;
+        LLColor4                glyph_color_avatar;
+        LLColor4                glyph_color_friend;
 
         F32                             mScale;                                 // Size of a region in pixels
         F32                             mPixelsPerMeter;                // world meters to map pixels
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index ffee058..a495516 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -134,74 +134,14 @@ void LLLoginHandler::parse(const LLSD& queryMap)
         mLastName = queryMap["last_name"].asString();
         
         EGridInfo grid_choice = GRID_INFO_NONE;
-        if (queryMap["grid"].asString() == "aditi")
+        if (queryMap["grid"].asString() == "sl beta grid")
         {
                 grid_choice = GRID_INFO_ADITI;
         }
-        else if (queryMap["grid"].asString() == "agni")
+        else if (queryMap["grid"].asString() == "sl main grid")
         {
                 grid_choice = GRID_INFO_AGNI;
         }
-        else if (queryMap["grid"].asString() == "siva")
-        {
-                grid_choice = GRID_INFO_SIVA;
-        }
-        else if (queryMap["grid"].asString() == "damballah")
-        {
-                grid_choice = GRID_INFO_DAMBALLAH;
-        }
-        else if (queryMap["grid"].asString() == "durga")
-        {
-                grid_choice = GRID_INFO_DURGA;
-        }
-        else if (queryMap["grid"].asString() == "shakti")
-        {
-                grid_choice = GRID_INFO_SHAKTI;
-        }
-        else if (queryMap["grid"].asString() == "soma")
-        {
-                grid_choice = GRID_INFO_SOMA;
-        }
-        else if (queryMap["grid"].asString() == "ganga")
-        {
-                grid_choice = GRID_INFO_GANGA;
-        }
-        else if (queryMap["grid"].asString() == "vaak")
-        {
-                grid_choice = GRID_INFO_VAAK;
-        }
-        else if (queryMap["grid"].asString() == "uma")
-        {
-                grid_choice = GRID_INFO_UMA;
-        }
-        else if (queryMap["grid"].asString() == "mohini")
-        {
-                grid_choice = GRID_INFO_MOHINI;
-        }
-        else if (queryMap["grid"].asString() == "yami")
-        {
-                grid_choice = GRID_INFO_YAMI;
-        }
-        else if (queryMap["grid"].asString() == "nandi")
-        {
-                grid_choice = GRID_INFO_NANDI;
-        }
-        else if (queryMap["grid"].asString() == "mitra")
-        {
-                grid_choice = GRID_INFO_MITRA;
-        }
-        else if (queryMap["grid"].asString() == "radha")
-        {
-                grid_choice = GRID_INFO_RADHA;
-        }
-        else if (queryMap["grid"].asString() == "ravi")
-        {
-                grid_choice = GRID_INFO_RAVI;
-        }
-        else if (queryMap["grid"].asString() == "aruna")
-        {
-                grid_choice = GRID_INFO_ARUNA;
-        }
 
         if(grid_choice != GRID_INFO_NONE)
         {
@@ -419,15 +359,25 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 
         // childSetAction("quit_btn", onClickQuit, this);
 
-        std::string channel = gSavedSettings.getString("VersionChannelName");
-        std::string version = llformat("%d.%d.%d (%d)",
+        std::string imp_channel = gSavedSettings.getString("VersionChannelName");
+        std::string imp_version = llformat("%d.%d.%d %s",
+                IMP_VERSION_MAJOR,
+                IMP_VERSION_MINOR,
+                IMP_VERSION_PATCH,
+                IMP_VERSION_TEST );
+
+        std::string ll_channel = LL_VIEWER_NAME;
+        std::string ll_version = llformat("%d.%d.%d (%d)",
                 LL_VERSION_MAJOR,
                 LL_VERSION_MINOR,
                 LL_VERSION_PATCH,
                 LL_VIEWER_BUILD );
+
         LLTextBox* channel_text = getChild<LLTextBox>("channel_text");
-        channel_text->setTextArg("[CHANNEL]", channel);
-        channel_text->setTextArg("[VERSION]", version);
+        channel_text->setTextArg("[CHANNEL]", imp_channel);
+        channel_text->setTextArg("[VERSION]", imp_version);
+        channel_text->setTextArg("[ALT_CHANNEL]", ll_channel);
+        channel_text->setTextArg("[ALT_VERSION]", ll_version);
         channel_text->setClickedCallback(onClickVersion);
         channel_text->setCallbackUserData(this);
         
@@ -762,6 +712,14 @@ void LLPanelLogin::addServer(const std::string& server, S32 domain_name)
         combo->setCurrentByIndex(0);
 }
 
+
+// static
+void LLPanelLogin::setServer(S32 domain_name)
+{
+        LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
+        combo->setCurrentByIndex(domain_name);
+}
+
 // static
 void LLPanelLogin::getFields(std::string &firstname, std::string &lastname, std::string &password,
                                                         BOOL &remember)
@@ -840,12 +798,7 @@ void LLPanelLogin::refreshLocation( bool force_visible )
         sInstance->childSetVisible("start_location_combo", show_start);
         sInstance->childSetVisible("start_location_text", show_start);
 
-#if LL_RELEASE_FOR_DOWNLOAD
-        BOOL show_server = gSavedSettings.getBOOL("ForceShowGrid");
-        sInstance->childSetVisible("server_combo", show_server);
-#else
         sInstance->childSetVisible("server_combo", TRUE);
-#endif
 
 #endif
 }
@@ -928,7 +881,7 @@ void LLPanelLogin::loadLoginPage()
         curl_free(curl_version);
 
         // Grid
-        char* curl_grid = curl_escape(LLViewerLogin::getInstance()->getGridLabel().c_str(), 0);
+        char* curl_grid = curl_escape(LLViewerLogin::getInstance()->getGridCodeName().c_str(), 0);
         oStr << "&grid=" << curl_grid;
         curl_free(curl_grid);
 
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index 539997b..78b0a22 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -87,6 +87,7 @@ public:
                 const std::string& password, BOOL remember);
 
         static void addServer(const std::string& server, S32 domain_name);
+        static void setServer(S32 domain_name);
         static void refreshLocation( bool force_visible );
 
         static void getFields(std::string& firstname, std::string& lastname,
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 2e4983c..90b1bd3 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -5745,7 +5745,8 @@ BOOL LLSelectMgr::canSelectObject(LLViewerObject* object)
         }
 
         if ((gSavedSettings.getBOOL("SelectOwnedOnly") && !object->permYouOwner()) ||
-                (gSavedSettings.getBOOL("SelectMovableOnly") && !object->permMove()))
+                (gSavedSettings.getBOOL("SelectMovableOnly") && !object->permMove()) ||
+                (gSavedSettings.getBOOL("SelectCopyableOnly") && !object->permCopy()))
         {
                 // only select my own objects
                 return FALSE;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 0978fbb..6371f2b 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2458,14 +2458,14 @@ void login_show()
         // UI textures have been previously loaded in doPreloadImages()
         
         LL_DEBUGS("AppInit") << "Setting Servers" << LL_ENDL;
-
-        LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel(), LLViewerLogin::getInstance()->getGridChoice());
+        LL_INFOS("AppInit") << "getGridChoice is " << LLViewerLogin::getInstance()->getGridChoice() << LL_ENDL;
 
         LLViewerLogin* vl = LLViewerLogin::getInstance();
-        for(int grid_index = GRID_INFO_ADITI; grid_index < GRID_INFO_OTHER; ++grid_index)
+        for(int grid_index = GRID_INFO_NONE + 1; grid_index < GRID_INFO_OTHER; ++grid_index)
         {
                 LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index), grid_index);
         }
+        LLPanelLogin::setServer(LLViewerLogin::getInstance()->getGridChoice()-1);
 }
 
 // Callback for when login screen is closed.  Option 0 = connect, option 1 = quit.
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index ce35377..8044859 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -892,6 +892,8 @@ LLTextureCache::LLTextureCache(bool threaded)
 
 LLTextureCache::~LLTextureCache()
 {
+        purgeTextureFilesTimeSliced(TRUE); // force-flush all pending file deletes
+
         apr_pool_destroy(mFileAPRPool);
 }
 
@@ -1196,7 +1198,7 @@ void LLTextureCache::purgeTextures(bool validate)
                 return;
         }
         
-        LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Reading Entries..." << LL_ENDL;
+        LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Reading " << num_entries << " Entries from " << mTexturesDirEntriesFileName << LL_ENDL;
         
         std::map<LLUUID, S32> entry_idx_map;
         S64 total_size = 0;
@@ -1225,7 +1227,7 @@ void LLTextureCache::purgeTextures(bool validate)
                 LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Validating: " << validate_idx << LL_ENDL;
         }
         
-        S64 min_cache_size = (sCacheMaxTexturesSize * 9) / 10;
+        S64 min_cache_size = sCacheMaxTexturesSize / 100 * 95;
         S32 purge_count = 0;
         S32 next_idx = 0;
         for (S32 idx=0; idx<num_entries; idx++)
@@ -1259,8 +1261,8 @@ void LLTextureCache::purgeTextures(bool validate)
                 if (purge_entry)
                 {
                         purge_count++;
-                        LL_DEBUGS("TextureCache") << "PURGING: " << filename << LL_ENDL;
-                        ll_apr_file_remove(filename, NULL);
+                        LL_DEBUGS("TextureCache") << "PURGING: " << filename << LL_ENDL;
+                        mFilesToDelete.push_back(filename);
                         total_size -= entries[idx].mSize;
                         entries[idx].mSize = 0;
                 }
@@ -1275,7 +1277,11 @@ void LLTextureCache::purgeTextures(bool validate)
         }
         num_entries = next_idx;
 
-        LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Writing Entries: " << num_entries << LL_ENDL;
+        mTimeLastFileDelete.reset();
+
+        LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Writing Entries: " 
+                << num_entries << " (" << num_entries*sizeof(Entry)/1024 << "KB)"
+                << LL_ENDL;
         
         ll_apr_file_remove(mTexturesDirEntriesFileName, NULL);
         ll_apr_file_write_ex(mTexturesDirEntriesFileName, NULL,
@@ -1298,10 +1304,56 @@ void LLTextureCache::purgeTextures(bool validate)
         LL_INFOS("TextureCache") << "TEXTURE CACHE:"
                         << " PURGED: " << purge_count
                         << " ENTRIES: " << num_entries
-                        << " CACHE SIZE: " << total_size / 1024*1024 << " MB"
+                        << " CACHE SIZE: " << total_size/1024/1024 << " MB"
                         << llendl;
 }
 
+
+void LLTextureCache::purgeTextureFilesTimeSliced(BOOL force_all)
+{
+        LLMutexLock lock(&mHeaderMutex);
+
+        F32 delay_between_passes = 1.0f; // seconds
+        F32 max_time_per_pass = 0.1f; // seconds
+
+        if (!force_all && mTimeLastFileDelete.getElapsedTimeF32() <= delay_between_passes) 
+        {
+                return;
+        }
+
+        LLTimer timer;
+        S32 howmany = 0;
+
+        if (mFilesToDelete.size() > 0)
+        {
+                llinfos << "TEXTURE CACHE: " << mFilesToDelete.size() << " files scheduled for deletion" << llendl;
+        }
+
+        for (LLTextureCache::filename_list_t::iterator iter = mFilesToDelete.begin(); iter!=mFilesToDelete.end(); ) 
+        {       
+                LLTextureCache::filename_list_t::iterator iter2 = iter++;
+                ll_apr_file_remove(*iter2, NULL);
+                mFilesToDelete.erase(iter2);
+                howmany++;
+
+                if (!force_all && timer.getElapsedTimeF32() > max_time_per_pass) 
+                {
+                        break;
+                }
+        }
+
+        if (!mFilesToDelete.empty())
+        {
+                llinfos << "TEXTURE CACHE: "<< howmany << " files deleted (" 
+                                << mFilesToDelete.size() << " files left for next pass)" 
+                                << llendl;
+        }
+
+        mTimeLastFileDelete.reset();
+}
+
+
+
 //////////////////////////////////////////////////////////////////////////////
 
 // call lockWorkers() first!
@@ -1471,6 +1523,10 @@ LLTextureCache::handle_t LLTextureCache::writeToCache(const LLUUID& id, U32 prio
                 purgeTextures(false);
                 mDoPurge = FALSE;
         }
+
+        purgeTextureFilesTimeSliced();  // purge textures from cache in a non-hiccup-way
+
+
         if (datasize >= TEXTURE_CACHE_ENTRY_SIZE)
         {
                 LLMutexLock lock(&mWorkersMutex);
diff --git a/linden/indra/newview/lltexturecache.h b/linden/indra/newview/lltexturecache.h
index 4bac15c..b5abb67 100644
--- a/linden/indra/newview/lltexturecache.h
+++ b/linden/indra/newview/lltexturecache.h
@@ -122,6 +122,7 @@ private:
         void readHeaderCache(apr_pool_t* poolp = NULL);
         void purgeAllTextures(bool purge_directories);
         void purgeTextures(bool validate);
+        void purgeTextureFilesTimeSliced(BOOL force_all = FALSE);
         S32 getHeaderCacheEntry(const LLUUID& id, bool touch, S32* imagesize = NULL);
         bool removeHeaderCacheEntry(const LLUUID& id);
         void lockHeaders() { mHeaderMutex.lock(); }
@@ -143,6 +144,10 @@ private:
 
         typedef std::vector<std::pair<LLPointer<Responder>, bool> > responder_list_t;
         responder_list_t mCompletedList;
+
+        typedef std::list<std::string> filename_list_t;
+        filename_list_t mFilesToDelete;
+        LLTimer mTimeLastFileDelete;
         
         BOOL mReadOnly;
         
diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index 39070b7..72ee24b 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -850,6 +850,12 @@ void LLToolDragAndDrop::dragOrDrop( S32 x, S32 y, MASK mask, BOOL drop,
                 {
                         LLInventoryObject* cargo = locateInventory(item, cat);
 
+                        if (!cargo) 
+                        {
+                                handled = FALSE;
+                                break;
+                        }
+
                         EAcceptance item_acceptance = ACCEPT_NO;
                         handled = handled && root_view->handleDragAndDrop(x, y, mask, FALSE,
                                                                                                 mCargoTypes[mCurItemIndex],
diff --git a/linden/indra/newview/llurlhistory.cpp b/linden/indra/newview/llurlhistory.cpp
index ac3fa93..c10add4 100644
--- a/linden/indra/newview/llurlhistory.cpp
+++ b/linden/indra/newview/llurlhistory.cpp
@@ -72,9 +72,17 @@ bool LLURLHistory::loadFile(const std::string& filename)
 
 // static
 bool LLURLHistory::saveFile(const std::string& filename)
-{
-        std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
-        llofstream out((temp_str + filename));
+{       
+        std::string temp_str = gDirUtilp->getLindenUserDir();
+        if( temp_str.empty() )
+        {
+                llwarns << "Can't save " << filename 
+                        << ": No user directory set." << llendl;
+                return false;
+        }
+
+        temp_str += gDirUtilp->getDirDelimiter() + filename;
+        llofstream out(temp_str);
         if (!out.good())
         {
                 llwarns << "Unable to open " << filename << " for output." << llendl;
diff --git a/linden/indra/newview/llviewerjointattachment.h b/linden/indra/newview/llviewerjointattachment.h
index 8e665aa..a69c10c 100644
--- a/linden/indra/newview/llviewerjointattachment.h
+++ b/linden/indra/newview/llviewerjointattachment.h
@@ -98,8 +98,7 @@ protected:
         void calcLOD();
         
 protected:
-        // Backlink only; don't make this an LLPointer.
-        LLViewerObject* mAttachedObject;
+        LLPointer<LLViewerObject> mAttachedObject;
         BOOL                    mVisibleInFirst;
         LLVector3               mOriginalPos;
         S32                             mGroup;
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 5e67712..3bf390e 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -5305,6 +5305,10 @@ class LLShowFloater : public view_listener_t
                 {
                         LLFloaterActiveSpeakers::toggleInstance(LLSD());
                 }
+                else if (floater_name == "inworld browser")
+                {
+                        LLFloaterMediaBrowser::show();
+                }
                 return true;
         }
 };
@@ -6714,6 +6718,18 @@ class LLToolsSelectOnlyMovableObjects : public view_listener_t
         }
 };
 
+class LLToolsSelectOnlyCopyableObjects : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                BOOL cur_val = gSavedSettings.getBOOL("SelectCopyableOnly");
+
+                gSavedSettings.setBOOL("SelectCopyableOnly", ! cur_val );
+
+                return true;
+        }
+};
+
 class LLToolsSelectBySurrounding : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -9829,6 +9845,7 @@ void initialize_menus()
         addMenu(new LLToolsSelectTool(), "Tools.SelectTool");
         addMenu(new LLToolsSelectOnlyMyObjects(), "Tools.SelectOnlyMyObjects");
         addMenu(new LLToolsSelectOnlyMovableObjects(), "Tools.SelectOnlyMovableObjects");
+        addMenu(new LLToolsSelectOnlyCopyableObjects(), "Tools.SelectOnlyCopyableObjects");
         addMenu(new LLToolsSelectBySurrounding(), "Tools.SelectBySurrounding");
         addMenu(new LLToolsShowHiddenSelection(), "Tools.ShowHiddenSelection");
         addMenu(new LLToolsShowSelectionLightRadius(), "Tools.ShowSelectionLightRadius");
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 13d432a..9019b88 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -38,6 +38,7 @@
 struct LLGridData
 {
         const char* mLabel;
+  const char* mCodeName;
         const char* mName;
         const char* mLoginURI;
         const char* mHelperURI;
@@ -45,83 +46,23 @@ struct LLGridData
 
 static LLGridData gGridInfo[GRID_INFO_COUNT] = 
 {
-        { "None", "", "", ""},
-        { "Aditi", 
-          "util.aditi.lindenlab.com", 
-          "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
-          "http://aditi-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Agni", 
+        { "None", "", "", "", "" },
+        { "SL Main Grid",
+          "Agni",
           "util.agni.lindenlab.com", 
           "https://login.agni.lindenlab.com/cgi-bin/login.cgi",
           "https://secondlife.com/helpers/" },
-        { "Aruna",
-          "util.aruna.lindenlab.com",
-          "https://login.aruna.lindenlab.com/cgi-bin/login.cgi",
-          "http://aruna-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Damballah",
-          "util.damballah.lindenlab.com",
-          "https://login.damballah.lindenlab.com/cgi-bin/login.cgi",
-          "http://damballah-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Durga",
-          "util.durga.lindenlab.com",
-          "https://login.durga.lindenlab.com/cgi-bin/login.cgi",
-          "http://durga-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Ganga",
-          "util.ganga.lindenlab.com",
-          "https://login.ganga.lindenlab.com/cgi-bin/login.cgi",
-          "http://ganga-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Mitra",
-          "util.mitra.lindenlab.com",
-          "https://login.mitra.lindenlab.com/cgi-bin/login.cgi",
-          "http://mitra-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Mohini",
-          "util.mohini.lindenlab.com",
-          "https://login.mohini.lindenlab.com/cgi-bin/login.cgi",
-          "http://mohini-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Nandi",
-          "util.nandi.lindenlab.com",
-          "https://login.nandi.lindenlab.com/cgi-bin/login.cgi",
-          "http://nandi-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Radha",
-          "util.radha.lindenlab.com",
-          "https://login.radha.lindenlab.com/cgi-bin/login.cgi",
-          "http://radha-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Ravi",
-          "util.ravi.lindenlab.com",
-          "https://login.ravi.lindenlab.com/cgi-bin/login.cgi",
-          "http://ravi-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Siva", 
-          "util.siva.lindenlab.com",
-          "https://login.siva.lindenlab.com/cgi-bin/login.cgi",
-          "http://siva-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Shakti",
-          "util.shakti.lindenlab.com",
-          "https://login.shakti.lindenlab.com/cgi-bin/login.cgi",
-          "http://shakti-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Soma",
-          "util.soma.lindenlab.com",
-          "https://login.soma.lindenlab.com/cgi-bin/login.cgi",
-          "http://soma-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Uma",
-          "util.uma.lindenlab.com",
-          "https://login.uma.lindenlab.com/cgi-bin/login.cgi",
-          "http://uma-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Vaak",
-          "util.vaak.lindenlab.com",
-          "https://login.vaak.lindenlab.com/cgi-bin/login.cgi",
-          "http://vaak-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Yami",
-          "util.yami.lindenlab.com",
-          "https://login.yami.lindenlab.com/cgi-bin/login.cgi",
-          "http://yami-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Local", 
-          "localhost", 
-          "https://login.dmz.lindenlab.com/cgi-bin/login.cgi",
+        { "SL Beta Grid",
+          "Aditi",
+          "util.aditi.lindenlab.com",
+          "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
+          "http://aditi-secondlife.webdev.lindenlab.com/helpers/" },
+        { "Local OpenSim",
+          "",
+          "localhost",
+          "http://127.0.0.1:9000",
           "" },
-        { "Other", 
-          "", 
-          "https://login.dmz.lindenlab.com/cgi-bin/login.cgi",
-          "" }
+        { "Other", "", "", "", "" }
 };
 
 const EGridInfo DEFAULT_GRID_CHOICE = GRID_INFO_AGNI;
@@ -169,34 +110,34 @@ void LLViewerLogin::setGridChoice(const std::string& grid_name)
         // The string can be:
         // - a grid label from the gGridInfo table 
         // - an ip address
-    if(!grid_name.empty())
-    {
-        // find the grid choice from the user setting.
-        int grid_index = GRID_INFO_NONE; 
-        for(;grid_index < GRID_INFO_OTHER; ++grid_index)
-        {
-            if(0 == LLStringUtil::compareInsensitive(gGridInfo[grid_index].mLabel, grid_name))
-            {
+        if(!grid_name.empty())
+        {
+                // find the grid choice from the user setting.
+                int grid_index = GRID_INFO_NONE; 
+                for(;grid_index < GRID_INFO_OTHER; ++grid_index)
+                {
+                        if(0 == LLStringUtil::compareInsensitive(gGridInfo[grid_index].mLabel, grid_name))
+                        {
                                 // Founding a matching label in the list...
                                 setGridChoice((EGridInfo)grid_index);
                                 break;
-            }
-        }
+                        }
+                }
 
-        if(GRID_INFO_OTHER == grid_index)
-        {
-            // *FIX:MEP Can and should we validate that this is an IP address?
-            mGridChoice = GRID_INFO_OTHER;
-            mGridName = grid_name;
+                if(GRID_INFO_OTHER == grid_index)
+                {
+                        // *FIX:MEP Can and should we validate that this is an IP address?
+                        mGridChoice = GRID_INFO_OTHER;
+                        mGridName = grid_name;
                         gSavedSettings.setS32("ServerChoice", mGridChoice);
                         gSavedSettings.setString("CustomServer", mGridName);
-        }
-    }
+                }
+        }
 }
 
 void LLViewerLogin::resetURIs()
 {
-    // Clear URIs when picking a new server
+        // Clear URIs when picking a new server
         gSavedSettings.setValue("CmdLineLoginURI", LLSD::emptyArray());
         gSavedSettings.setString("CmdLineHelperURI", "");
 }
@@ -220,6 +161,17 @@ std::string LLViewerLogin::getGridLabel() const
         return mGridName;
 }
 
+std::string LLViewerLogin::getGridCodeName() const
+{
+        // Fall back to grid label if code name is empty.
+        if( strcmp(gGridInfo[mGridChoice].mCodeName, "") == 0 )
+        {
+                return getGridLabel();
+        }
+
+        return gGridInfo[mGridChoice].mCodeName;
+}
+
 std::string LLViewerLogin::getKnownGridLabel(EGridInfo grid_index) const
 {
         if(grid_index > GRID_INFO_NONE && grid_index < GRID_INFO_OTHER)
diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h
index 53bb0ab..970e2ce 100644
--- a/linden/indra/newview/llviewernetwork.h
+++ b/linden/indra/newview/llviewernetwork.h
@@ -38,23 +38,8 @@ class LLHost;
 enum EGridInfo
 {
         GRID_INFO_NONE,
-        GRID_INFO_ADITI,
         GRID_INFO_AGNI,
-        GRID_INFO_ARUNA,
-        GRID_INFO_DAMBALLAH,
-        GRID_INFO_DURGA,
-        GRID_INFO_GANGA,
-        GRID_INFO_MITRA,
-        GRID_INFO_MOHINI,
-        GRID_INFO_NANDI,
-        GRID_INFO_RADHA,
-        GRID_INFO_RAVI,
-        GRID_INFO_SIVA,
-        GRID_INFO_SHAKTI,
-        GRID_INFO_SOMA,
-        GRID_INFO_UMA,
-        GRID_INFO_VAAK,
-        GRID_INFO_YAMI,
+        GRID_INFO_ADITI,
         GRID_INFO_LOCAL,
         GRID_INFO_OTHER, // IP address set via command line option
         GRID_INFO_COUNT
@@ -87,6 +72,20 @@ public:
         **/
         std::string getGridLabel() const; 
 
+  /**
+   * @brief Get the code name for the grid choice.
+   *
+   * Returns the code name for the grid choice, as designated
+   * by Linden Lab. The SL main grid is Agni, and the beta
+   * grid is Aditi. There are other LL testing grids with code
+   * names, but we don't care about those.
+   *
+   * This string is used primarily for fetching the proper
+   * login splash page, since the web server expects "Agni"
+   * and "Aditi", not "SL Main Grid" and "SL Beta Grid".
+   */
+        std::string getGridCodeName() const; 
+
         std::string getKnownGridLabel(EGridInfo grid_index) const; 
 
         void getLoginURIs(std::vector<std::string>& uris) const;
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index 163b039..4fac9bc 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -861,6 +861,10 @@ void LLViewerObjectList::killObjects(LLViewerRegion *regionp)
                 if (objectp->mRegionp == regionp)
                 {
                         killObject(objectp);
+
+                        // invalidate region pointer. region will become invalid, but 
+                        // refcounted objects may survive the cleanDeadObjects() call below
+                        objectp->mRegionp = NULL;        
                 }
         }
 
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 08dc979..2944d9d 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -1022,6 +1022,8 @@ void LLViewerRegion::updateCoarseLocations(LLMessageSystem* msg)
         U8 z_pos = 0;
 
         U32 pos = 0x0;
+        
+        LLUUID agent_id = LLUUID::null;
 
         S16 agent_index;
         S16 target_index;
@@ -1034,6 +1036,7 @@ void LLViewerRegion::updateCoarseLocations(LLMessageSystem* msg)
                 msg->getU8Fast(_PREHASH_Location, _PREHASH_X, x_pos, i);
                 msg->getU8Fast(_PREHASH_Location, _PREHASH_Y, y_pos, i);
                 msg->getU8Fast(_PREHASH_Location, _PREHASH_Z, z_pos, i);
+                msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id, i);
 
                 //llinfos << "  object X: " << (S32)x_pos << " Y: " << (S32)y_pos
                 //              << " Z: " << (S32)(z_pos * 4)
@@ -1059,6 +1062,7 @@ void LLViewerRegion::updateCoarseLocations(LLMessageSystem* msg)
                         pos <<= 8;
                         pos |= z_pos;
                         mMapAvatars.put(pos);
+                        mMapAvatarIDs.put(agent_id);
                 }
         }
 }
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 64c042a..2e77316 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -470,7 +470,7 @@ public:
                         ypos += y_inc;
                 }
                 // only display these messages if we are actually rendering beacons at this moment
-                if (LLPipeline::getRenderBeacons(NULL) && gSavedSettings.getBOOL("BeaconAlwaysOn"))
+                if (LLPipeline::getRenderBeacons(NULL) && gSavedSettings.getBOOL("BeaconsEnabled"))
                 {
                         if (LLPipeline::getRenderParticleBeacons(NULL))
                         {
diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp
index 66c4068..4dee103 100644
--- a/linden/indra/newview/llworld.cpp
+++ b/linden/indra/newview/llworld.cpp
@@ -365,9 +365,14 @@ LLVector3d	LLWorld::clipToVisibleRegions(const LLVector3d &start_pos, const LLVe
                 clip_factor = (region_coord.mV[VY] - region_width) / delta_pos_abs.mdV[VY];
         }
 
-        // clamp to < 256 to stay in sim
+        // clamp to within region dimensions
         LLVector3d final_region_pos = LLVector3d(region_coord) - (delta_pos * clip_factor);
-        final_region_pos.clamp(0.0, 255.999);
+        final_region_pos.mdV[VX] = llclamp(final_region_pos.mdV[VX], 0.0,
+                                                                           (F64)(region_width - F_ALMOST_ZERO));
+        final_region_pos.mdV[VY] = llclamp(final_region_pos.mdV[VY], 0.0,
+                                                                           (F64)(region_width - F_ALMOST_ZERO));
+        final_region_pos.mdV[VZ] = llclamp(final_region_pos.mdV[VZ], 0.0,
+                                                                           (F64)(LLWorld::getInstance()->getRegionMaxHeight()));
         return regionp->getPosGlobalFromRegion(LLVector3(final_region_pos));
 }
 
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 92d9588..0d266dd 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -208,6 +208,8 @@ LLWorldMapView::LLWorldMapView(const std::string& name, const LLRect& rect )
         mTextBoxNorthWest = new LLTextBox( std::string("NW"), minor_dir_rect );
         mTextBoxNorthWest->setColor( minor_color );
         addChild( mTextBoxNorthWest );
+
+        glyph_color_avatar = gColors.getColor("NetMapGlyphColorAvatar");
 }
 
 
@@ -886,8 +888,8 @@ void LLWorldMapView::drawAgents()
                                 S32 agent_count = info.mExtra;
                                 sim_agent_count += info.mExtra;
                                 // Here's how we'd choose the color if info.mID were available but it's not being sent:
-                                //LLColor4 color = (agent_count == 1 && is_agent_friend(info.mID)) ? gFriendMapColor : gAvatarMapColor;
-                                drawImageStack(info.mPosGlobal, sAvatarSmallImage, agent_count, 3.f, gAvatarMapColor);
+                                //LLColor4 color = (agent_count == 1 && is_agent_friend(info.mID)) ? glyph_color_friend : glyph_color_avatar;
+                                drawImageStack(info.mPosGlobal, sAvatarSmallImage, agent_count, 3.f, glyph_color_avatar);
                         }
                         LLWorldMap::getInstance()->mNumAgents[handle] = sim_agent_count; // override mNumAgents for this sim
                 }
@@ -902,7 +904,7 @@ void LLWorldMapView::drawAgents()
                                 region_center[VY] += REGION_WIDTH_METERS / 2;
                                 // Reduce the stack size as you zoom out - always display at lease one agent where there is one or more
                                 S32 agent_count = (S32)(((num_agents-1) * agents_scale + (num_agents-1) * 0.1f)+.1f) + 1;
-                                drawImageStack(region_center, sAvatarSmallImage, agent_count, 3.f, gAvatarMapColor);
+                                drawImageStack(region_center, sAvatarSmallImage, agent_count, 3.f, glyph_color_avatar);
                         }
                 }
         }
diff --git a/linden/indra/newview/llworldmapview.h b/linden/indra/newview/llworldmapview.h
index 915a196..53f0bdd 100644
--- a/linden/indra/newview/llworldmapview.h
+++ b/linden/indra/newview/llworldmapview.h
@@ -189,6 +189,8 @@ public:
         handle_list_t mVisibleRegions; // set every frame
 
         static std::map<std::string,std::string> sStringsMap;
+
+        LLColor4                glyph_color_avatar;
 };
 
 #endif
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index f232fdf..3523635 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -2101,7 +2101,7 @@ void LLPipeline::postSort(LLCamera& camera)
         }
 
         // only render if the flag is set. The flag is only set if we are in edit mode or the toggle is set in the menus
-        if (gSavedSettings.getBOOL("BeaconAlwaysOn"))
+        if (gSavedSettings.getBOOL("BeaconsEnabled"))
         {
                 if (sRenderScriptedTouchBeacons)
                 {
diff --git a/linden/indra/newview/res-sdl/imprudence_icon.BMP b/linden/indra/newview/res-sdl/imprudence_icon.BMP
new file mode 100644
index 0000000..c3f4887
--- /dev/null
+++ b/linden/indra/newview/res-sdl/imprudence_icon.BMP
diff --git a/linden/indra/newview/res/imprudence_icon.png b/linden/indra/newview/res/imprudence_icon.png
new file mode 100644
index 0000000..8795fa7
--- /dev/null
+++ b/linden/indra/newview/res/imprudence_icon.png
diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc
index a39bb9f..002830a 100644
--- a/linden/indra/newview/res/viewerRes.rc
+++ b/linden/indra/newview/res/viewerRes.rc
@@ -247,14 +247,14 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "Linden Lab"
-            VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.20.9.87416"
-            VALUE "InternalName", "Second Life"
+            VALUE "CompanyName", "Imprudence Viewer Project"
+            VALUE "FileDescription", "Imprudence"
+            VALUE "FileVersion", "1.0.0"
+            VALUE "InternalName", "Imprudence"
             VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
-            VALUE "OriginalFilename", "SecondLife.exe"
-            VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.20.9.87416"
+            VALUE "OriginalFilename", "Imprudence.exe"
+            VALUE "ProductName", "Imprudence"
+            VALUE "ProductVersion", "1.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index 3b85efa..ff3d53e 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -1,146 +1,180 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings version = "101">
-    
+<!-- Additional comments by McCabe Maxsted -->
+ 
 <!-- WINDOWS -->
-<TitleBarFocusColor value="255, 255, 255, 30" />        <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
-<FloaterFocusBorderColor value="0, 0, 0, 80" />
-<FloaterUnfocusBorderColor value="0, 0, 0, 80" />
-<FocusBackgroundColor value="62, 62, 62, 255" />        <!-- Background color of focused floaters -->
-<DefaultBackgroundColor value="62, 62, 62, 140" />      <!-- Background color for unfocused floaters -->
-<ColorDropShadow value="0, 0, 0, 200" />                <!-- The drop shadow behind windows and menus -->
+<TitleBarFocusColor value="255, 255, 255, 30" />        <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
+<FloaterFocusBorderColor value="0, 0, 0, 80" />         <!-- Focused window border color -->
+<FloaterUnfocusBorderColor value="0, 0, 0, 80" />       <!-- Unfocused window border color -->
+<FocusBackgroundColor value="62, 62, 62, 255" />        <!-- Background color of focused windows -->
+<DefaultBackgroundColor value="62, 62, 62, 140" />      <!-- Background color for unfocused windows -->
+<ColorDropShadow value="0, 0, 0, 200" />                <!-- The drop shadow behind windows and menus -->
 <DefaultHighlightDark value="26, 26, 26, 255" />
-<DefaultHighlightLight value="115, 132, 155, 255" />
-<DefaultShadowDark value="26, 26, 26, 255" />
-<DefaultShadowLight value="0, 0, 0, 255" />
-
-<!-- LABELS -->
-<LabelDisabledColor value="147, 169, 213, 77" />
-<LabelSelectedColor value="255, 255, 255, 255" />
+<DefaultHighlightLight value="115, 132, 155, 255" />    <!-- Unfocused border, bottom portion -->
+<DefaultShadowDark value="26, 26, 26, 255" />           <!-- Unfocused border, top portion -->
+<DefaultShadowLight value="0, 0, 0, 255" />             <!-- Tab area border for IMs -->
+ 
+<!-- WINDOW LABELS -->
+<LabelDisabledColor value="147, 169, 213, 77" />            <!-- Color for unfocused window titles -->
+<LabelSelectedColor value="255, 255, 255, 255" />           <!-- Color for mouseovered clickable labels, e.g. version info on the login screen -->
 <LabelSelectedDisabledColor value="164, 190, 237, 128" />
-<LabelTextColor value="147, 169, 213, 255" />
-
+<LabelTextColor value="147, 169, 213, 255" />               <!-- Color for window labels and titles -->
+ 
 <!-- LOGIN -->
-<LoginProgressBarBgColor value="255, 255, 255, 255" />
-<LoginProgressBarFgColor value="255, 255, 255, 255" />
-<LoginProgressBoxBorderColor value="0, 30, 60, 0" />
-<LoginProgressBoxCenterColor value="0, 0, 0, 200" />
-<LoginProgressBoxShadowColor value="0, 0, 0, 200" />
-<LoginProgressBoxTextColor value="255, 255, 255, 255"/>
-
+<LoginProgressBarBgColor value="255, 255, 255, 255" />      <!-- Login progress bar background -->
+<LoginProgressBarFgColor value="255, 255, 255, 255" />      <!-- Login progress bar -->
+<LoginProgressBoxBorderColor value="0, 30, 60, 0" />        <!-- Login progress box border -->
+<LoginProgressBoxCenterColor value="0, 0, 0, 200" />        <!-- Login progress box background -->
+<LoginProgressBoxShadowColor value="0, 0, 0, 200" />        <!-- Login progress box shadow -->
+<LoginProgressBoxTextColor value="255, 255, 255, 255"/>     <!-- Login progress text -->
+ 
 <!-- BUTTONS -->
-<ButtonLabelColor value="220, 220, 220, 255" />         <!-- Text labels for buttons, like the "OK" text -->
-<ButtonLabelSelectedColor value="220, 220, 220, 255" />
-<ButtonLabelDisabledColor value="147, 169, 213, 200" />
-<ButtonLabelSelectedDisabledColor value="164, 190, 237, 200" />
-<ButtonSelectedBgColor value="62, 62, 62, 255" />
-<ButtonSelectedColor value="255, 255, 255, 255" />
-<ButtonUnselectedBgColor value="62, 62, 62, 255" />
-<ButtonUnselectedFgColor value="255, 255, 255, 255" />
-<ButtonBorderColor value="239, 156, 0, 255" />
-<ButtonFlashBgColor value="255, 190, 62, 127" />
-<ButtonColor value="255, 255, 255, 255" />              <!-- Blended with button art, usually left as opaque white -->
-<ButtonImageColor value="255, 255, 255, 255" />         <!-- Blended with button art, usually left as opaque white -->
-
-<!-- SLIDERS -->
-<SliderDisabledThumbColor value="0, 0, 0, 255" />
-<SliderThumbCenterColor value="200, 200, 200, 255" />
-<SliderThumbOutlineColor value="255, 255, 255, 255" />
-<SliderTrackColor value="255, 255, 255, 255" />
-
+<ButtonLabelColor value="220, 220, 220, 255" />                 <!-- Label text color for buttons, like the "OK" text -->
+<ButtonLabelSelectedColor value="220, 220, 220, 255" />         <!-- Label text color when button selected -->
+<ButtonLabelDisabledColor value="147, 169, 213, 200" />         <!-- Label text color when button disabled -->
+<ButtonLabelSelectedDisabledColor value="164, 190, 237, 200" /> <!-- Label text color when button disabled but selected -->
+<ButtonSelectedBgColor value="62, 62, 62, 255" />           <!-- Not used -->
+<ButtonSelectedColor value="255, 255, 255, 255" />          <!-- Not used -->
+<ButtonUnselectedBgColor value="62, 62, 62, 255" />         <!-- Not used -->
+<ButtonUnselectedFgColor value="255, 255, 255, 255" />      <!-- Not used -->
+<ButtonBorderColor value="239, 156, 0, 255" />              <!-- Not used -->
+<ButtonFlashBgColor value="255, 190, 62, 127" />            <!-- Color of tab flashing on incoming IM -->
+<ButtonColor value="255, 255, 255, 255" />                  <!-- Blended with button art, usually left as opaque white -->
+<ButtonImageColor value="255, 255, 255, 255" />             <!-- Button color override (also checkboxes and scroll arrows).
+                                                                 Blended with button art, usually left as opaque white -->
+ 
+<!-- SLIDERS, single line -->
+<SliderDisabledThumbColor value="0, 0, 0, 255" />           <!-- Not used -->
+<SliderThumbCenterColor value="200, 200, 200, 255" />       <!-- Unfocused slider thumb color -->
+<SliderThumbOutlineColor value="255, 255, 255, 255" />      <!-- Focused slider thumb color -->
+<SliderTrackColor value="255, 255, 255, 255" />             <!-- Not used -->
+ 
+<!-- SLIDERS, multi line (as in the sky editor) -->
+<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>           <!-- Not used -->       
+<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>       <!-- Not used -->   
+<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>            <!-- Not used -->
+<MultiSliderTrackColor value="30, 30, 30, 255"/>                <!-- Not used -->
+<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/> <!-- Not used -->
+<MultiSliderTriangleColor value="255, 255, 50, 255"/>           <!-- Not used -->
+ 
 <!-- TEXTFIELDS -->
-<TextBgFocusColor value="200, 209, 204, 255" />         <!-- Text field background when receiving input (focused) -->
-<TextBgReadOnlyColor value="62, 62, 62, 160" />         <!-- Text field background when read-only -->
-<TextBgWriteableColor value="200, 209, 204, 230" />     <!-- Text field background when not receiving input (unfocused) -->
-<TextCursorColor value="0, 0, 0, 255" />
-<TextFgColor value="0, 0, 0, 255" />
-<TextFgReadOnlyColor value="255, 255, 255, 200" />
-<TextFgTentativeColor value="0, 0, 0, 128" />
-<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" />     <!-- i.e. About Land name that you don't own -->
-<TextEmbeddedItemColor value="0, 0, 128, 255" />
-<TextDefaultColor value="0, 20, 0, 255"/>
-  
+<TextBgFocusColor value="200, 209, 204, 255" />             <!-- Text field background when receiving input (focused) -->
+<TextBgReadOnlyColor value="62, 62, 62, 160" />             <!-- Text field background when read-only -->
+<TextBgWriteableColor value="200, 209, 204, 230" />         <!-- Text field background when not receiving input (unfocused) -->
+<TextCursorColor value="0, 0, 0, 255" />                    <!-- Cursor color in notecards and scripts only -->
+<TextFgColor value="0, 0, 0, 255" />                         <!-- Text color for all text entry fields; cursor color for line editors -->
+<TextFgReadOnlyColor value="255, 255, 255, 200" />          <!-- Text color in read-only fields -->
+<TextFgTentativeColor value="0, 0, 0, 128" />               <!-- Initial entry in text entry fields, e.g. "Click here to chat." -->
+<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- Text of read-only items embedded in notecards -->
+<TextEmbeddedItemColor value="0, 0, 128, 255" />            <!-- Text of items embedded in notecards -->
+<TextDefaultColor value="0, 20, 0, 255"/>                   <!-- Non-keyword text in the script editor -->
+<ScriptBgReadOnlyColor value="100, 100, 100, 255" />        <!-- Not used -->
+ 
 <!-- LISTBOXES -->
-<ScrollBgReadOnlyColor value="200, 209, 204, 255" />
-<ScrollBgWriteableColor value="200, 209, 204, 255" />
-<ScrollBGStripeColor value="100, 100, 100, 40" />
-<ScrollDisabledColor value="128, 128, 128, 204" />
-<ScrollSelectedBGColor value="100, 100, 188, 150" />
-<ScrollSelectedFGColor value="0, 0, 0, 204" />              <!-- Text color -->
-<ScrollUnselectedColor value="0, 0, 0, 204" />              <!-- Text color -->
-<ScrollHighlightedColor value="183, 184, 188, 128" />       <!-- Hover color -->
-<ScrollbarThumbColor value="60, 76, 124, 255" />            <!-- Scroll bar-->
-<ScrollbarTrackColor value="153, 154, 158, 255" />          <!-- Scroll bar background-->
-
+<ScrollBgReadOnlyColor value="200, 209, 204, 255" />    <!-- Background of read only lists -->
+<ScrollBgWriteableColor value="200, 209, 204, 255" />   <!-- Background of editable lists, e.g. groups-->
+<ScrollBGStripeColor value="100, 100, 100, 40" />       <!-- Background stripes in sortable lists, e.g. Events Search -->
+<ScrollDisabledColor value="128, 128, 128, 204" />      
+<ScrollSelectedBGColor value="100, 100, 188, 150" />    <!-- Selected item in a list highlight -->
+<ScrollSelectedFGColor value="0, 0, 0, 204" />          <!-- Text color -->
+<ScrollUnselectedColor value="0, 0, 0, 204" />          <!-- Text color -->
+<ScrollHighlightedColor value="183, 184, 188, 128" />   <!-- Hover color -->
+<ScrollbarThumbColor value="60, 76, 124, 255" />        <!-- Scroll bar -->
+<ScrollbarTrackColor value="153, 154, 158, 255" />      <!-- Scroll bar background -->
+ 
 <!-- MENUS -->
-<MenuBarBgColor value="62, 62, 62, 255" />
-<MenuBarGodBgColor value="62, 128, 62, 255" />
-<MenuNonProductionGodBgColor value="0, 128, 0, 255" />
-<MenuNonProductionBgColor value="128, 0, 0, 255" />
-<MenuDefaultBgColor value="0, 0, 0, 255" />
+<MenuBarBgColor value="62, 62, 62, 255" />                  <!-- Menu bar background -->
+<MenuBarGodBgColor value="62, 128, 62, 255" />              <!-- Menu bar background with God Mode enabled -->
+<MenuNonProductionGodBgColor value="0, 128, 0, 255" />      <!-- Beta viewer menu bar background -->
+<MenuNonProductionBgColor value="128, 0, 0, 255" />         <!-- Beta viewer menu bar background with God Mode enabled -->
+<MenuDefaultBgColor value="0, 0, 0, 255" />                 <!-- Menu background -->
 <MenuItemDisabledColor value="133, 133, 164, 128" />        <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
 <MenuItemEnabledColor value="255, 255, 255, 255" />         <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
-<MenuItemHighlightBgColor value="183, 184, 188, 100" />
-<MenuItemHighlightFgColor value="255, 255, 255, 255" />     <!-- Highlighted menu text color; also treeview node selection highlight -->
-<MenuPopupBgColor value="0, 0, 0, 255" />
-
+<MenuItemHighlightBgColor value="183, 184, 188, 100" />     <!-- Highlighted menu item background color -->
+<MenuItemHighlightFgColor value="255, 255, 255, 255" />     <!-- Highlighted menu item text color; also treeview node selection highlight -->
+<MenuPopupBgColor value="0, 0, 0, 255" />                   <!-- Right-click menu background -->
+ 
 <!--  PIE MENUS -->
-<PieMenuBgColor value="62, 62, 62, 150" />
-<PieMenuLineColor value="0, 0, 0, 128" />
-<PieMenuSelectedColor value="183, 184, 188, 77" />
-
+<PieMenuBgColor value="62, 62, 62, 150" />              <!-- Color of pie menu -->
+<PieMenuLineColor value="0, 0, 0, 128" />               <!-- Color of pie menu slice separators -->
+<PieMenuSelectedColor value="183, 184, 188, 77" />      <!-- Color of pie menu slice when selected -->
+ 
+<!-- MENU BAR -->
+<ParcelTextColor value="144, 165, 208, 255" />          <!-- Parcel name on menu bar, normal state -->
+<ParcelHoverColor value="255, 255, 255, 255" />         <!-- Parcel name on menu bar, hover state -->
+<TimeTextColor value="255, 255, 255, 255" />            <!-- SL Time on menu bar -->
+<BalanceTextColor value="0, 255, 0, 255" />             <!-- Linden dollar balance on menu bar -->
+<HealthTextColor value="255, 255, 255, 255" />          <!-- Damage meter text on menu bar -->
+ 
 <!-- TOOLTIPS -->
-<ToolTipBgColor value="183, 184, 188, 200" />
-<ToolTipBorderColor value="171, 212, 245, 255" />
-<ToolTipTextColor value="0, 0, 0, 255" />
-
+<ToolTipBgColor value="183, 184, 188, 200" />           <!-- Tool tips, i.e. "Hover Tips" -->
+<ToolTipBorderColor value="171, 212, 245, 255" />       <!-- Not used -->
+<ToolTipTextColor value="0, 0, 0, 255" />               <!-- Tool tips text color -->
+ 
 <!-- NOTIFICATION POP-UPS -->
-<NotifyBoxColor value="70, 170, 255, 255" />
-<NotifyTextColor value="0, 0, 0, 255" />
-<NotifyCautionBoxColor value="254, 209, 118, 255" />    <!-- the background color of caution permissions prompts -->
-<NotifyCautionWarnColor value="0, 0, 0, 255" />         <!-- the foreground color of the special title text in caution permissions prompts -->
-<GroupNotifyBoxColor value="70, 170, 255, 255" />
-<GroupNotifyTextColor value="0, 30, 60, 255" />
-
+<NotifyBoxColor value="70, 170, 255, 255" />            <!-- Notification background, i.e. tp requests -->
+<NotifyTextColor value="0, 0, 0, 255" />                <!-- Notification text -->
+<NotifyCautionBoxColor value="254, 209, 118, 255" />    <!-- Background color of caution permissions prompts -->
+<NotifyCautionWarnColor value="0, 0, 0, 255" />         <!-- Foreground color of the special title text in caution permissions prompts -->
+<GroupNotifyBoxColor value="70, 170, 255, 255" />       <!-- Group notices background -->
+<GroupNotifyTextColor value="0, 30, 60, 255" />         <!-- Group notices text -->
+ 
+<!-- ALERT BOX COLORS -->
+<AlertBoxColor value="62, 62, 62, 255" />               <!-- Alert floaters, like the warning before returning objects -->
+<AlertTextColor value="147, 169, 213, 255" />           <!-- Alert floater text -->
+<AlertCautionBoxColor value="254, 209, 118, 255" />     <!-- Background color of caution alerts -->
+<AlertCautionTextColor value="0, 0, 0, 255" />          <!-- Foreground color of the special title text in caution alerts -->
+ 
 <!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
-<ChatHistoryBgColor value="0, 0, 0, 0" />
-<ChatHistoryTextColor value="255, 255, 255, 255" />
-<IMHistoryBgColor value="0, 30, 80, 200" />
-<IMHistoryTextColor value="255, 255, 255, 255" />
-
+<ChatHistoryBgColor value="0, 0, 0, 0" />               <!-- Local Chat background -->
+<ChatHistoryTextColor value="255, 255, 255, 255" />     <!-- Local Chat text -->
+<IMHistoryBgColor value="0, 30, 80, 200" />             <!-- Instant Message background -->
+<IMHistoryTextColor value="255, 255, 255, 255" />       <!-- Instant Message text -->
+ 
 <!-- IN-WORLD SELECTION -->
-<SilhouetteParentColor value="255, 255, 0, 255" />
-<SilhouetteChildColor value="32, 106, 196, 255" />
+<SilhouetteParentColor value="255, 255, 0, 255" />      <!-- Root prim selection outline -->
+<SilhouetteChildColor value="32, 106, 196, 255" />      <!-- Child prim selection outline -->
 <HighlightParentColor value="171, 212, 245, 255" />
 <HighlightChildColor value="171, 212, 245, 255" />
-<HighlightInspectColor value="255, 0, 255, 255" />
-
+<HighlightInspectColor value="255, 0, 255, 255" />      <!-- Selection outline when inspecting -->
+ 
 <!-- EDIT MODE GRID -->
-<GridFocusPointColor value="255, 255, 255, 128" />
-<GridlineColor value="255, 255, 255, 255" />
-<GridlineBGColor value="235, 235, 255, 200" />
-<GridlineShadowColor value="0, 0, 0, 80" />
-
+<GridFocusPointColor value="255, 255, 255, 128" />      <!-- Not used -->
+<GridlineColor value="255, 255, 255, 255" />            <!-- Grid color -->
+<GridlineBGColor value="235, 235, 255, 200" />          <!-- Grid background color -->
+<GridlineShadowColor value="0, 0, 0, 80" />             <!-- Grid drop shadow -->
+ 
 <!-- PROPERTY LINES -->
-<PropertyColorAvail value="0, 0, 0, 0" />
-<PropertyColorGroup value="0, 184, 184, 102" />
-<PropertyColorOther value="255, 0, 0, 102" />
-<PropertyColorSelf value="0, 255, 0, 102" />
-<PropertyColorForSale value="255, 128, 0, 102" />
-<PropertyColorAuction value="128, 0, 255, 102" />       <!-- Match the color on the world map -->
-
-<!-- Icon Enable/Disable -->
-<IconEnabledColor value="255, 255, 255, 255"/>
-<IconDisabledColor value="147, 169, 213, 200"/>
-
+<PropertyColorAvail value="0, 0, 0, 0" />               
+<PropertyColorGroup value="0, 184, 184, 102" />         <!-- Property group owns -->
+<PropertyColorOther value="255, 0, 0, 102" />           <!-- Property others own -->
+<PropertyColorSelf value="0, 255, 0, 102" />            <!-- Property you own -->
+<PropertyColorForSale value="255, 128, 0, 102" />       <!-- Property for sale -->
+<PropertyColorAuction value="128, 0, 255, 102" />       <!-- Match the color on the world map -->
+ 
+<!-- MEDIA ICONS -->
+<IconEnabledColor value="255, 255, 255, 255"/>          <!-- Media/music icon enabled -->
+<IconDisabledColor value="147, 169, 213, 200"/>         <!-- Media/music icon disabled -->
+ 
 <!-- MINI-MAP -->
-<NetMapBackgroundColor value="0, 0, 0, 77" />
-<NetMapYouOwnAboveWater value="0, 255, 255, 255" />
-<NetMapYouOwnBelowWater value="0, 200, 200, 255" />
-<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />
-<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />
-<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />
-<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />
-
+<NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
+<NetMapYouOwnAboveWater value="0, 255, 255, 255" />     <!-- Objects owned by you above water -->
+<NetMapYouOwnBelowWater value="0, 200, 200, 255" />     <!-- Objects owned by you below water -->
+<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />   <!-- Group owned objects above water -->
+<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />   <!-- Group owned objects below water -->
+<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />    <!-- Objects owned by others above water -->
+<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />    <!-- Objects owned by others below water -->
+<NetMapGlyphColorAvatar value="0, 255, 0, 255" />       <!-- Also the color of avatar glyphs on the map -->
+<NetMapGlyphColorFriend value="255, 255, 0, 255" />
+ 
+<!-- INVENTORY -->
+<InventoryBackgroundColor value="62, 62, 62, 80"/>              <!-- Inventory floater background -->
+<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>  <!-- "loading..." -->
+<InventoryItemSuffixColor value="191, 216, 216, 255"/>          <!-- "worn", "no modify", etc -->
+<FilterBackgroundColor value="0, 0, 20, 255" />                 <!-- Inventory search background -->
+<FilterTextColor value="255, 200, 70, 255" />                   <!-- Inventory search text -->
+<InventorySearchStatusColor value="255, 255, 255, 255" />       <!-- "Searching..." -->
+ 
 <!-- HELP WINDOW -->
 <HelpBgColor value="200, 209, 204, 255" />
 <HelpFgColor value="0, 0, 0, 255" />
@@ -150,40 +184,13 @@
 <HelpScrollShadowColor value="0, 0, 0, 255" />
 
 <!-- MISC -->
-<AvatarNameColor value="251, 175, 93, 255" />           <!-- Text color of avatar nametags -->
-<FocusColor value="239, 156, 0, 255" />                 <!-- Color of the glow around UI controls with keyboard focus -->
-<FloaterButtonImageColor value="239, 156, 0, 255" />    <!-- The floater buttons (like the close box) are white images that receive this color. -->
-<ButtonCautionImageColor value="255, 255,  255, 255" /> <!-- Match the caution dialog buttons to the default -->
-<HealthTextColor value="255, 255, 255, 255" />
+<AvatarNameColor value="251, 175, 93, 255" />           <!-- Text color of avatar nametags -->
+<FocusColor value="239, 156, 0, 255" />                 <!-- Color of the glow around UI controls with keyboard focus -->
+<FloaterButtonImageColor value="239, 156, 0, 255" />    <!-- The floater buttons (like the close box) are white images that receive this color. -->
+<ButtonCautionImageColor value="255, 255, 255, 255" />  <!-- Match the caution dialog buttons to the default -->
 <MapAutopilotColor value="255, 128, 0, 255" />
-<ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
-<ScriptBgReadOnlyColor value="100, 100, 100, 255" />
-<ParcelTextColor value="144, 165, 208, 255" />          <!-- Parcel name on menu bar, normal state -->
-<ParcelHoverColor value="255, 255, 255, 255" />         <!-- Parcel name on menu bar, hover state -->
-<TimeTextColor value="255, 255, 255, 255" />            <!-- SL Time on menu bar -->
-<BalanceTextColor value="0, 255, 0, 255" />             <!-- Linden dollar balance on menu bar -->
-<HealthTextColor value="255, 255, 255, 255" />          <!-- Damage meter text on menu bar -->
-<GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->
-<FilterBackgroundColor value="0, 0, 20, 255" />         <!-- Matching region of Inventory search text -->
-<FilterTextColor value="255, 200, 70, 255" />
-<InventoryItemSuffixColor value="191, 216, 216, 255" />     <!-- "worn", "no modify", etc-->
-<InventorySearchStatusColor value="255, 255, 255, 255" />
-<ConsoleBackground value="0, 0, 0, 255" />
-<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>     <!-- "loading..." in the inv -->
-<InventoryBackgroundColor value="62, 62, 62, 80"/>
-
-<!-- Alert box colors -->
-<AlertBoxColor value="62, 62, 62, 255" />               <!-- Warnings floaters, like when returning objects -->
-<AlertTextColor value="147, 169, 213, 255" />
-<AlertCautionBoxColor value="254, 209, 118, 255" />     <!-- Background color of caution alerts -->
-<AlertCautionTextColor value="0, 0, 0, 255" />          <!-- Foreground color of the special title text in caution alerts -->
-
-<!--  Multi sliders, as in the sky animation setting -->
-<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>
-<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>
-<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>
-<MultiSliderTrackColor value="30, 30, 30, 255"/>
-<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/>
-<MultiSliderTriangleColor value="255, 255, 50, 255"/>
-
+<ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
+<GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->
+<ConsoleBackground value="0, 0, 0, 255" />              <!-- Background for inworld chat -->
+ 
 </settings>
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index 8bbdc3d..c2d4301 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -2957,9 +2957,9 @@ Download to your Applications folder?
                         Cancel
                 </option>
         </alert>
-        <alert modal="true" name="WebLaunchSupportWiki">
+        <alert modal="true" name="WebLaunchImprudenceBlog">
                 <message name="message">
-                        Go to the Official Linden Blog, for the Latest News and Information.
+                        Go to the Official Imprudence Blog, for the Latest News and Information.
                 </message>
                 <ignore name="ignore">
                         When launching web browser to view the blog
@@ -2971,6 +2971,20 @@ Download to your Applications folder?
                         Cancel
                 </option>
         </alert>
+        <alert modal="true" name="WebLaunchImprudenceForums">
+                <message name="message">
+                        Go to the Official Imprudence Forums to discuss the Imprudence Project.
+                </message>
+                <ignore name="ignore">
+                        When launching web browser to view the forums
+                </ignore>
+                <option name="Gotopage">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
         <alert modal="true" name="WebLaunchLSLGuide">
                 <message name="message">
                         Go to the Scripting Guide for scripting help?
@@ -4225,7 +4239,7 @@ will only work if a script is added with a money() event.
         </alert>
         <alert modal="true" name="ClickOpenF1Help">
                 <message name="message">
-                        Visit the Second Life Support Web site?
+                        Visit the Second Life Support Web site? (note: this is not an Imprudence Help site)
                 </message>
                 <ignore name="ignore">
                         When visiting the Second Life Support Website.
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index c3058c4..076598c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -36,9 +36,12 @@
         </string>
         <button bottom="-40" follows="left|top" height="20" label="Profile..." left="5"
              name="profile_callee_btn" width="80" />
+        <button bottom_delta="0" follows="left|top" font="SansSerif"
+             halign="center" bottom ="-40" height="20" label="Offer Teleport" left_delta="85"
+             mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
         <button bottom="-40" follows="left|top" halign="center" height="20"
              image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-             label="Call" left_delta="85" name="start_call_btn" width="100" />
+             label="Call" left_delta="107" name="start_call_btn" width="100" />
         <button bottom="-40" follows="left|top" halign="center" height="20"
              image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
              label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
@@ -51,9 +54,6 @@
                      image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
                      name="mute_btn" tool_tip="Mute voice" width="25" />
         </panel>
-        <button bottom_delta="0" follows="right|top" font="SansSerif"
-             halign="center" bottom ="-40" height="20" label="Offer Teleport" right="-5"
-             mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
         <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
              bottom="30" embedded_items="false" enabled="false"
              follows="left|top|right|bottom" font="SansSerif" height="221" left="5"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
index 5b2d310..077ab23 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
@@ -12,9 +12,11 @@
                         <button bottom_delta="0" enabled="false" follows="left|top" height="20" label="Reload"
                              left_delta="65" name="reload" width="70" />
                         <combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="20"
-                             left_delta="75" max_chars="255" name="address" width="280" />
+                             left_delta="75" max_chars="235" name="address" width="225" />
                         <button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go"
-                             left_delta="285" name="go" width="55" />
+                             left_delta="230" name="go" width="55" />
+                        <button bottom_delta="0" enabled="true" follows="right|top" height="20" label="Home"
+                             left_delta="60" name="home" width="55" />
                 </layout_panel>
                 <layout_panel auto_resize="false" bottom="0" height="20" left="0"
                      name="parcel_owner_controls" user_resize="false" width="540">
@@ -30,6 +32,8 @@
                         <check_box bottom="5" control_name="UseExternalBrowser" follows="bottom|left" height="20"
                              label="Always open in my web browser" left_delta="190" name="open_always"
                              width="200" />
+                        <button bottom="5" enabled="false" follows="bottom|right" height="20" label="Set Home To Here"
+                             left="-265" name="set_home" width="155" />
                         <button bottom="5" follows="bottom|right" height="20" label="Close" left="-70"
                              name="close" width="70" />
                 </layout_panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
index 2afc560..8d06657 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -21,12 +21,12 @@
         <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
              height="317" label="Help" left="80" mouse_opaque="false" name="Help"
              opaque="true" tear_off="false" width="166">
-                <menu_item_call bottom="-29" enabled="true" height="19" label="Second Life Help" left="0"
-                     mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
+                <menu_item_call bottom="-29" enabled="true" height="19" label="Viewer Help" left="0"
+                     mouse_opaque="true" name="Viewer Help" shortcut="F1" width="166">
                         <on_click function="ShowFloater" userdata="help f1" />
                 </menu_item_call>
-                <menu_item_call bottom="-48" enabled="true" height="19" label="About Second Life..." left="0"
-                     mouse_opaque="true" name="About Second Life..." width="166">
+                <menu_item_call bottom="-48" enabled="true" height="19" label="About Imprudence..." left="0"
+                     mouse_opaque="true" name="About Imprudence..." width="166">
                         <on_click function="ShowFloater" userdata="about" />
                 </menu_item_call>
         </menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index f82f254..682acb9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -271,6 +271,11 @@
       <on_enable function="View.EnableLastChatter" />
     </menu_item_call>
     <menu_item_separator />
+    <menu_item_call name="Web Browser" label="Web Browser"
+                    shortcut="control|B">
+      <on_click function="ShowFloater" userdata="inworld browser" />
+    </menu_item_call>
+    <menu_item_separator />
     <menu_item_check name="Toolbar" label="Toolbar">
       <on_click function="ShowFloater" userdata="toolbar" />
       <on_check function="FloaterVisible" userdata="toolbar" />
@@ -360,9 +365,9 @@
       <on_click function="View.HighlightTransparent" userdata="" />
       <on_check function="View.CheckHighlightTransparent" />
     </menu_item_check>
-    <menu_item_check name="Beacons Always On" label="Beacons Always On">
-      <on_click function="ToggleControl" userdata="BeaconAlwaysOn" />
-      <on_check control="BeaconAlwaysOn" />
+    <menu_item_check name="Beacons Always On" label="Show Beacons">
+      <on_click function="ToggleControl" userdata="BeaconsEnabled" />
+      <on_check control="BeaconsEnabled" />
     </menu_item_check>
     <menu name="Beacons" create_jump_keys="true" label="Beacons"
           opaque="true" tear_off="true">
@@ -608,6 +613,12 @@
                 userdata="movable" />
       <on_check control="SelectMovableOnly" />
     </menu_item_check>
+    <menu_item_check name="Select Only Copyable Objects"
+                     label="Select Only Copyable Objects">
+      <on_click function="Tools.SelectOnlyCopyableObjects"
+                userdata="copyable" />
+      <on_check control="SelectCopyableOnly" />
+    </menu_item_check>
     <menu_item_check name="Select By Surrounding"
                      label="Select By Surrounding">
       <on_click function="Tools.SelectBySurrounding"
@@ -764,7 +775,7 @@
 
   <menu name="Help" create_jump_keys="true" label="Help"
         opaque="true" tear_off="true">
-    <menu_item_call name="Second Life Help" label="Second Life Help"
+    <menu_item_call name="Viewer Help" label="Viewer Help"
                     shortcut="F1">
       <on_click function="ShowFloater" userdata="help f1" />
     </menu_item_call>
@@ -772,10 +783,15 @@
       <on_click function="ShowFloater" userdata="help tutorial" />
     </menu_item_call>
     <menu_item_separator />
-    <menu_item_call name="Official Linden Blog..."
-                    label="Official Linden Blog...">
+    <menu_item_call name="Imprudence Blog..."
+                    label="Imprudence Blog...">
+      <on_click function="PromptShowURL"
+                userdata="WebLaunchImprudenceBlog,http://www.imprudenceviewer.org/" />
+    </menu_item_call>
+    <menu_item_call name="Imprudence Forums..."
+                    label="Imprudence Forums...">
       <on_click function="PromptShowURL"
-                userdata="WebLaunchSupportWiki,http://blog.secondlife.com/" />
+                userdata="WebLaunchImprudenceForums,http://www.imprudenceviewer.org/forums/" />
     </menu_item_call>
     <menu_item_separator />
     <menu_item_call name="Scripting Guide..."
@@ -801,42 +817,8 @@
       <on_click function="ShowFloater" userdata="lag meter" />
     </menu_item_call>
     <menu_item_separator />
-    <menu name="Bug Reporting" create_jump_keys="true"
-          label="Bug Reporting" opaque="true" tear_off="true">
-      <menu_item_call name="Public Issue Tracker..."
-                      label="Public Issue Tracker...">
-        <on_click function="PromptShowURL"
-                  userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
-      </menu_item_call>
-      <menu_item_call name="Publc Issue Tracker Help..."
-                      label="Public Issue Tracker Help...">
-        <on_click function="PromptShowURL"
-                  userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
-      </menu_item_call>
-      <menu_item_separator />
-      <menu_item_call name="Bug Reporing 101..."
-                      label="Bug Reporting 101...">
-        <on_click function="PromptShowURL"
-                  userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
-      </menu_item_call>
-      <menu_item_call name="Security Issues..."
-                      label="Security Issues...">
-        <on_click function="PromptShowURL"
-                  userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
-      </menu_item_call>
-      <menu_item_call name="QA Wiki..." label="QA Wiki...">
-        <on_click function="PromptShowURL"
-                  userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
-      </menu_item_call>
-      <menu_item_separator />
-      <menu_item_call name="Report Bug..." label="Report Bug...">
-        <on_click function="PromptShowURL"
-                  userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
-      </menu_item_call>
-    </menu>
-    <menu_item_separator />
-    <menu_item_call name="About Second Life..."
-                    label="About Second Life...">
+    <menu_item_call name="About Imprudence..."
+                    label="About Imprudence...">
       <on_click function="ShowFloater" userdata="about" />
     </menu_item_call>
   </menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index 6af19ee..d207a74 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -579,6 +579,9 @@ to his or her location:
                 <option name="Decline">
                         Decline
                 </option>
+                <option name="Ignore">
+                        Ignore
+                </option>
         </notify>
         <notify name="OfferFriendshipNoMessage" tip="false">
                 <message name="message">
@@ -593,6 +596,9 @@ see each other&apos;s online status.)
                 <option name="Decline">
                         Decline
                 </option>
+                <option name="Ignore">
+                        Ignore
+                </option>
         </notify>
         <notify name="FriendshipAccepted" tip="false">
                 <message name="message">
@@ -616,6 +622,9 @@ so you can quickly IM this resident.
                 <option name="Decline">
                         Decline
                 </option>
+                <option name="Ignore">
+                        Ignore
+                </option>
         </notify>
         <notify name="RegionRestartMinutes" tip="false">
                 <message name="message">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml
index 8c5cbb5..74d71f4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml
@@ -4,10 +4,10 @@
         <text bottom_delta="-78" height="54" left="7" width="200" name="help_text">
                 You can select multiple residents to 
 invite to your group. Click &apos;Open 
-Person Chooser&apos; to start.
+Resident Chooser&apos; to start.
         </text>
         <button bottom_delta="-10" font="SansSerifSmall" halign="center" height="20"
-             label="Open Person Chooser" left="5" name="add_button" tool_tip=""
+             label="Open Resident Chooser" left="5" name="add_button" tool_tip=""
              width="200" />
         <name_list allow_calling_card_drop="true" background_visible="true" bottom_delta="-178"
              column_padding="0" draw_border="true" height="174" left="5"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
index 53f847a..bd64622 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
@@ -80,7 +80,7 @@ execute the Ability.
                                 <column label="Last Login" name="online" width="116" />
                         </name_list>
                         <button bottom_delta="-20" font="SansSerif" halign="center" height="19"
-                             label="Invite New Person ..." left="4" name="member_invite" width="146" />
+                             label="Invite New Member ..." left="4" name="member_invite" width="146" />
                         <button bottom_delta="0" font="SansSerif" halign="center" height="19"
                              label="Eject From Group" left="-153" name="member_eject" width="146" />
                         <string name="help_text">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
index 6fa099e..c47985b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
@@ -25,15 +25,15 @@
              label="IM/Call" left_delta="0" name="IM"
              tool_tip="Open Instant Message session" width="80" />
         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Info" name="Info" width="80" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
              label="Activate" name="Activate" width="80" />
         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Leave" name="Leave" width="80" />
+             label="Invite..." name="Invite..." width="80" />
+        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+             label="Info" name="Info" width="80" />
         <button bottom_delta="-35" follows="top|right" font="SansSerif" height="22"
              label="Create..." name="Create" width="80" />
         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
              label="Search..." name="Search..." width="80" />
         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Invite..." name="Invite..." width="80" />
+             label="Leave" name="Leave" width="80" />
 </panel>
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index 38db85c..dabada6 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -1,188 +1,188 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings version = "101">
-
+<!-- Additional comments by McCabe Maxsted -->
+ 
 <!-- WINDOWS -->
-<TitleBarFocusColor value="50, 115, 185, 120" />        <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
-<FloaterFocusBorderColor value="50, 115, 185, 75" />
-<FloaterUnfocusBorderColor value="110, 110, 110, 60" />
-<FocusBackgroundColor value="165, 180, 200, 245" />     <!-- Background color of focused floaters -->
-<DefaultBackgroundColor value="165, 180, 200, 128" />   <!-- Background color for unfocused floaters -->
-<ColorDropShadow value="0, 0, 0, 200" />                <!-- The drop shadow behind windows and menus -->
+<TitleBarFocusColor value="50, 115, 185, 120" />        <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
+<FloaterFocusBorderColor value="50, 115, 185, 75" />    <!-- Focused window border color -->
+<FloaterUnfocusBorderColor value="110, 110, 110, 60" /> <!-- Unfocused window border color -->
+<FocusBackgroundColor value="165, 180, 200, 245" />     <!-- Background color of focused windows -->
+<DefaultBackgroundColor value="165, 180, 200, 128" />   <!-- Background color for unfocused windows -->
+<ColorDropShadow value="0, 0, 0, 200" />                <!-- The drop shadow behind windows and menus -->
 <DefaultHighlightDark value="50, 115, 185, 255" />
-<DefaultHighlightLight value="50, 115, 185, 255" />
-<DefaultShadowDark value="50, 115, 185, 255" />
-<DefaultShadowLight value="50, 115, 185, 255" />
-
-<!-- LABELS -->
-<LabelDisabledColor value="0, 30, 60, 128" />
-<LabelSelectedColor value="255, 255, 255, 255" />
+<DefaultHighlightLight value="50, 115, 185, 255" />     <!-- Unfocused border, bottom portion -->
+<DefaultShadowDark value="50, 115, 185, 255" />         <!-- Unfocused border, top portion -->
+<DefaultShadowLight value="50, 115, 185, 255" />        <!-- Tab area border for IMs -->
+ 
+<!-- WINDOW LABELS -->
+<LabelDisabledColor value="0, 30, 60, 128" />               <!-- Color for unfocused window titles -->
+<LabelSelectedColor value="255, 255, 255, 255" />           <!-- Color for mouseovered clickable labels, e.g. version info on the login screen -->
 <LabelSelectedDisabledColor value="164, 190, 237, 128" />
-<LabelTextColor value="0, 30, 60, 255" />
-
+<LabelTextColor value="0, 30, 60, 255" />                   <!-- Color for window labels and titles -->
+ 
 <!-- LOGIN -->
-<LoginProgressBarBgColor value="255, 255, 255, 255" />
-<LoginProgressBarFgColor value="255, 255, 255, 255" />
-<LoginProgressBoxBorderColor value="0, 30, 60, 0" />
-<LoginProgressBoxCenterColor value="0, 0, 0, 200" />
-<LoginProgressBoxShadowColor value="0, 0, 0, 200" />
-<LoginProgressBoxTextColor value="255, 255, 255, 255"/>
-
+<LoginProgressBarBgColor value="255, 255, 255, 255" />      <!-- Login progress bar background -->
+<LoginProgressBarFgColor value="255, 255, 255, 255" />      <!-- Login progress bar -->
+<LoginProgressBoxBorderColor value="0, 30, 60, 0" />        <!-- Login progress box border -->
+<LoginProgressBoxCenterColor value="0, 0, 0, 200" />        <!-- Login progress box background -->
+<LoginProgressBoxShadowColor value="0, 0, 0, 200" />        <!-- Login progress box shadow -->
+<LoginProgressBoxTextColor value="255, 255, 255, 255"/>     <!-- Login progress text -->
+ 
 <!-- BUTTONS -->
-<ButtonLabelColor value="0, 30, 60, 255" />             <!-- Text labels for buttons, like the "OK" text -->
-<ButtonLabelSelectedColor value="255, 255, 255, 255" />
-<ButtonLabelDisabledColor value="0, 30, 60, 128" />
-<ButtonLabelSelectedDisabledColor value="0, 30, 60, 128" />
-<ButtonSelectedBgColor value="62, 62, 62, 255" />
-<ButtonSelectedColor value="255, 255, 255, 255" />
-<ButtonUnselectedBgColor value="62, 62, 62, 255" />
-<ButtonUnselectedFgColor value="255, 255, 255, 255" />
-<ButtonBorderColor value="239, 156, 0, 255" />
-<ButtonFlashBgColor value="255, 190, 62, 127" />
-<ButtonColor value="255, 255, 255, 255" />              <!-- Blended with button art, usually left as opaque white -->
-<ButtonImageColor value="255, 255, 255, 255" />         <!-- Blended with button art, usually left as opaque white -->
-
-<!-- SLIDERS -->
-<SliderDisabledThumbColor value="0, 0, 0, 255" />
-<SliderThumbCenterColor value="255, 255, 255, 255" />
-<SliderThumbOutlineColor value="37, 64, 99, 255" />
-<SliderTrackColor value="37, 64, 99, 255" />
-
+<ButtonLabelColor value="0, 30, 60, 255" />                 <!-- Label text color for buttons, like the "OK" text -->
+<ButtonLabelSelectedColor value="255, 255, 255, 255" />     <!-- Label text color when button selected -->
+<ButtonLabelDisabledColor value="0, 30, 60, 128" />         <!-- Label text color when button disabled -->
+<ButtonLabelSelectedDisabledColor value="0, 30, 60, 128" /> <!-- Label text color when button disabled but selected -->
+<ButtonSelectedBgColor value="62, 62, 62, 255" />           <!-- Not used -->
+<ButtonSelectedColor value="255, 255, 255, 255" />          <!-- Not used -->
+<ButtonUnselectedBgColor value="62, 62, 62, 255" />         <!-- Not used -->
+<ButtonUnselectedFgColor value="255, 255, 255, 255" />      <!-- Not used -->
+<ButtonBorderColor value="239, 156, 0, 255" />              <!-- Not used -->
+<ButtonFlashBgColor value="255, 190, 62, 127" />            <!-- Color of tab flashing on incoming IM -->
+<ButtonColor value="255, 255, 255, 255" />                  <!-- Blended with button art, usually left as opaque white -->
+<ButtonImageColor value="255, 255, 255, 255" />             <!-- Button color override (also checkboxes and scroll arrows).
+                                                                 Blended with button art, usually left as opaque white -->
+ 
+<!-- SLIDERS, single line -->
+<SliderDisabledThumbColor value="0, 0, 0, 255" />           <!-- Not used -->
+<SliderThumbCenterColor value="255, 255, 255, 255" />       <!-- Unfocused slider thumb color -->
+<SliderThumbOutlineColor value="37, 64, 99, 255" />         <!-- Focused slider thumb color -->
+<SliderTrackColor value="37, 64, 99, 255" />                <!-- Not used -->
+ 
+<!-- SLIDERS, multi line (as in the sky editor) -->
+<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>           <!-- Not used -->       
+<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>       <!-- Not used -->   
+<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>            <!-- Not used -->
+<MultiSliderTrackColor value="30, 30, 30, 255"/>                <!-- Not used -->
+<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/> <!-- Not used -->
+<MultiSliderTriangleColor value="255, 255, 50, 255"/>           <!-- Not used -->
+ 
 <!-- TEXTFIELDS -->
-<TextBgFocusColor value="255, 255, 255, 255" />         <!-- Text field background when receiving input (focused) -->
-<TextBgReadOnlyColor value="255, 255, 255, 140" />      <!-- Text field background when read-only -->
-<TextBgWriteableColor value="255, 255, 255, 255" />     <!-- Text field background when not receiving input (unfocused) -->
-<TextCursorColor value="0, 0, 0, 255" />
-<TextFgColor value="45, 48, 45, 255" />
-<TextFgReadOnlyColor value="0, 0, 0, 200" />
-<TextFgTentativeColor value="0, 0, 0, 128" />
-<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" />     <!-- i.e. About Land name that you don't own -->
-<TextEmbeddedItemColor value="0, 0, 128, 255" />
-<TextDefaultColor value="0, 20, 0, 255"/>
-  
+<TextBgFocusColor value="255, 255, 255, 255" />             <!-- Text field background when receiving input (focused) -->
+<TextBgReadOnlyColor value="255, 255, 255, 140" />          <!-- Text field background when read-only -->
+<TextBgWriteableColor value="255, 255, 255, 255" />         <!-- Text field background when not receiving input (unfocused) -->
+<TextCursorColor value="0, 0, 0, 255" />                    <!-- Cursor color in notecards and scripts only -->
+<TextFgColor value="48, 48, 45, 255" />                     <!-- Text color for all text entry fields; cursor color for line editors -->
+<TextFgReadOnlyColor value="0, 0, 0, 200" />                <!-- Text color in read-only fields -->
+<TextFgTentativeColor value="0, 0, 0, 128" />               <!-- Initial entry in text entry fields, e.g. "Click here to chat." -->
+<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- Text of read-only items embedded in notecards -->
+<TextEmbeddedItemColor value="0, 0, 128, 255" />            <!-- Text of items embedded in notecards -->
+<TextDefaultColor value="0, 20, 0, 255"/>                   <!-- Non-keyword text in the script editor -->
+<ScriptBgReadOnlyColor value="180, 180, 180, 255" />        <!-- Not used -->
+ 
 <!-- LISTBOXES -->
-<ScrollBgReadOnlyColor value="255, 255, 255, 140" />
-<ScrollBgWriteableColor value="255, 255, 255, 140" />
-<ScrollBGStripeColor value="145, 180, 220, 60" />
-<ScrollDisabledColor value="128, 128, 128, 204" />
-<ScrollSelectedBGColor value="50, 115, 185, 150" />
-<ScrollSelectedFGColor value="0, 30, 60, 255" />        <!-- Text color -->
-<ScrollUnselectedColor value="0, 30, 60, 255" />        <!-- Text color -->
-<ScrollHighlightedColor value="145, 180, 220, 128" />   <!-- Hover color -->
-<ScrollbarThumbColor value="120, 160, 200, 255" />
-<ScrollbarTrackColor value="183, 202, 220, 255" />
-
+<ScrollBgReadOnlyColor value="255, 255, 255, 140" />    <!-- Background of read only lists -->
+<ScrollBgWriteableColor value="255, 255, 255, 140" />   <!-- Background of editable lists, e.g. groups-->
+<ScrollBGStripeColor value="145, 180, 220, 60" />       <!-- Background stripes in sortable lists, e.g. Events Search -->
+<ScrollDisabledColor value="128, 128, 128, 204" />      
+<ScrollSelectedBGColor value="50, 115, 185, 150" />     <!-- Selected item in a list highlight -->
+<ScrollSelectedFGColor value="0, 30, 60, 255" />        <!-- Text color -->
+<ScrollUnselectedColor value="0, 30, 60, 255" />        <!-- Text color -->
+<ScrollHighlightedColor value="145, 180, 220, 128" />   <!-- Hover color -->
+<ScrollbarThumbColor value="120, 160, 200, 255" />      <!-- Scroll bar -->
+<ScrollbarTrackColor value="183, 202, 220, 255" />      <!-- Scroll bar background -->
+ 
 <!-- MENUS -->
-<MenuBarBgColor value="185, 200, 220, 230" />
-<MenuBarGodBgColor value="100, 200, 130, 230" />
-<MenuNonProductionGodBgColor value="100, 200, 130, 230" />
-<MenuNonProductionBgColor value="230, 70, 70, 230" />
-<MenuDefaultBgColor value="210, 220, 230, 245" />
-<MenuItemDisabledColor value="0, 30, 60, 128" />        <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
-<MenuItemEnabledColor value="0, 30, 60, 255" />         <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
-<MenuItemHighlightBgColor value="50, 115, 185, 100" />
-<MenuItemHighlightFgColor value="0, 30, 60, 255" />     <!-- Highlighted menu text color; also treeview node selection highlight -->
-<MenuPopupBgColor value="197, 217, 234, 240" />
-
+<MenuBarBgColor value="185, 200, 220, 230" />               <!-- Menu bar background -->
+<MenuBarGodBgColor value="100, 200, 130, 230" />            <!-- Menu bar background with God Mode enabled -->
+<MenuNonProductionGodBgColor value="100, 200, 130, 230" />  <!-- Beta viewer menu bar background -->
+<MenuNonProductionBgColor value="230, 70, 70, 230" />       <!-- Beta viewer menu bar background with God Mode enabled -->
+<MenuDefaultBgColor value="210, 220, 230, 245" />           <!-- Menu background -->
+<MenuItemDisabledColor value="0, 30, 60, 128" />            <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
+<MenuItemEnabledColor value="0, 30, 60, 255" />             <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
+<MenuItemHighlightBgColor value="50, 115, 185, 100" />      <!-- Highlighted menu item background color -->
+<MenuItemHighlightFgColor value="0, 30, 60, 255" />         <!-- Highlighted menu item text color; also treeview node selection highlight -->
+<MenuPopupBgColor value="197, 217, 234, 240" />             <!-- Right-click menu background -->
+ 
 <!--  PIE MENUS -->
-<PieMenuBgColor value="118, 156, 201, 230" />
-<PieMenuLineColor value="255, 255, 255, 60" />
-<PieMenuSelectedColor value="185, 200, 220, 120" />
-
+<PieMenuBgColor value="118, 156, 201, 230" />           <!-- Color of pie menu -->
+<PieMenuLineColor value="255, 255, 255, 60" />          <!-- Color of pie menu slice separators -->
+<PieMenuSelectedColor value="185, 200, 220, 120" />     <!-- Color of pie menu slice when selected -->
+ 
+<!-- MENU BAR -->
+<ParcelTextColor value="40, 40, 90, 255" />             <!-- Parcel name on menu bar, normal state -->
+<ParcelHoverColor value="70, 70, 100, 255" />           <!-- Parcel name on menu bar, hover state -->
+<TimeTextColor value="0, 30, 60, 255" />                <!-- SL Time on menu bar -->
+<BalanceTextColor value="0, 100, 40, 255" />            <!-- Linden dollar balance on menu bar -->
+<HealthTextColor value="110, 15, 15, 255" />            <!-- Damage meter text on menu bar -->
+ 
 <!-- TOOLTIPS -->
-<ToolTipBgColor value="250, 255, 225, 230" />
-<ToolTipBorderColor value="171, 212, 245, 255" />
-<ToolTipTextColor value="0, 0, 0, 255" />
-
+<ToolTipBgColor value="250, 255, 225, 230" />           <!-- Tool tips, i.e. "Hover Tips" -->
+<ToolTipBorderColor value="171, 212, 245, 255" />       <!-- Not used -->
+<ToolTipTextColor value="0, 0, 0, 255" />               <!-- Tool tips text color -->
+ 
 <!-- NOTIFICATION POP-UPS -->
-<NotifyBoxColor value="170, 210, 255, 240" />
-<NotifyTextColor value="0, 30, 60, 255" />
-<NotifyCautionBoxColor value="254, 209, 118, 255" />    <!-- the background color of caution permissions prompts -->
-<NotifyCautionWarnColor value="0, 0, 0, 255" />         <!-- the foreground color of the special title text in caution permissions prompts -->
-<GroupNotifyBoxColor value="170, 210, 255, 240" />
-<GroupNotifyTextColor value="0, 30, 60, 255" />
-
+<NotifyBoxColor value="170, 210, 255, 240" />           <!-- Notification background, i.e. tp requests -->
+<NotifyTextColor value="0, 30, 60, 255" />              <!-- Notification text -->
+<NotifyCautionBoxColor value="254, 209, 118, 255" />    <!-- Background color of caution permissions prompts -->
+<NotifyCautionWarnColor value="0, 0, 0, 255" />         <!-- Foreground color of the special title text in caution permissions prompts -->
+<GroupNotifyBoxColor value="170, 210, 255, 240" />      <!-- Group notices background -->
+<GroupNotifyTextColor value="0, 30, 60, 255" />         <!-- Group notices text -->
+ 
+<!-- ALERT BOX COLORS -->
+<AlertBoxColor value="165, 180, 200, 245" />            <!-- Alert floaters, like the warning before returning objects -->
+<AlertTextColor value="0, 30, 60, 255" />               <!-- Alert floater text -->
+<AlertCautionBoxColor value="254, 209, 118, 255" />     <!-- Background color of caution alerts -->
+<AlertCautionTextColor value="0, 0, 0, 255" />          <!-- Foreground color of the special title text in caution alerts -->
+ 
 <!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
-<ChatHistoryBgColor value="0, 30, 80, 200" />
-<ChatHistoryTextColor value="255, 255, 255, 255" />
-<IMHistoryBgColor value="0, 30, 80, 200" />
-<IMHistoryTextColor value="255, 255, 255, 255" />
-
+<ChatHistoryBgColor value="0, 30, 80, 200" />           <!-- Local Chat background -->
+<ChatHistoryTextColor value="255, 255, 255, 255" />     <!-- Local Chat text -->
+<IMHistoryBgColor value="0, 30, 80, 200" />             <!-- Instant Message background -->
+<IMHistoryTextColor value="255, 255, 255, 255" />       <!-- Instant Message text -->
+ 
 <!-- IN-WORLD SELECTION -->
-<SilhouetteParentColor value="255, 255, 0, 255" />
-<SilhouetteChildColor value="32, 106, 196, 255" />
+<SilhouetteParentColor value="255, 255, 0, 255" />      <!-- Root prim selection outline -->
+<SilhouetteChildColor value="32, 106, 196, 255" />      <!-- Child prim selection outline -->
 <HighlightParentColor value="171, 212, 245, 255" />
 <HighlightChildColor value="171, 212, 245, 255" />
-<HighlightInspectColor value="255, 0, 255, 255" />
-
+<HighlightInspectColor value="255, 0, 255, 255" />      <!-- Selection outline when inspecting -->
+ 
 <!-- EDIT MODE GRID -->
-<GridFocusPointColor value="255, 255, 255, 128" />
-<GridlineColor value="255, 255, 255, 255" />
-<GridlineBGColor value="235, 235, 255, 200" />
-<GridlineShadowColor value="0, 0, 0, 80" />
-
+<GridFocusPointColor value="255, 255, 255, 128" />      <!-- Not used -->
+<GridlineColor value="255, 255, 255, 255" />            <!-- Grid color -->
+<GridlineBGColor value="235, 235, 255, 200" />          <!-- Grid background color -->
+<GridlineShadowColor value="0, 0, 0, 80" />             <!-- Grid drop shadow -->
+ 
 <!-- PROPERTY LINES -->
-<PropertyColorAvail value="0, 0, 0, 0" />
-<PropertyColorGroup value="0, 184, 184, 102" />
-<PropertyColorOther value="255, 0, 0, 102" />
-<PropertyColorSelf value="0, 255, 0, 102" />
-<PropertyColorForSale value="255, 128, 0, 102" />
-<PropertyColorAuction value="128, 0, 255, 102" />       <!-- Match the color on the world map -->
-
-<!-- Icon Enable/Disable -->
-<IconEnabledColor value="255, 255, 255, 255"/>
-<IconDisabledColor value="147, 169, 213, 200"/>
-
+<PropertyColorAvail value="0, 0, 0, 0" />               
+<PropertyColorGroup value="0, 184, 184, 102" />         <!-- Property group owns -->
+<PropertyColorOther value="255, 0, 0, 102" />           <!-- Property others own -->
+<PropertyColorSelf value="0, 255, 0, 102" />            <!-- Property you own -->
+<PropertyColorForSale value="255, 128, 0, 102" />       <!-- Property for sale -->
+<PropertyColorAuction value="128, 0, 255, 102" />       <!-- Match the color on the world map -->
+ 
+<!-- MEDIA ICONS -->
+<IconEnabledColor value="255, 255, 255, 255"/>          <!-- Media/music icon enabled -->
+<IconDisabledColor value="147, 169, 213, 200"/>         <!-- Media/music icon disabled -->
+ 
 <!-- MINI-MAP -->
-<NetMapBackgroundColor value="0, 0, 0, 77" />
-<NetMapYouOwnAboveWater value="0, 255, 255, 255" />
-<NetMapYouOwnBelowWater value="0, 200, 200, 255" />
-<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />
-<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />
-<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />
-<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />
-
-<!-- HELP WINDOW -->
-<HelpBgColor value="200, 209, 204, 255" />
-<HelpFgColor value="0, 0, 0, 255" />
-<HelpScrollTrackColor value="0, 0, 0, 255" />
-<HelpScrollThumbColor value="255, 255, 255, 255" />
-<HelpScrollHighlightColor value="115, 132, 155, 255" />
-<HelpScrollShadowColor value="0, 0, 0, 255" />
-
+<NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
+<NetMapYouOwnAboveWater value="0, 255, 255, 255" />     <!-- Objects owned by you above water -->
+<NetMapYouOwnBelowWater value="0, 200, 200, 255" />     <!-- Objects owned by you below water -->
+<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />   <!-- Group owned objects above water -->
+<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />   <!-- Group owned objects below water -->
+<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />    <!-- Objects owned by others above water -->
+<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />    <!-- Objects owned by others below water -->
+<NetMapGlyphColorAvatar value="0, 255, 0, 255" />       <!-- Also the color of avatar glyphs on the map -->
+<NetMapGlyphColorFriend value="255, 255, 0, 255" />
+ 
+<!-- INVENTORY -->
+<InventoryBackgroundColor value="255, 255, 255, 80"/>           <!-- Inventory floater background -->
+<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>  <!-- "loading..." -->
+<InventoryItemSuffixColor value="120, 70, 55, 255"/>            <!-- "worn", "no modify", etc -->
+<FilterBackgroundColor value="75, 75, 150, 180" />              <!-- Inventory search background -->
+<FilterTextColor value="255, 200, 70, 255" />                   <!-- Inventory search text -->
+<InventorySearchStatusColor value="0, 0, 0, 255" />             <!-- "Searching..." -->
+ 
 <!-- MISC -->
-<AvatarNameColor value="251, 175, 93, 255" />           <!-- Text color of avatar nametags -->
-<FocusColor value="239, 156, 0, 255" />                 <!-- Color of the glow around UI controls with keyboard focus -->
-<FloaterButtonImageColor value="255, 255, 255, 255" />  <!-- The floater buttons (like the close box) are white images that receive this color. -->
-<ButtonCautionImageColor value="255, 255,  255, 255" /> <!-- Match the caution dialog buttons to the default -->
-<HealthTextColor value="255, 255, 255, 255" />
+<AvatarNameColor value="251, 175, 93, 255" />           <!-- Text color of avatar nametags -->
+<FocusColor value="239, 156, 0, 255" />                 <!-- Color of the glow around UI controls with keyboard focus -->
+<FloaterButtonImageColor value="255, 255, 255, 255" />  <!-- The floater buttons (like the close box) are white images that receive this color. -->
+<ButtonCautionImageColor value="255, 255,  255, 255" /> <!-- Match the caution dialog buttons to the default -->
 <MapAutopilotColor value="255, 128, 0, 255" />
-<ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
-<ScriptBgReadOnlyColor value="180, 180, 180, 255" />
-<ParcelTextColor value="40, 40, 90, 255" />             <!-- Parcel name on menu bar, normal state -->
-<ParcelHoverColor value="70, 70, 100, 255" />           <!-- Parcel name on menu bar, hover state -->
-<TimeTextColor value="0, 30, 60, 255" />                <!-- SL Time on menu bar -->
-<BalanceTextColor value="0, 100, 40, 255" />            <!-- Linden dollar balance on menu bar -->
-<HealthTextColor value="110, 15, 15, 255" />            <!-- Damage meter text on menu bar -->
-<GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->
-<FilterBackgroundColor value="75, 75, 150, 180" /> <!-- Matching region of Inventory search text -->
-<FilterTextColor value="255, 200, 70, 255" />
-<InventoryItemSuffixColor value="120, 70, 55, 255"/>
-<InventorySearchStatusColor value="0, 0, 0, 255" />
-<ConsoleBackground value="0, 0, 0, 255" />
-<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>
-<InventoryBackgroundColor value="255, 255, 255, 80"/>
-
- <!-- Alert box colors -->
-<AlertBoxColor value="165, 180, 200, 245"/>
-<AlertTextColor value="0, 30, 60, 255"/>
-<AlertCautionBoxColor value="254, 209, 118, 255"/>      <!-- Background color of caution alerts -->
-<AlertCautionTextColor value="0, 0, 0, 255"/>           <!-- Foreground color of the special title text in caution alerts -->
+<ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
+<GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->
+<ConsoleBackground value="0, 0, 0, 255" />              <!-- Background for inworld chat -->
 
-<!--  Multi sliders, as in the sky animation setting -->
-<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>
-<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>
-<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>
-<MultiSliderTrackColor value="30, 30, 30, 255"/>
-<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/>
-<MultiSliderTriangleColor value="255, 255, 50, 255"/>
 </settings>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml
deleted file mode 100644
index 143442c..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml
+++ /dev/null
@@ -1,1275 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-359" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="left|top" height="550" 
-     left="308" min_height="100" min_width="100" mouse_opaque="true"
-     name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""
-     short_title="Build" width="272">
-
-<!-- Main floater tabs -->
-
-        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-             image_disabled="tool_zoom.tga"
-             image_disabled_selected="tool_zoom_active.tga"
-             image_selected="tool_zoom_active.tga" image_unselected="tool_zoom.tga"
-             label="" label_selected="" left="4" mouse_opaque="true" name="button focus"
-             tool_tip="Focus" width="32" />
-        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-             image_disabled="UIImgGrabUUID"
-             image_disabled_selected="UIImgGrabSelectedUUID"
-             image_selected="UIImgGrabSelectedUUID" image_unselected="UIImgGrabUUID"
-             label="" label_selected="" left="40" mouse_opaque="true" name="button move"
-             tool_tip="Move" width="32" />
-        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-             image_disabled="UIImgFaceUUID"
-             image_disabled_selected="UIImgFaceSelectedUUID"
-             image_selected="UIImgFaceSelectedUUID" image_unselected="UIImgFaceUUID"
-             label="" label_selected="" left="76" mouse_opaque="true" name="button edit"
-             tool_tip="Edit" width="32" />
-        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-             image_disabled="UIImgCreateUUID"
-             image_disabled_selected="UIImgCreateSelectedUUID"
-             image_selected="UIImgCreateSelectedUUID" image_unselected="UIImgCreateUUID"
-             label="" label_selected="" left="112" mouse_opaque="true"
-             name="button create" tool_tip="Create" width="32" />
-        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-             image_disabled="tool_dozer.tga"
-             image_disabled_selected="tool_dozer_active.tga"
-             image_selected="tool_dozer_active.tga" image_unselected="tool_dozer.tga"
-             label="" label_selected="" left="148" mouse_opaque="true"
-             name="button land" tool_tip="Land" width="32" />
-
-<!-- Focus panel -->
-
-        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Zoom" left="4" mouse_opaque="true"
-             name="radio zoom" radio_style="true" width="114" />
-        <volume_slider bottom="-69" follows="left|top" height="14" increment="0.01"
-             initial_val="0.125" left="114" max_val="0.5" min_val="0"
-             mouse_opaque="true" name="slider zoom" width="134" />
-        <check_box bottom="-84" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Orbit (Ctrl)" left="4" mouse_opaque="true"
-             name="radio orbit" radio_style="true" width="114" />
-        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Pan (Ctrl-Shift)" left="4"
-             mouse_opaque="true" name="radio pan" radio_style="true" width="114" />
-
-<!-- Move panel -->
-
-        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Move" left="4" mouse_opaque="true"
-             name="radio move" radio_style="true" width="114" />
-        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Lift (Ctrl)" left="4" mouse_opaque="true"
-             name="radio lift" radio_style="true" width="114" />
-        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Spin (Ctrl-Shift)" left="4"
-             mouse_opaque="true" name="radio spin" radio_style="true" width="114" />
-
-<!-- Edit panel -->
-
-        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Position" left="4" mouse_opaque="true"
-             name="radio position" radio_style="true" width="114" />
-        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Rotate (Ctrl)" left="4" mouse_opaque="true"
-             name="radio rotate" radio_style="true" width="114" />
-        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Stretch (Ctrl-Shift)" left="4"
-             mouse_opaque="true" name="radio stretch" radio_style="true" width="123" />
-        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Select Texture" left="4" mouse_opaque="true"
-             name="radio select face" radio_style="true" width="114" />
-        <check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Edit linked parts" left="4" mouse_opaque="true"
-             name="checkbox edit linked parts" width="114" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6"
-             mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">
-                Ruler mode:
-        </text>
-        <combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"
-             left_delta="74" max_chars="20" mouse_opaque="true"
-             name="combobox grid mode" width="86">
-                <combo_item name="World" value="World">
-                        World
-                </combo_item>
-                <combo_item name="Local" value="Local">
-                        Local
-                </combo_item>
-                <combo_item name="Reference" value="Reference">
-                        Reference
-                </combo_item>
-        </combo_box>
-        <check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Stretch Both Sides" left="143" mouse_opaque="true"
-             name="checkbox uniform" width="134" />
-        <check_box bottom_delta="-15" control_name="ScaleStretchTextures" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="true"
-             label="Stretch Textures" left_delta="0" mouse_opaque="true"
-             name="checkbox stretch textures" width="134" />
-        <check_box bottom_delta="-19" control_name="SnapEnabled" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
-             left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
-        <button bottom_delta="-14" follows="left|top" font="SansSerifSmall" halign="center"
-             height="16" label="Options..." label_selected="Options..." left_delta="20"
-             mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
-
-<!-- Help text -->
-
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-52" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-             mouse_opaque="true" name="text status" v_pad="0" width="264">
-                Drag to move, shift-drag to copy
-        </text>
-
-<!-- Create panel -->
-
-        <button bottom="-78" follows="left|top" font="SansSerif" halign="center" height="30"
-             image_disabled="object_cube.tga"
-             image_disabled_selected="object_cube_active.tga"
-             image_selected="object_cube_active.tga" image_unselected="object_cube.tga"
-             label="" label_selected="" left="4" mouse_opaque="true" name="ToolCube"
-             scale_image="TRUE" width="30" tool_tip="Cube"/>
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_prism.tga"
-             image_disabled_selected="object_prism_active.tga"
-             image_selected="object_prism_active.tga"
-             image_unselected="object_prism.tga" label="" label_selected=""
-             left_delta="28" mouse_opaque="true" name="ToolPrism" scale_image="TRUE"
-        tool_tip="Prism" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_pyramid.tga"
-             image_disabled_selected="object_pyramid_active.tga"
-             image_selected="object_pyramid_active.tga"
-             image_unselected="object_pyramid.tga" label="" label_selected=""
-             left_delta="28" mouse_opaque="true" name="ToolPyramid" scale_image="TRUE"
- tool_tip="Pyramid" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_tetrahedron.tga"
-             image_disabled_selected="object_tetrahedron_active.tga"
-             image_selected="object_tetrahedron_active.tga"
-             image_unselected="object_tetrahedron.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" name="ToolTetrahedron"
-             scale_image="TRUE" tool_tip="Tetrahedron" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_cylinder.tga"
-             image_disabled_selected="object_cylinder_active.tga"
-             image_selected="object_cylinder_active.tga"
-             image_unselected="object_cylinder.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" tool_tip="Cylinder" name="ToolCylinder" scale_image="TRUE"
-             width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_hemi_cylinder.tga"
-             image_disabled_selected="object_hemi_cylinder_active.tga"
-             image_selected="object_hemi_cylinder_active.tga"
-             image_unselected="object_hemi_cylinder.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" name="ToolHemiCylinder"
-             scale_image="TRUE" tool_tip="Hemicylinder" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_cone.tga"
-             image_disabled_selected="object_cone_active.tga"
-             image_selected="object_cone_active.tga" image_unselected="object_cone.tga"
-             label="" label_selected="" left_delta="23" mouse_opaque="true"
-             name="ToolCone" scale_image="TRUE" tool_tip="Cone" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_hemi_cone.tga"
-             image_disabled_selected="object_hemi_cone_active.tga"
-             image_selected="object_hemi_cone_active.tga"
-             image_unselected="object_hemi_cone.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" name="ToolHemiCone" scale_image="TRUE"
-      tool_tip="Hemicone" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_sphere.tga"
-             image_disabled_selected="object_sphere_active.tga"
-             image_selected="object_sphere_active.tga"
-             image_unselected="object_sphere.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" name="ToolSphere" scale_image="TRUE"
-             width="30" tool_tip="Sphere" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_hemi_sphere.tga"
-             image_disabled_selected="object_hemi_sphere_active.tga"
-             image_selected="object_hemi_sphere_active.tga"
-             image_unselected="object_hemi_sphere.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" name="ToolHemiSphere"
-             scale_image="TRUE" tool_tip="Hemisphere" width="30" />
-        <button bottom_delta="-23" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_torus.tga"
-             image_disabled_selected="object_torus_active.tga"
-             image_selected="object_torus_active.tga"
-             image_unselected="object_torus.tga" label="" label_selected="" left="4"
-             mouse_opaque="true" name="ToolTorus" scale_image="TRUE" tool_tip="Torus" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_tube.tga"
-             image_disabled_selected="object_tube_active.tga"
-             image_selected="object_tube_active.tga" image_unselected="object_tube.tga"
-             label="" label_selected="" left_delta="23" mouse_opaque="true"
-             name="ToolTube" scale_image="TRUE" tool_tip="Tube" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_ring.tga"
-             image_disabled_selected="object_ring_active.tga"
-             image_selected="object_ring_active.tga" image_unselected="object_ring.tga"
-             label="" label_selected="" left_delta="23" mouse_opaque="true"
-             name="ToolRing" scale_image="TRUE" tool_tip="Ring" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_tree.tga"
-             image_disabled_selected="object_tree_active.tga"
-             image_selected="object_tree_active.tga" image_unselected="object_tree.tga"
-             label="" label_selected="" left_delta="23" mouse_opaque="true"
-             name="ToolTree" scale_image="TRUE" tool_tip="Tree" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_grass.tga"
-             image_disabled_selected="object_grass_active.tga"
-             image_selected="object_grass_active.tga"
-             image_unselected="object_grass.tga" label="" label_selected=""
-             left_delta="28" mouse_opaque="true" name="ToolGrass" scale_image="TRUE"
-             tool_tip="Grass" width="30" />
-        <check_box bottom="-120" control_name="CreateToolKeepSelected" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Keep Tool Selected" left="4" mouse_opaque="true"
-             name="checkbox sticky" width="128" />
-        <check_box bottom_delta="-15" control_name="CreateToolCopySelection" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Copy Selection" left_delta="0" mouse_opaque="true"
-             name="checkbox copy selection" width="134" />
-        <check_box bottom_delta="-15" control_name="CreateToolCopyCenters" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="true" label="Center Copy"
-             left_delta="20" mouse_opaque="true" name="checkbox copy centers"
-             width="134" />
-        <check_box bottom_delta="-15" control_name="CreateToolCopyRotates" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false" label="Rotate Copy"
-             left_delta="0" mouse_opaque="true" name="checkbox copy rotates" width="134" />
-
-<!-- Land panel -->
-
-        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Select Land" left="4" mouse_opaque="true"
-             name="radio select land" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Flatten Land" left="4" mouse_opaque="true"
-             name="radio flatten" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Raise Land" left="4" mouse_opaque="true"
-             name="radio raise" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Lower Land" left="4" mouse_opaque="true"
-             name="radio lower" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Smooth Land" left="4" mouse_opaque="true"
-             name="radio smooth" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Roughen Land" left="4" mouse_opaque="true"
-             name="radio noise" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Revert Land" left="4" mouse_opaque="true"
-             name="radio revert" radio_style="true" width="114" />
-        <combo_box allow_text_entry="false" bottom="-85" follows="left|top" height="18" left="118"
-             max_chars="20" mouse_opaque="true" name="combobox brush size" width="134">
-                <combo_item name="Small" value="Small">
-                        Small
-                </combo_item>
-                <combo_item name="Medium" value="Medium">
-                        Medium
-                </combo_item>
-                <combo_item name="Large" value="Large">
-                        Large
-                </combo_item>
-        </combo_box>
-        <volume_slider bottom_delta="-19" follows="left|top" height="16" hidden="false" increment="0.1"
-         initial_val="0.00" left="176" max_val="2.0" min_val="-1.0"
-             mouse_opaque="true" name="slider force" width="70" />      
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="4" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-             left="126" mouse_opaque="true" name="Strength:" v_pad="0" width="128">
-                  Strength:
-        </text>    
-        <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="center"
-             height="16" label="Apply to selection" label_selected="Apply to selection"
-             left="118" mouse_opaque="true" name="button apply to selection"
-             scale_image="TRUE" tool_tip="Modify Selected Land" width="134" />
-        <check_box bottom_delta="-20" control_name="ShowParcelOwners" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false" label="Show Owners"
-             left="118" mouse_opaque="true" name="checkbox show owners" width="134" />
-        <button bottom="-163" follows="left|top" font="SansSerifSmall" halign="center"
-             height="20" label="More &gt;&gt;" left="186" mouse_opaque="true"
-             name="button more" scale_image="TRUE" tool_tip="Advanced Options"
-             width="80" />
-        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-             height="20" label="&lt;&lt; Less" left_delta="0" mouse_opaque="true"
-             name="button less" scale_image="TRUE" tool_tip="Advanced Options"
-             width="80" />
-
-<!-- Sub-tabs -->
-
-        <tab_container bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="false"
-             name="Object Info Tabs" tab_max_width="52" tab_min_width="40"
-             tab_position="top" width="272">
-                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-                     label="General" left="1" mouse_opaque="false" name="General" width="270">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="Name:" v_pad="0" width="78">
-                                Name:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-26"
-                             follows="left|top|right" font="SansSerifSmall" height="16" left="88"
-                             max_length="63" mouse_opaque="true" name="Object Name"
-                             select_all_on_focus_received="true" width="172" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-40" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="Description:" v_pad="0" width="78">
-                                Description:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-46"
-                             follows="left|top|right" font="SansSerifSmall" height="16" left="88"
-                             max_length="127" mouse_opaque="true" name="Object Description"
-                             select_all_on_focus_received="true" width="172" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-66" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-                             mouse_opaque="true" name="Creator:" v_pad="0" width="78">
-                                Creator:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-66" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
-                             mouse_opaque="true" name="Creator Name" v_pad="0" width="88">
-                                Thrax Linden
-                        </text>
-                        <button bottom="-66" follows="top|right" font="SansSerifSmall" halign="center"
-                             height="16" label="Profile..." label_selected="Profile..." left_delta="94"
-                             mouse_opaque="true" name="button creator profile" scale_image="TRUE"
-                             width="78" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-86" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-                             mouse_opaque="true" name="Owner:" v_pad="0" width="78">
-                                Owner:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-86" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
-                             mouse_opaque="true" name="Owner Name" v_pad="0" width="88">
-                                Thrax Linden
-                        </text>
-                        <button bottom="-86" follows="top|right" font="SansSerifSmall" halign="center"
-                             height="16" label="Profile..." label_selected="Profile..." left_delta="94"
-                             mouse_opaque="true" name="button owner profile" scale_image="TRUE"
-                             width="78" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-106" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-                             mouse_opaque="true" name="Group:" v_pad="0" width="78">
-                                Group:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-106" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
-                             mouse_opaque="true" name="Group Name Proxy" v_pad="0" visible="false"
-                             width="88">
-                                The Lindens
-                        </text>
-                        <button bottom="-106" follows="top|right" font="SansSerifSmall" halign="center"
-                             height="16" label="Set..." label_selected="Set..." left_delta="94"
-                             mouse_opaque="true" name="button set group" scale_image="TRUE" width="78" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-126" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-                             mouse_opaque="true" name="prim info" v_pad="0" width="166">
-                                1 Object, 1 Primitive
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-                             mouse_opaque="true" name="Permissions:" v_pad="0" width="85">
-                                Permissions:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-                             mouse_opaque="true" name="perm_modify" v_pad="0" width="250">
-                                You can modify this object.
-                        </text>
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Share with group" left="10"
-                             mouse_opaque="true" name="checkbox share with group"
-                             tool_tip="Allow group members to move, modify, copy and delete."
-                             width="166" />
-                        <string name="text deed continued">
-                                Deed...
-                        </string>
-                        <string name="text deed">
-                                Deed
-                        </string>
-                        <button bottom="-186" follows="top|right" font="SansSerifSmall" halign="center"
-                             height="16" label="Deed..." label_selected="Deed..." left_delta="172"
-                             mouse_opaque="true" name="button deed" scale_image="TRUE"
-                             tool_tip="Group shared objects can be deeded by a group officer."
-                             width="78" />
-                        <check_box bottom="-206" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Allow anyone to move" left="10"
-                             mouse_opaque="true" name="checkbox allow everyone move" width="142" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Allow anyone to copy" left="10"
-                             mouse_opaque="true" name="checkbox allow everyone copy" width="141" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Show in search" left="10" name="search_check"
-                             tool_tip="Let people see this object in search results" width="78" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="For Sale" left="10" mouse_opaque="true"
-                             name="checkbox for sale" width="78" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="90"
-                             mouse_opaque="true" name="Cost" v_pad="0" width="78">
-                                Price:  L$
-                        </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-                             follows="left|top|right" font="SansSerifSmall" height="16" left_delta="80"
-                             max_length="25" mouse_opaque="true" name="Edit Cost" width="75" />
-                        <radio_group bottom="-286" draw_border="false" follows="left|top|right" height="16"
-                             left="42" mouse_opaque="true" name="sale type" width="218">
-                                <radio_item bottom="-16" follows="left|top" height="16" left="0" mouse_opaque="true"
-                                     name="Original" width="70">
-                                        Original
-                                </radio_item>
-                                <radio_item bottom="-16" follows="left|top" height="16" left="70" mouse_opaque="true"
-                                     name="Copy" width="70">
-                                        Copy
-                                </radio_item>
-                                <radio_item bottom="-16" follows="left|top" height="16" left="140" mouse_opaque="true"
-                                     name="Contents" width="76">
-                                        Contents
-                                </radio_item>
-                        </radio_group>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-298" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="Next owner can:" v_pad="0" width="250">
-                                Next owner can:
-                        </text>
-                        <check_box bottom_delta="-22" follows="left|top|right" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Modify" left="10" mouse_opaque="true"
-                             name="checkbox next owner can modify" width="250" />
-                        <check_box bottom_delta="0" follows="left|top|right" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Copy" left_delta="60" mouse_opaque="true"
-                             name="checkbox next owner can copy" width="190" />
-                        <check_box bottom_delta="0" follows="left|top|right" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Resell/Give away" left_delta="60"
-                             mouse_opaque="true" name="checkbox next owner can transfer" width="130" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-332" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="label click action" v_pad="0" width="150">
-                                When Left-Clicked:
-                        </text>
-                        <combo_box allow_text_entry="false" bottom_delta="-25" follows="left|top" height="18"
-                             left="10" max_chars="20" mouse_opaque="true" name="clickaction" width="150">
-                             <!-- Do not reorder these items, the index numbers are
-                                        used internally. JC -->
-                                <combo_item name="Touch/grab(default)" value="Touch/grab (default)">
-                                        Touch/grab (default)
-                                </combo_item>
-                                <combo_item name="Sitonobject" value="Sit on object">
-                                        Sit on object
-                                </combo_item>
-                                <combo_item name="Buyobject" value="Buy object">
-                                        Buy object
-                                </combo_item>
-                                <combo_item name="Payobject" value="Pay object">
-                                        Pay object
-                                </combo_item>
-                                <combo_item name="Open" value="Open">
-                                        Open
-                                </combo_item>
-                                <combo_item name="Play" value="Play">
-                                        Play parcel media
-                                </combo_item>
-                                <combo_item name="Opemmedia" value="Open Media">
-                                        Open parcel media
-                                </combo_item>
-                        </combo_box>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-135" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
-                             mouse_opaque="true" name="B:" v_pad="0" width="174">
-                                B:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-135" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
-                             mouse_opaque="true" name="O:" v_pad="0" width="124">
-                                O;
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-135" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
-                             mouse_opaque="true" name="G:" v_pad="0" width="74">
-                                G:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-147" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
-                             mouse_opaque="true" name="E:" v_pad="0" width="174">
-                                E:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-147" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
-                             mouse_opaque="true" name="N:" v_pad="0" width="124">
-                                N:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-147" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
-                             mouse_opaque="true" name="F:" v_pad="0" width="74">
-                                F:
-                        </text>
-                        <string name="text modify info 1">
-                                You can modify this object.
-                        </string>
-                        <string name="text modify info 2">
-                                You can modify these objects.
-                        </string>
-                        <string name="text modify info 3">
-                                You cannot modify this object.
-                        </string>
-                        <string name="text modify info 4">
-                                You cannot modify these objects.
-                        </string>
-                        <string name="text modify warning">
-                                Must select entire object to set permissions.
-                        </string>
-                        <string name="Cost Default">
-                        Price:           L$
-                        </string>
-                        <string name="Cost Total">
-                        Total Price:  L$
-                        </string>
-                        <string name="Cost Per Unit">
-                        Price Per:     L$
-                        </string>
-                        <string name="Cost Mixed">
-                        Mixed Price
-                        </string>
-                        <string name="Sale Mixed">
-                        Mixed Sale
-                        </string>
-                </panel>
-
-<!-- Object sub-tab -->
-
-                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-                     label="Object" left="1" mouse_opaque="false" name="Object" width="270">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="select_single" v_pad="0" width="252">
-                                Select only one primitive to edit parameters.
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
-                             mouse_opaque="true" name="edit_object" v_pad="0" width="252">
-                                Edit object parameters:
-                        </text>
-                        <check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Locked" left="8" mouse_opaque="true"
-                             name="checkbox locked"
-                             tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."
-                             width="123" />
-                        <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Physical" left="8" mouse_opaque="true"
-                             name="Physical Checkbox Ctrl"
-                             tool_tip="Allows object to be pushed and affected by gravity" width="123" />
-                        <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Temporary" left="8" mouse_opaque="true"
-                             name="Temporary Checkbox Ctrl"
-                             tool_tip="Causes object to be deleted 1 minute after creation." width="123" />
-                        <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Phantom" left="8" mouse_opaque="true"
-                             name="Phantom Checkbox Ctrl"
-                             tool_tip="Causes object to not collide with other objects or avatars"
-                             width="123" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="label position" v_pad="0" width="121">
-                                Position (meters)
-                        </text>
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.01" initial_val="0" label="X" label_width="10" left="10"
-                             max_val="512" min_val="-256" mouse_opaque="true" name="Pos X"
-                             text_enabled_color="110, 15, 15, 255" width="87" />
-                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
-                             max_val="512" min_val="-256" mouse_opaque="true" name="Pos Y"
-                             text_enabled_color="0, 100, 40, 255" width="87" />
-                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
-                             max_val="4096" min_val="0" mouse_opaque="true" name="Pos Z"
-                             text_enabled_color="0, 67, 132, 255" width="87" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="label size" v_pad="0" width="121">
-                                Size (meters)
-                        </text>
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.01" initial_val="0" label="X" label_width="10" left="10"
-                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale X"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
-                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
-                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Y"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
-                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
-                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Z"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="label rotation" v_pad="0" width="121">
-                                Rotation (degrees)
-                        </text>
-                        <spinner bottom_delta="-22" decimal_digits="2" follows="left|top" height="16"
-                             increment="1" initial_val="0" label="X" label_width="10" left="10"
-                             max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot X"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
-                        <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
-                             increment="1" initial_val="0" label="Y" label_width="10" left="10"
-                             max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Y"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
-                        <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
-                             increment="1" initial_val="0" label="Z" label_width="10" left="10"
-                             max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Z"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="label material" v_pad="0" width="121">
-                                Material
-                        </text>
-                        <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-                             left="10" max_chars="20" mouse_opaque="true" name="material" width="87">
-                                <combo_item name="Stone" value="Stone">
-                                        Stone
-                                </combo_item>
-                                <combo_item name="Metal" value="Metal">
-                                        Metal
-                                </combo_item>
-                                <combo_item name="Glass" value="Glass">
-                                        Glass
-                                </combo_item>
-                                <combo_item name="Wood" value="Wood">
-                                        Wood
-                                </combo_item>
-                                <combo_item name="Flesh" value="Flesh">
-                                        Flesh
-                                </combo_item>
-                                <combo_item name="Plastic" value="Plastic">
-                                        Plastic
-                                </combo_item>
-                                <combo_item name="Rubber" value="Rubber">
-                                        Rubber
-                                </combo_item>
-                        </combo_box>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-36" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="label basetype" v_pad="0" width="141">
-                                Building Block Type
-                        </text>
-                        <combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
-                             left="121" max_chars="20" mouse_opaque="true" name="comboBaseType"
-                             width="141">
-                                <combo_item name="Box" value="Box">
-                                        Box
-                                </combo_item>
-                                <combo_item name="Cylinder" value="Cylinder">
-                                        Cylinder
-                                </combo_item>
-                                <combo_item name="Prism" value="Prism">
-                                        Prism
-                                </combo_item>
-                                <combo_item name="Sphere" value="Sphere">
-                                        Sphere
-                                </combo_item>
-                                <combo_item name="Torus" value="Torus">
-                                        Torus
-                                </combo_item>
-                                <combo_item name="Tube" value="Tube">
-                                        Tube
-                                </combo_item>
-                                <combo_item name="Ring" value="Ring">
-                                        Ring
-                                </combo_item>
-                                <combo_item name="Sculpted" value="Sculpted">
-                                        Sculpted
-                                </combo_item>
-                        </combo_box>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="text cut" v_pad="0" width="141">
-                                Path Cut Begin and End
-                        </text>
-                        <spinner bottom_delta="-22" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="B" label_width="10" left="121"
-                             max_val="0.98" min_val="0" mouse_opaque="true" name="cut begin" width="68" />
-                        <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.05" initial_val="1" label="E" label_width="10" left_delta="73"
-                             max_val="1" min_val="0.02" mouse_opaque="true" name="cut end" width="68" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="text hollow" v_pad="0" width="68">
-                                Hollow
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="78"
-                             mouse_opaque="true" name="text skew" v_pad="0" width="63">
-                                Skew
-                        </text>
-                        <spinner bottom_delta="-20" decimal_digits="1" follows="left|top" height="16"
-                             increment="5" initial_val="0" left="121" max_val="95" min_val="0"
-                             mouse_opaque="true" name="Scale 1" width="68" />
-                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" left_delta="73" max_val="0.95"
-                             min_val="-0.95" mouse_opaque="true" name="Skew" width="68" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-15" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141">
-                                Hollow Shape
-                        </text>
-                        <combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
-                             left="121" max_chars="20" mouse_opaque="true" name="hole" width="141">
-                                <combo_item name="Default" value="Default">
-                                        Default
-                                </combo_item>
-                                <combo_item name="Circle" value="Circle">
-                                        Circle
-                                </combo_item>
-                                <combo_item name="Square" value="Square">
-                                        Square
-                                </combo_item>
-                                <combo_item name="Triangle" value="Triangle">
-                                        Triangle
-                                </combo_item>
-                        </combo_box>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="text twist" v_pad="0" width="141">
-                                Twist Begin and End
-                        </text>
-                        <spinner bottom_delta="-22" decimal_digits="0" follows="left|top" height="16"
-                             increment="9" initial_val="0" label="B" label_width="10" left="121"
-                             max_val="180" min_val="-180" mouse_opaque="true" name="Twist Begin"
-                             width="68" />
-                        <spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="16"
-                             increment="9" initial_val="0" label="E" label_width="10" left_delta="73"
-                             max_val="180" min_val="-180" mouse_opaque="true" name="Twist End"
-                             width="68" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="scale_taper" v_pad="0" width="141">
-                                Taper
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="scale_hole" v_pad="0" width="141">
-                                Hole Size
-                        </text>
-                        <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="X" label_width="10" left="121"
-                             max_val="1" min_val="-1" mouse_opaque="true" name="Taper Scale X"
-                             width="68" />
-                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
-                             max_val="1" min_val="-1" mouse_opaque="true" name="Taper Scale Y"
-                             width="68" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="text topshear" v_pad="0" width="141">
-                                Top Shear
-                        </text>
-                        <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="X" label_width="10" left="121"
-                             max_val="0.5" min_val="-0.5" mouse_opaque="true" name="Shear X" width="68" />
-                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
-                             max_val="0.5" min_val="-0.5" mouse_opaque="true" name="Shear Y" width="68" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="advanced_cut" v_pad="0" width="141">
-                                Profile Cut Begin and End
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
-                             mouse_opaque="true" name="advanced_dimple" v_pad="0" width="141">
-                                Dimple Begin and End
-                        </text>
-                        <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="B" label_width="10" left="121"
-                             max_val="0.95" min_val="0" mouse_opaque="true" name="Path Limit Begin"
-                             width="68" />
-                        <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.05" initial_val="1" label="E" label_width="10" left_delta="73"
-                             max_val="1" min_val="0.05" mouse_opaque="true" name="Path Limit End"
-                             width="68" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="text taper2" v_pad="0" width="141">
-                                Taper
-                        </text>
-                        <spinner bottom_delta="-19" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="X" label_width="10" left="121"
-                             max_val="1" min_val="-1" mouse_opaque="true" name="Taper X" width="68" />
-                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
-                             max_val="1" min_val="-1" mouse_opaque="true" name="Taper Y" width="68" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="text radius delta" v_pad="0" width="78">
-                                Radius
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="73"
-                             mouse_opaque="true" name="text revolutions" v_pad="0" width="68">
-                                Revolutions
-                        </text>
-                        <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" left="121" max_val="1" min_val="-1"
-                             mouse_opaque="true" name="Radius Offset" width="68" />
-                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.1" initial_val="1" left_delta="73" max_val="4" min_val="1"
-                             mouse_opaque="true" name="Revolutions" width="68" />
-                        <texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"
-                             default_image_name="Default" follows="left|top" height="141"
-                             label="Sculpt Texture" left="121" mouse_opaque="true"
-                             name="sculpt texture control" tool_tip="Click to choose a picture"
-                             visible="false" width="141" />
-                        <check_box bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Mirror" left="121" mouse_opaque="true"
-                             name="sculpt mirror control" visible="false"
-                             tool_tip="Flips sculpted prim along the X axis."
-                             width="121" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Inside-out" left="121" mouse_opaque="true"
-                             name="sculpt invert control" visible="false"
-                             tool_tip="Inverts the sculpted prims normals, making it appear inside-out."
-                             width="121" />
-                        <text align="left" bg_visible="false" border_drop_shadow_visible="false"
-                             border_visible="false" bottom_delta="-20" drop_shadow_visible="true"
-                             follows="left|top" font="SansSerifSmall" h_pad="0" height="10" left="121"
-                             mouse_opaque="true" name="label sculpt type" v_pad="0" visible="false"
-                             width="121">
-                                Stitching type
-                        </text>
-                        <combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
-                             left="121" max_chars="20" mouse_opaque="true" name="sculpt type control"
-                             visible="false" width="141">
-                                <combo_item name="None" value="None">
-                                        (none)
-                                </combo_item>
-                                <combo_item name="Sphere" value="Sphere">
-                                        Sphere
-                                </combo_item>
-                                <combo_item name="Torus" value="Torus">
-                                        Torus
-                                </combo_item>
-                                <combo_item name="Plane" value="Plane">
-                                        Plane
-                                </combo_item>
-                                <combo_item name="Cylinder" value="Cylinder">
-                                        Cylinder
-                                </combo_item>
-                        </combo_box>
-                </panel>
-
-<!-- Features sub-tab -->
-
-                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-                     label="Features" left="1" mouse_opaque="false" name="Features" width="270">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="select_single" v_pad="0" width="252">
-                                Select only one primitive to edit features.
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="edit_object" v_pad="0" width="252">
-                                Edit object features:
-                        </text>
-                        <check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Flexible Path" left="10" mouse_opaque="true"
-                             name="Flexible1D Checkbox Ctrl"
-                             tool_tip="Allows object to flex about the Z axis. (Client-side only)"
-                             width="121" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="1" initial_val="2" label="Softness" label_width="65" left="10"
-                             max_val="3" min_val="0" mouse_opaque="true" name="FlexNumSections"
-                             width="128" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.5" initial_val="0.3" label="Gravity" label_width="65"
-                             left="10" max_val="10" min_val="-10" mouse_opaque="true" name="FlexGravity"
-                             width="128" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.5" initial_val="2" label="Drag" label_width="65" left="10"
-                             max_val="10" min_val="0" mouse_opaque="true" name="FlexFriction"
-                             width="128" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.5" initial_val="0" label="Wind" label_width="65" left="10"
-                             max_val="10" min_val="0" mouse_opaque="true" name="FlexWind" width="128" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.5" initial_val="1" label="Tension" label_width="65" left="10"
-                             max_val="10" min_val="0" mouse_opaque="true" name="FlexTension" width="128" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.01" initial_val="0" label="Force X" label_width="65" left="10"
-                             max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceX"
-                             width="128" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.01" initial_val="0" label="Force Y" label_width="65" left="10"
-                             max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceY"
-                             width="128" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.01" initial_val="0" label="Force Z" label_width="65" left="10"
-                             max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceZ"
-                             width="128" />
-                        <check_box bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Light" left="10" mouse_opaque="true"
-                             name="Light Checkbox Ctrl" tool_tip="Causes object to emit light"
-                             width="121" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-21" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
-                             mouse_opaque="true" name="label color" v_pad="0" width="58">
-                                Color
-                        </text>
-                        <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-28"
-                             can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
-                             height="48" label="" left_delta="67" mouse_opaque="true" name="colorswatch"
-                             tool_tip="Click to open Color Picker" width="32" />
-                        <spinner bottom_delta="-4" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.1" initial_val="0.5" label="Intensity" label_width="65"
-                             left="10" max_val="1" min_val="0" mouse_opaque="true"
-                             name="Light Intensity" width="128" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.1" initial_val="5" label="Radius" label_width="65"
-                             left_delta="0" max_val="20" min_val="0" mouse_opaque="true"
-                             name="Light Radius" width="128" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.25" initial_val="1" label="Falloff" label_width="65"
-                             left_delta="0" max_val="2" min_val="0" mouse_opaque="true"
-                             name="Light Falloff" width="128" />
-                </panel>
-
-<!-- Texture sub-tab -->
-
-                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-                     label="Texture" left="1" mouse_opaque="false" name="Texture" width="270">
-                        <texture_picker allow_no_texture="false" bottom="-90" can_apply_immediately="true"
-                             default_image_name="Default" follows="left|top" height="80" label="Texture"
-                             left="10" mouse_opaque="true" name="texture control"
-                             tool_tip="Click to choose a picture" width="64" />
-                        <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-90"
-                             can_apply_immediately="true" color="1, 1, 1, 1" follows="left|top"
-                             height="80" label="Color" left_delta="90" mouse_opaque="true"
-                             name="colorswatch" tool_tip="Click to open Color Picker" width="64" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-11" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"
-                             mouse_opaque="true" name="color trans" v_pad="0" width="80">
-                                Transparency %
-                        </text>
-                        <spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"
-                             increment="2" initial_val="0" left="180" max_val="90" min_val="0"
-                             mouse_opaque="true" name="ColorTrans" width="80" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10"
-                             left="180" mouse_opaque="true" name="glow label" v_pad="0" width="80">
-                                Glow
-                        </text>
-                        <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.1" initial_val="0" left="180" max_val="1"
-                             min_val="0" mouse_opaque="true" name="glow" width="80" />
-                        <check_box bottom_delta="-23" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Full Bright" left="180" mouse_opaque="true"
-                             name="checkbox fullbright" width="81" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-104" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="tex gen" v_pad="0" width="90">
-                                Mapping
-                        </text>
-                        <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-                             left="10" max_chars="20" mouse_opaque="true" name="combobox texgen"
-                             width="80">
-                                <combo_item name="Default" value="Default">
-                                        Default
-                                </combo_item>
-                                <combo_item name="Planar" value="Planar">
-                                        Planar
-                                </combo_item>
-                        </combo_box>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-104" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="100"
-                             mouse_opaque="true" name="label shininess" v_pad="0" width="70">
-                                Shininess
-                        </text>
-                        <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-                             left="100" max_chars="20" mouse_opaque="true" name="combobox shininess"
-                             width="70">
-                                <combo_item name="None" value="None">
-                                        None
-                                </combo_item>
-                                <combo_item name="Low" value="Low">
-                                        Low
-                                </combo_item>
-                                <combo_item name="Medium" value="Medium">
-                                        Medium
-                                </combo_item>
-                                <combo_item name="High" value="High">
-                                        High
-                                </combo_item>
-                        </combo_box>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-104" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"
-                             mouse_opaque="true" name="label bumpiness" v_pad="0" width="80">
-                                Bumpiness
-                        </text>
-                        <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-                             left="180" max_chars="20" mouse_opaque="true" name="combobox bumpiness"
-                             width="80">
-                                <combo_item name="None" value="None">
-                                        None
-                                </combo_item>
-                                <combo_item name="Brightness" value="Brightness">
-                                        Brightness
-                                </combo_item>
-                                <combo_item name="Darkness" value="Darkness">
-                                        Darkness
-                                </combo_item>
-                                <combo_item name="woodgrain" value="woodgrain">
-                                        woodgrain
-                                </combo_item>
-                                <combo_item name="bark" value="bark">
-                                        bark
-                                </combo_item>
-                                <combo_item name="bricks" value="bricks">
-                                        bricks
-                                </combo_item>
-                                <combo_item name="checker" value="checker">
-                                        checker
-                                </combo_item>
-                                <combo_item name="concrete" value="concrete">
-                                        concrete
-                                </combo_item>
-                                <combo_item name="crustytile" value="crustytile">
-                                        crustytile
-                                </combo_item>
-                                <combo_item name="cutstone" value="cutstone">
-                                        cutstone
-                                </combo_item>
-                                <combo_item name="discs" value="discs">
-                                        discs
-                                </combo_item>
-                                <combo_item name="gravel" value="gravel">
-                                        gravel
-                                </combo_item>
-                                <combo_item name="petridish" value="petridish">
-                                        petridish
-                                </combo_item>
-                                <combo_item name="siding" value="siding">
-                                        siding
-                                </combo_item>
-                                <combo_item name="stonetile" value="stonetile">
-                                        stonetile
-                                </combo_item>
-                                <combo_item name="stucco" value="stucco">
-                                        stucco
-                                </combo_item>
-                                <combo_item name="suction" value="suction">
-                                        suction
-                                </combo_item>
-                                <combo_item name="weave" value="weave">
-                                        weave
-                                </combo_item>
-                        </combo_box>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-158" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="tex scale" v_pad="0" width="160">
-                                Repeats per Face
-                        </text>
-                        <spinner bottom="-178" decimal_digits="3" follows="left|top" height="16" increment="0.1"
-                             initial_val="0" label="Horizontal (U)" label_width="90" left="20"
-                             max_val="100" min_val="0" mouse_opaque="true" name="TexScaleU" width="160" />
-                        <check_box bottom="-179" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
-                             name="checkbox flip s" width="70" />
-                        <spinner bottom="-196" decimal_digits="3" follows="left|top" height="16" increment="0.1"
-                             initial_val="0" label="Vertical (V)" label_width="90" left="20"
-                             max_val="100" min_val="0" mouse_opaque="true" name="TexScaleV" width="160" />
-                        <check_box bottom="-197" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
-                             name="checkbox flip t" width="70" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-228" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="tex rotate" v_pad="0" width="102">
-                                Rotation (degrees)
-                        </text>
-                        <spinner bottom="-234" decimal_digits="2" follows="left|top" height="16" increment="1"
-                             initial_val="0" left="112" max_val="9999" min_val="-9999"
-                             mouse_opaque="true" name="TexRot" width="68" />
-                        <string name="string repeats per meter">
-                                Repeats Per Meter
-                        </string>
-                        <string name="string repeats per face">
-                                Repeats Per Face
-                        </string>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-250" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="rpt" v_pad="0" width="160">
-                                Repeats Per Meter
-                        </text>
-                        <spinner bottom="-256" decimal_digits="1" follows="left|top" height="16" increment="0.1"
-                             initial_val="1" left="112" max_val="10" min_val="0.1" mouse_opaque="true"
-                             name="rptctrl" width="68" />
-                        <button bottom="-256" follows="left|top" font="SansSerifSmall" halign="center"
-                             height="16" label="Apply" label_selected="Apply" left_delta="78"
-                             mouse_opaque="true" name="button apply" scale_image="TRUE" width="75" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-288" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="tex offset" v_pad="0" width="160">
-                                Offset
-                        </text>
-                        <spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.1"
-                             initial_val="0" label="Horizontal (U)" label_width="90" left="20"
-                             max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160" />
-                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.1" initial_val="0" label="Vertical (V)" label_width="90"
-                             left="20" max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetV"
-                             width="160" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-352" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-                             mouse_opaque="true" name="textbox autofix" v_pad="0" width="160">
-                                Align media texture
-(must load first)
-                        </text>
-                        <button bottom="-360" follows="left|top" font="SansSerifSmall" halign="center"
-                             height="16" label="Align" label_selected="Align" left="112"
-                             mouse_opaque="true" name="button align" scale_image="TRUE" width="68" />
-                </panel>
-                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-                     label="Content" left="1" mouse_opaque="false" name="Contents" width="270">
-                        <button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"
-                              label="New Script..." label_selected="New Script..."
-                             left="10" mouse_opaque="true" name="button new script" scale_image="TRUE"
-                             width="130" />
-                        <panel bottom_delta="-330" follows="left|top" height="325"  left="10"
-                             mouse_opaque="true" name="ContentsInventory" width="252" />
-                </panel>
-        </tab_container>
-
-<!-- Land Info sub-tab -->
-
-        <panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"
-             name="land info panel" width="272">
-                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                     bottom="-18" drop_shadow_visible="true" follows="left|top"
-                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                     mouse_opaque="true" name="label_area_price" v_pad="0" width="150">
-                        Price: L$[PRICE] for [AREA] sq. m.
-                </text>
-                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                     mouse_opaque="true" name="label_area" v_pad="0" width="128">
-                        Area: [AREA] sq. m.
-                </text>
-                <button bottom_delta="-38" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Buy Land..." label_selected="Buy Land..." left="76"
-                     mouse_opaque="true" name="button buy land" scale_image="TRUE" width="102" />
-                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Abandon Land..." label_selected="Abandon Land..."
-                     left="76" mouse_opaque="true" name="button abandon land" scale_image="TRUE"
-                     width="102" />
-                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Subdivide..." label_selected="Subdivide..." left="76"
-                     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
-                     width="102" />
-                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Join..." label_selected="Join..." left="76"
-                     mouse_opaque="true" name="button join land" scale_image="TRUE" width="102" />
-                <button bottom_delta="-40" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="About Land..." label_selected="About Land..." left="76"
-                     mouse_opaque="true" name="button about land" scale_image="TRUE" width="102" />
-        </panel>
-        <string name="status_rotate">
-                Drag colored bands to rotate object
-        </string>
-        <string name="status_scale">
-                Click and drag to stretch selected side
-        </string>
-        <string name="status_move">
-                Drag to move, shift-drag to copy
-        </string>
-        <string name="status_modifyland">
-                Click and hold to modify land
-        </string>
-        <string name="status_camera">
-                Click and drag to change view
-        </string>
-        <string name="status_grab">
-                Drag to move objects, Ctrl to lift, Ctrl-Shift to spin
-        </string>
-        <string name="status_place">
-                Click in the world to create, shift-click to select
-        </string>
-        <string name="status_selectland">
-                Click and drag to select land
-        </string>
-        <string name="grid_screen_text">
-                Screen
-        </string>
-        <string name="grid_local_text">
-                Local
-        </string>
-        <string name="grid_world_text">
-                World
-        </string>
-        <string name="grid_reference_text">
-                Reference
-        </string>
-        <string name="grid_attachment_text">
-                Attachment
-        </string>
-</floater>
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 3d56c7d..62c9537 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -69,34 +69,66 @@ class ViewerManifest(LLManifest):
 
         # Include our fonts
         if self.prefix(src="fonts"):
-            self.path("*.ttf")
+            self.path("LiberationSans-Bold.ttf")
+            self.path("LiberationSans-Regular.ttf")
+            self.path("VeraMono.ttf")
             self.path("*.txt")
             self.end_prefix("fonts")
 
-            # skins
-            if self.prefix(src="skins"):
-                    self.path("paths.xml")
-                    # include the entire textures directory recursively
-                    if self.prefix(src="*/textures"):
-                            self.path("*.tga")
-                            self.path("*.j2c")
-                            self.path("*.jpg")
-                            self.path("*.png")
-                            self.path("textures.xml")
-                            self.end_prefix("*/textures")
-                    self.path("*/xui/*/*.xml")
-                    self.path("*/*.xml")
-                    
-                    # Local HTML files (e.g. loading screen)
-                    if self.prefix(src="*/html"):
-                            self.path("*.png")
-                            self.path("*/*/*.html")
-                            self.path("*/*/*.gif")
-                            self.end_prefix("*/html")
-                    self.end_prefix("skins")
+        # skins
+        if self.prefix(src="skins"):
+            self.path("paths.xml")
+            
+            # include the entire textures directory recursively
+            if self.prefix(src="*/textures"):
+                self.path("*.tga")
+                self.path("*.j2c")
+                self.path("*.jpg")
+                self.path("*.png")
+                self.path("textures.xml")
+                self.end_prefix("*/textures")
+
+            self.path("*/xui/*/*.xml")
+            self.path("*/*.xml")
+
+            # Local HTML files (e.g. loading screen)
+            if self.prefix(src="*/html"):
+                self.path("*.png")
+                self.path("*/*/*.html")
+                self.path("*/*/*.gif")
+                self.end_prefix("*/html")
+                
+            self.end_prefix("skins")
+            
         self.path("lsl_guide.html")
         self.path("gpu_table.txt")
 
+
+    # Gather up the README file, etc.
+    def gather_documents(self):
+        # From the top level directory (imprudence)
+        if self.prefix("../../..", dst=""):
+            self.path("README.txt")
+            self.path("MANIFESTO.txt")
+            self.path("CONTRIBUTE.txt")
+            self.path("RELEASE_NOTES.txt")
+            self.path("ChangeLog.txt")
+            self.end_prefix("../../..")
+
+        # From the linden directory
+        if self.prefix("../..", dst="doc"):
+            self.path("LICENSE-source.txt")
+            self.path("LICENSE-logos.txt", "LICENSE-artwork.txt")
+            self.end_prefix("../..")
+
+        # From the linden/doc directory
+        if self.prefix("../../doc", dst="doc"):
+            self.path("contributions.txt")
+            self.path("GPL-license.txt", "GPL.txt")
+            self.path("FLOSS-exception.txt")
+            self.end_prefix("../../doc")
+
+
     def login_channel(self):
         """Channel reported for login and upgrade purposes ONLY;
         used for A/B testing"""
@@ -139,9 +171,9 @@ class WindowsManifest(ViewerManifest):
     def final_exe(self):
         if self.default_channel():
             if self.default_grid():
-                return "SecondLife.exe"
+                return "Imprudence.exe"
             else:
-                return "SecondLifePreview.exe"
+                return "ImprudencePreview.exe"
         else:
             return ''.join(self.channel().split()) + '.exe'
 
@@ -150,16 +182,22 @@ class WindowsManifest(ViewerManifest):
         super(WindowsManifest, self).construct()
         # the final exe is complicated because we're not sure where it's coming from,
         # nor do we have a fixed name for the executable
-        self.path(self.find_existing_file('debug/secondlife-bin.exe', 'release/secondlife-bin.exe', 'relwithdebinfo/secondlife-bin.exe'), dst=self.final_exe())
+        self.path(self.find_existing_file('debug/imprudence-bin.exe', 'release/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe'), dst=self.final_exe())
         # need to get the kdu dll from any of the build directories as well
-        self.path(self.find_existing_file(
+        #self.path(self.find_existing_file(
                 # *FIX:Mani we need to add support for packaging specific targets.
                 #'../llkdu/debug/llkdu.dll',
-                '../llkdu/release/llkdu.dll',
-                '../llkdu/relwithdebinfo/llkdu.dll',
-                '../../libraries/i686-win32/lib/release/llkdu.dll'), 
-                  dst='llkdu.dll')
-        self.path(src="licenses-win32.txt", dst="licenses.txt")
+                #'../llkdu/release/llkdu.dll',
+                #'../llkdu/relwithdebinfo/llkdu.dll',
+                #'../../libraries/i686-win32/lib/release/llkdu.dll'), 
+                #  dst='llkdu.dll')
+
+        self.gather_documents()
+
+        if self.prefix("../..", dst="doc"):
+            self.path("LICENSE-libraries-win32.txt")
+            self.end_prefix("../..")
+
 
         self.path("featuretable.txt")
 
@@ -167,7 +205,7 @@ class WindowsManifest(ViewerManifest):
         self.path("dbghelp.dll")
 
         # For using FMOD for sound... DJS
-        self.path("fmod.dll")
+        #self.path("fmod.dll")
 
         # For textures
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
@@ -206,18 +244,18 @@ class WindowsManifest(ViewerManifest):
             self.end_prefix()
 
         # Vivox runtimes
-        if self.prefix(src="vivox-runtime/i686-win32", dst=""):
-            self.path("SLVoice.exe")
-            self.path("SLVoiceAgent.exe")
-            self.path("libeay32.dll")
-            self.path("srtp.dll")
-            self.path("ssleay32.dll")
-            self.path("tntk.dll")
-            self.path("alut.dll")
-            self.path("vivoxsdk.dll")
-            self.path("ortp.dll")
-            self.path("wrap_oal.dll")
-            self.end_prefix()
+        #if self.prefix(src="vivox-runtime/i686-win32", dst=""):
+        #    self.path("SLVoice.exe")
+        #    self.path("SLVoiceAgent.exe")
+        #    self.path("libeay32.dll")
+        #    self.path("srtp.dll")
+        #    self.path("ssleay32.dll")
+        #    self.path("tntk.dll")
+        #    self.path("alut.dll")
+        #    self.path("vivoxsdk.dll")
+        #    self.path("ortp.dll")
+        #    self.path("wrap_oal.dll")
+        #    self.end_prefix()
 
 #        # pull in the crash logger and updater from other projects
 #        self.path(src=self.find_existing_file( # tag:"crash-logger" here as a cue to the exporter
@@ -299,36 +337,36 @@ class WindowsManifest(ViewerManifest):
         if self.default_channel():
             if self.default_grid():
                 # release viewer
-                installer_file = "Second_Life_%(version_dashes)s_Setup.exe"
+                installer_file = "Imprudence_%(version_dashes)s_Setup.exe"
                 grid_vars_template = """
                 OutFile "%(installer_file)s"
                 !define INSTFLAGS "%(flags)s"
-                !define INSTNAME   "SecondLife"
-                !define SHORTCUT   "Second Life"
-                !define URLNAME   "secondlife"
-                Caption "Second Life ${VERSION}"
+                !define INSTNAME   "Imprudence"
+                !define SHORTCUT   "Imprudence"
+                !define URLNAME   "imprudence"
+                Caption "Imprudence ${VERSION}"
                 """
             else:
                 # beta grid viewer
-                installer_file = "Second_Life_%(version_dashes)s_(%(grid_caps)s)_Setup.exe"
+                installer_file = "Imprudence_%(version_dashes)s_(%(grid_caps)s)_Setup.exe"
                 grid_vars_template = """
                 OutFile "%(installer_file)s"
                 !define INSTFLAGS "%(flags)s"
-                !define INSTNAME   "SecondLife%(grid_caps)s"
-                !define SHORTCUT   "Second Life (%(grid_caps)s)"
-                !define URLNAME   "secondlife%(grid)s"
+                !define INSTNAME   "Imprudence%(grid_caps)s"
+                !define SHORTCUT   "Imprudence (%(grid_caps)s)"
+                !define URLNAME   "imprudence%(grid)s"
                 !define UNINSTALL_SETTINGS 1
-                Caption "Second Life %(grid)s ${VERSION}"
+                Caption "Imprudence %(grid)s ${VERSION}"
                 """
         else:
             # some other channel on some grid
-            installer_file = "Second_Life_%(version_dashes)s_%(channel_oneword)s_Setup.exe"
+            installer_file = "Imprudence_%(version_dashes)s_%(channel_oneword)s_Setup.exe"
             grid_vars_template = """
             OutFile "%(installer_file)s"
             !define INSTFLAGS "%(flags)s"
-            !define INSTNAME   "SecondLife%(channel_oneword)s"
+            !define INSTNAME   "Imprudence%(channel_oneword)s"
             !define SHORTCUT   "%(channel)s"
-            !define URLNAME   "secondlife"
+            !define URLNAME   "imprudence"
             !define UNINSTALL_SETTINGS 1
             Caption "%(channel)s ${VERSION}"
             """
@@ -338,7 +376,7 @@ class WindowsManifest(ViewerManifest):
             installer_file = installer_file % substitution_strings
         substitution_strings['installer_file'] = installer_file
 
-        tempfile = "secondlife_setup_tmp.nsi"
+        tempfile = "imprudence_setup_tmp.nsi"
         # the following replaces strings in the nsi template
         # it also does python-style % substitution
         self.replace_in("installers/windows/installer_template.nsi", tempfile, {
@@ -358,7 +396,7 @@ class WindowsManifest(ViewerManifest):
 class DarwinManifest(ViewerManifest):
     def construct(self):
         # copy over the build result (this is a no-op if run within the xcode script)
-        self.path(self.args['configuration'] + "/Second Life.app", dst="")
+        self.path(self.args['configuration'] + "/Imprudence.app", dst="")
 
         if self.prefix(src="", dst="Contents"):  # everything goes in Contents
             # Expand the tar file containing the assorted mozilla bits into
@@ -384,16 +422,17 @@ class DarwinManifest(ViewerManifest):
                     self.path("*.tif")
                     self.end_prefix("cursors_mac")
 
-                self.path("licenses-mac.txt", dst="licenses.txt")
+                # From the linden directory
+                if self.prefix("../..", dst="doc"):
+                    self.path("LICENSE-libraries-mac.txt")
+                    self.end_prefix("../..")
+
+                self.gather_documents()
+
                 self.path("featuretable_mac.txt")
                 self.path("SecondLife.nib")
 
-                # If we are not using the default channel, use the 'Firstlook
-                # icon' to show that it isn't a stable release.
-                if self.default_channel() and self.default_grid():
-                    self.path("secondlife.icns")
-                else:
-                    self.path("secondlife_firstlook.icns", "secondlife.icns")
+                self.path("secondlife.icns")
                 
                 # Translations
                 self.path("English.lproj")
@@ -402,18 +441,18 @@ class DarwinManifest(ViewerManifest):
                 self.path("Korean.lproj")
 
                 # SLVoice and vivox lols
-                self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib")
-                self.path("vivox-runtime/universal-darwin/libopenal.dylib", "libopenal.dylib")
-                self.path("vivox-runtime/universal-darwin/libortp.dylib", "libortp.dylib")
-                self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib")
-                self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice")
-                self.path("vivox-runtime/universal-darwin/SLVoiceAgent.app", "SLVoiceAgent.app")
+                #self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib")
+                #self.path("vivox-runtime/universal-darwin/libopenal.dylib", "libopenal.dylib")
+                #self.path("vivox-runtime/universal-darwin/libortp.dylib", "libortp.dylib")
+                #self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib")
+                #self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice")
+                #self.path("vivox-runtime/universal-darwin/SLVoiceAgent.app", "SLVoiceAgent.app")
 
                 # llkdu dynamic library
 #                self.path("../../libraries/universal-darwin/lib_release/libllkdu.dylib", "libllkdu.dylib")
                 
                 #libfmodwrapper.dylib
-                self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib")
+                #self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib")
                 
                 # our apps
 #                self.path("../mac_crash_logger/" + self.args['configuration'] + "/mac-crash-logger.app", "mac-crash-logger.app")
@@ -437,16 +476,16 @@ class DarwinManifest(ViewerManifest):
 
 
     def package_finish(self):
-        channel_standin = 'Second Life'  # hah, our default channel is not usable on its own
+        channel_standin = 'Imprudence'  # hah, our default channel is not usable on its own
         if not self.default_channel():
             channel_standin = self.channel()
 
-        imagename="SecondLife_" + '_'.join(self.args['version'])
+        imagename="Imprudence_" + '_'.join(self.args['version'])
 
         # MBW -- If the mounted volume name changes, it breaks the .DS_Store's background image and icon positioning.
         #  If we really need differently named volumes, we'll need to create multiple DS_Store file images, or use some other trick.
 
-        volname="Second Life Installer"  # DO NOT CHANGE without understanding comment above
+        volname="Imprudence Installer"  # DO NOT CHANGE without understanding comment above
 
         if self.default_channel():
             if not self.default_grid():
@@ -473,7 +512,7 @@ class DarwinManifest(ViewerManifest):
         # Copy everything in to the mounted .dmg
 
         if self.default_channel() and not self.default_grid():
-            app_name = "Second Life " + self.args['grid']
+            app_name = "Imprudence " + self.args['grid']
         else:
             app_name = channel_standin.strip()
 
@@ -528,16 +567,23 @@ class DarwinManifest(ViewerManifest):
 class LinuxManifest(ViewerManifest):
     def construct(self):
         super(LinuxManifest, self).construct()
-        self.path("licenses-linux.txt","licenses.txt")
-        self.path("res/ll_icon.png","secondlife_icon.png")
+
+        self.path("res/imprudence_icon.png","imprudence_icon.png")
         if self.prefix("linux_tools", dst=""):
-            self.path("client-readme.txt","README-linux.txt")
-            self.path("client-readme-voice.txt","README-linux-voice.txt")
-            self.path("wrapper.sh","secondlife")
+            #self.path("client-readme.txt","README-linux.txt")
+            #self.path("client-readme-voice.txt","README-linux-voice.txt")
+            self.path("wrapper.sh","imprudence")
             self.path("handle_secondlifeprotocol.sh")
             self.path("register_secondlifeprotocol.sh")
             self.end_prefix("linux_tools")
 
+        self.gather_documents()
+
+        # From the linden directory
+        if self.prefix("../..", dst="doc"):
+            self.path("LICENSE-libraries-linux.txt")
+            self.end_prefix("../..")
+
         # Create an appropriate gridargs.dat for this package, denoting required grid.
         self.put_in_file(self.flags_list(), 'gridargs.dat')
 
@@ -553,7 +599,7 @@ class LinuxManifest(ViewerManifest):
         if 'installer_name' in self.args:
             installer_name = self.args['installer_name']
         else:
-            installer_name_components = ['SecondLife_', self.args.get('arch')]
+            installer_name_components = ['Imprudence_', self.args.get('arch')]
             installer_name_components.extend(self.args['version'])
             installer_name = "_".join(installer_name_components)
             if self.default_channel():
@@ -598,7 +644,7 @@ class LinuxManifest(ViewerManifest):
 class Linux_i686Manifest(LinuxManifest):
     def construct(self):
         super(Linux_i686Manifest, self).construct()
-        self.path("secondlife-stripped","bin/do-not-directly-run-secondlife-bin")
+        self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin")
 #        self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin")
         self.path("linux_tools/launch_url.sh","launch_url.sh")
         if self.prefix("res-sdl"):
@@ -613,7 +659,7 @@ class Linux_i686Manifest(LinuxManifest):
 
         if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"):
 #            self.path("libkdu_v42R.so")
-            self.path("libfmod-3.75.so")
+#            self.path("libfmod-3.75.so")
             self.path("libapr-1.so.0")
             self.path("libaprutil-1.so.0")
             self.path("libdb-4.2.so")
@@ -631,20 +677,20 @@ class Linux_i686Manifest(LinuxManifest):
             self.end_prefix("lib")
 
             # Vivox runtimes
-            if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
-                    self.path("SLVoice")
-                    self.end_prefix()
-            if self.prefix(src="vivox-runtime/i686-linux", dst="lib"):
-                    self.path("libopenal.so.1")
-                    self.path("libortp.so")
-                    self.path("libvivoxsdk.so")
-                    self.path("libalut.so")
-                    self.end_prefix("lib")
+            #if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
+            #        self.path("SLVoice")
+            #        self.end_prefix()
+            #if self.prefix(src="vivox-runtime/i686-linux", dst="lib"):
+            #        self.path("libopenal.so.1")
+            #        self.path("libortp.so")
+            #        self.path("libvivoxsdk.so")
+            #        self.path("libalut.so")
+            #        self.end_prefix("lib")
 
 class Linux_x86_64Manifest(LinuxManifest):
     def construct(self):
         super(Linux_x86_64Manifest, self).construct()
-        self.path("secondlife-stripped","bin/do-not-directly-run-secondlife-bin")
+        self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin")
 #        self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin")
         self.path("linux_tools/launch_url.sh","launch_url.sh")
         if self.prefix("res-sdl"):
diff --git a/linden/indra/win_updater/updater.cpp b/linden/indra/win_updater/updater.cpp
index 5ea4695..9b99f91 100644
--- a/linden/indra/win_updater/updater.cpp
+++ b/linden/indra/win_updater/updater.cpp
@@ -376,7 +376,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
         }
         else
         {
-                mbstowcs(window_title, "Second Life Updater", 2048);
+                mbstowcs(window_title, "Imprudence Updater", 2048);
         }
         
         WNDCLASSEX wndclassex = { 0 };
@@ -469,11 +469,11 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
         if (gTotalBytesRead < (1024 * 1024) && ! cancelled)
         {
                 MessageBox(gWindow,
-                        L"The Second Life auto-update has failed.\n"
+                        L"The Imprudence auto-update has failed.\n"
                         L"The problem may be caused by other software installed \n"
                         L"on your computer, such as a firewall.\n"
-                        L"Please visit http://secondlife.com/download/ \n"
-                        L"to download the latest version of Second Life.\n",
+                        L"Please visit http://imprudenceviewer.org/download/ \n"
+                        L"to download the latest version of Imprudence.\n",
                         NULL, MB_OK);
                 return 1;
         }
@@ -487,7 +487,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
         if (!success)
         {
                 MessageBox(gWindow, 
-                        L"Second Life download failed.\n"
+                        L"Imprudence download failed.\n"
                         L"Please try again later.", 
                         NULL, MB_OK);
                 return 1;
diff --git a/linden/install.xml b/linden/install.xml
index 216c854..a6270be 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -699,9 +699,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>8c1b8881285631eb32ba541e10d07b07</string>
+            <string>42cb780c595d25881b4967292a4a0f40</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llmozlib-windows-20080922.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llmozlib-windows-20080828.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -875,9 +875,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>33ceb9232a59c0399ef4d239373c3e42</string>
+            <string>8913f8ace065b14792cb0ec889a5f99a</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2-windows-20080613.tar.bz2</uri>
+            <uri>https://imprudence.s3.amazonaws.com/extras/openjpeg-1.3-windows-20081211.tar.bz2</uri>
           </map>
         </map>
       </map>
diff --git a/linden/scripts/build_version.py b/linden/scripts/build_version.py
index 4bef290..3d66a65 100755
--- a/linden/scripts/build_version.py
+++ b/linden/scripts/build_version.py
@@ -20,16 +20,16 @@ def get_version(filename):
     fp.close()
 
     vals = {}
-    m = re.search('const S32 LL_VERSION_MAJOR = (\d+);', data)
+    m = re.search('const S32 IMP_VERSION_MAJOR = (\d+);', data)
     vals['major'] = m.group(1)
-    m = re.search('const S32 LL_VERSION_MINOR = (\d+);', data)
+    m = re.search('const S32 IMP_VERSION_MINOR = (\d+);', data)
     vals['minor'] = m.group(1)
-    m = re.search('const S32 LL_VERSION_PATCH = (\d+);', data)
+    m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', data)
     vals['patch'] = m.group(1)
-    m = re.search('const S32 LL_VERSION_BUILD = (\d+);', data)
-    vals['build'] = m.group(1)
+    m = re.search('const char \* const IMP_VERSION_TEST = "(.+)";', data)
+    vals['test'] = m.group(1)
 
-    return "%(major)s.%(minor)s.%(patch)s.%(build)s" % vals
+    return "%(major)s.%(minor)s.%(patch)s-%(test)s" % vals
 
 if __name__ == '__main__':
     import sys