50 files changed, 3552 insertions, 1911 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 802009e..4e12e8d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,56 @@
+2008-12-13  Jacek Antonelli  <jacek.antonelli@gmail.com>
+        * linden/scripts/build_version.py:
+        Version string generator now includes test label.
+        This is used for naming packages on Linux, among other things.
+        * linden/indra/llcommon/llversionviewer.h:
+        Bumped version to 1.1.0 alpha.
+2008-11-24  McCabe Maxsted  <hakushakukun@gmail.com>
+        * linden/indra/newview/llfloatergroupinvite.cpp:
+        Add group name to group invite window.
+        * linden/indra/newview/llfloatergroupinvite.h:
+        Ditto.
+2008-11-23  McCabe Maxsted  <hakushakukun@gmail.com>
+        * linden/indra/newview/skins/default/xui/en-us/notify.xml:
+        VWR-4826 (ability to ignore friendship offers).
+        * linden/indra/newview/app_settings/settings.xml:
+        Beacons no longer persist between sessions.
+        That distressed users who accidentally enabled them,
+        since not even relogging would disable them.
+        * linden/indra/newview/llviewerwindow.cpp:
+        Ditto.
+        * linden/indra/newview/pipeline.cpp:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml:
+        Moved 'Offer Teleport' in IM to be on the left side.
+        * linden/indra/newview/skins/default/xui/en-us/panel_groups.xml:
+        Switched Invite and Leave buttons in group panel.
+2008-11-22  McCabe Maxsted  <hakushakukun@gmail.com>
+        * linden\indra\newview\skins\default\colors_base.xml:
+        Added full comments to default skin colors.
+        * linden\indra\newview\skins\silver\colors_base.xml:
+        Added full comments to silver skin colors.
 2008-11-22  McCabe Maxsted  <hakushakukun@gmail.com>
        * indra/newview/llcolorscheme.cpp:
@@ -17,11 +70,321 @@
        * indra/newview/skins/silver/colors_base.xml:
        Ditto.
 2008-11-21  McCabe Maxsted  <hakushakukun@gmail.com>
        * linden/indra/newview/llnetmap.cpp:
        Friends show yellow in minimap (VWR-3336).
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+=-                         1.0.0                          -=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+2008-12-12  Jacek Antonelli  <jacek.antonelli@gmail.com>
+        * Imprudence 1.0.0 finalized.
+        
+        * RELEASE_NOTES.txt:
+        Added release notes.
+        * linden/indra/newview/viewer_manifest.py:
+        Ditto.
+        * linden/indra/llcommon/llversionviewer.h:
+        Blanked the test version string. Not RC anymore.
+        * linden/install.xml:
+        Windows build uses OpenJPEG 1.3.
+        Fixes half-opaque skirts/textures issue.
+        * linden/indra/newview/viewer_manifest.py:
+        README.txt will stay that name; README-linux.txt removed.
+2008-12-11  Jacek Antonelli  <jacek.antonelli@gmail.com>
+        * linden/indra/newview/llfloaterabout.cpp:
+        Simplified release notes URL scheme.
+        Now uses e.g. "wiki/Release Notes/1.0.0-RC2",
+        which is set up as a wiki redirect.
+        * linden/indra/newview/llfloaterabout.cpp:
+        Fixed bad string comparison (rel notes url) [#28]
+        Reported by Balp Allen.
+2008-12-10  Jacek Antonelli  <jacek.antonelli@gmail.com>
+        * linden/indra/newview/llpanellogin.cpp:
+        Fix grid selector having a duplicate entry. [#24]
+        Patch by Balp Allen.
+        * linden/indra/newview/llpanellogin.h:
+        Ditto.
+        * linden/indra/newview/llstartup.cpp:
+        Ditto.
+        * linden/indra/newview/llurlhistory.cpp:
+        Better warning when url_history.xml save fails.
+        * linden/indra/newview/llviewernetwork.cpp:
+        Fixed bad string comparison (grid code name). [#22]
+        Reported by Balp Allen.
+2008-12-06  Jacek Antonelli  <jacek.antonelli@gmail.com>
+        * ChangeLog:
+        Added banners in ChangeLog to set versions apart.
+        
+        Entries should be placed in the section for the
+        version into which they were merged. Entries within
+        a section should be sorted chronologically.
+        This is important for keeping track of changes which
+        weren't merged until a later release than they were 
+        written. (Mixing them in chronologically would cause
+        confusion about which changes were included in a
+        release.)
+        * linden/indra/llmessage/llhttpclient.cpp:
+        VWR-9400b (memleak whenever an LSL script is uploaded)
+        Patch by Henri Beauchamp.
+        * linden/indra/llmessage/llhttpclient.cpp:
+        VWR-9400 (memleak whenever an LSL script is uploaded)
+        Patch by Carjay McGinnis.
+        * linden/indra/llimage/llimagetga.cpp:
+        VWR-10837 (use delete [] in LLImageTGA)
+        Patch by Aleric Inglewood.
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        VWR-10759 (use delete [] in LLMediaImplGStreamer)
+        Patch by Aleric Inglewood.
+2008-12-06  McCabe Maxsted  <hakushakukun@gmail.com>
+        * linden/indra/llcommon/llversionviewer.h:
+        Added test version info.
+        * linden/indra/newview/llfloaterabout.cpp:
+        Ditto.
+        * linden/indra/newview/llappviewer.cpp:
+        Ditto.
+        * linden/indra/newview/llpanellogin.cpp:
+        Ditto.
+2008-12-05  McCabe Maxsted  <hakushakukun@gmail.com>
+        * linden/indra/llcommon/llsecondlifeurls.cpp:
+        Changed Release Notes link to point to Imprudence.
+        * linden/indra/newview/llfloaterabout.cpp:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/menu_login.xml:
+        Rebranded login menu. [#23]
+        * linden/indra/newview/llurlhistory.cpp:
+        Fixed blank url_history.xml creation. (VWR-5808)
+2008-12-01  Jacek Antonelli  <jacek.antonelli@gmail.com>
+        * linden/indra/newview/viewer_manifest.py:
+        Fixed indentation for 'skins' prefix.
+        * linden/indra/newview/viewer_manifest.py:
+        Doc packaging moved to platform-independent manifest.
+        * Imported license files for libraries and artwork.
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+=-                       1.0.0 RC2                        -=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+2008-12-04  Jacek Antonelli  <jacek.antonelli@gmail.com>
+        * Imprudence 1.0.0 RC2 released.
+        * linden/indra/newview/llviewernetwork.cpp:
+        Use 127.0.0.1 for local opensim, not 0.0.0.0.
+2008-11-30  Jacek Antonelli  <jacek.antonelli@gmail.com>
+        * linden/indra/newview/viewer_manifest.py:
+        Package up README.txt, etc. on Linux.
+        * linden/indra/llmedia/llmediamanager.cpp:
+        Disable llmozlib-dependent code when not available.
+        Patch by Stephen Zenith. [#12]
+        * linden/indra/llwindow/llwindowsdl.cpp:
+        Fixed passing nonliteral strings to *printf functions.
+        gcc 4.3 rejects that as being unsafe.
+        Patch by Stephen Zenith. [#11]
+        * linden/indra/linux_crash_logger/llcrashloggerlinux.cpp:
+        Ditto.
+        * linden/indra/lscript/lscript_compile/lscript_tree.cpp: 
+        Ditto.
+2008-11-29  Jacek Antonelli  <jacek.antonelli@gmail.com>
+        * linden/indra/newview/llpanellogin.cpp:
+        Remove preprocessor condition for grid selector.
+        The grid selector on the login screen will always show,
+        instead of only showing when the viewer was compiled
+        as LL_RELEASE_FOR_DOWNLOAD.
+        * linden/indra/newview/llappviewer.cpp:
+        Stop console window from always showing up.
+2008-11-29  McCabe Maxsted  <hakushakukun@gmail.com>
+        * linden/indra/newview/llfloaterdirectory.cpp:
+        Fixed search window not refreshing in RelWithDebInfo builds.
+2008-11-25  Jacek Antonelli  <jacek.antonelli@gmail.com>
+        * linden/indra/newview/llstartup.cpp:
+        Rearranged grid selectors so main grid is first.
+        * linden/indra/newview/llviewernetwork.cpp:
+        Ditto.
+        * linden/indra/newview/llviewernetwork.cpp:
+        Ditto.
+        * linden/indra/newview/llpanellogin.cpp:
+        Added "code name" field for grid selections.
+        The code name is used to fetch the proper splash page.
+        This decouples the user-visible label from the name
+        expected by the SL web server.
+        * linden/indra/newview/llviewernetwork.cpp:
+        Ditto.
+        * linden/indra/newview/llviewernetwork.h:
+        Ditto.
+2008-11-24  Jacek Antonelli  <jacek.antonelli@gmail.com>
+        * linden/indra/newview/llpanellogin.cpp: 
+        Changed the grid selector options at login.
+        Renamed "Agni" to "SL Main Grid", etc. and removed private
+        LL grids from the list. Also added "Local OpenSim" option.
+        * linden/indra/newview/llviewernetwork.cpp: 
+        Ditto.
+        * linden/indra/newview/llviewernetwork.h: 
+        Ditto.
+2008-11-21  Jacek Antonelli  <jacek.antonelli@gmail.com>
+        * linden/indra/newview/lldrawable.cpp:
+        Likely fix for VWR-8920 (disappearing attachments).
+        From http://svn.secondlife.com/trac/linden/changeset/1393
+2008-11-19  McCabe Maxsted  <hakushakukun@gmail.com>
+        * linden/install.xml:
+        Fixed inworld browser crash in Windows.
+2008-11-18  Jacek Antonelli  <jacek.antonelli@gmail.com>
+        * linden/indra/llcrashlogger/llcrashlogger.cpp: 
+        Changed to Imprudence.exec_marker to match llappviewer.cpp.
+        * linden/indra/llcrashlogger/llcrashlogger.cpp: 
+        Changed app dir (for cache, etc.) to Imprudence.
+        * linden/indra/llvfs/lldir.cpp: 
+        Ditto.
+        * linden/indra/llvfs/lldir_mac.cpp: 
+        Ditto.
+        * linden/indra/newview/llappviewer.cpp: 
+        Ditto.
+2008-11-18  McCabe Maxsted  <hakushakukun@gmail.com>
+        * linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml:
+        VWR-9007: Group UI uses "Person" instead of "Resident".
+        * linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml:
+        Ditto.
+2008-11-18  Jacek Antonelli  <jacek.antonelli@gmail.com>
+        * linden/indra/llrender/llrender.h:
+        Fix VWR-9507: bad typedef breaks build on gcc 4.3.
+        Suggested by Alissa Sabre.
+        * linden/indra/llrender/llgl.cpp:
+        Likely fix for VWR-9358 (palletized textures).
+        Suggested by Angus Boyd.
+2008-11-16  Jacek Antonelli  <jacek.antonelli@gmail.com>
+        * linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml:
+        Removed floater_tools.xml from silver skin.
+        It was out of sync with the default version, and the only
+        changes that LL had made to it were tiny tweaks to button size
+        and position. It will now correctly inherit from default skin.
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+=-                       1.0.0 RC1                        -=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+2008-11-15  Jacek Antonelli  <jacek.antonelli@gmail.com>
+        * Imprudence 1.0.0 RC1 released.
+2008-11-05  Jacek Antonelli  <jacek.antonelli@gmail.com>
+        * linden/indra/newview/viewer_manifest.py:
+        Remove reference to nonexistent First Look Mac icon.
+2008-11-04  Jacek Antonelli  <jacek.antonelli@gmail.com>
+        * linden/indra/mac_crash_logger/CMakeLists.txt: 
+        Fix Mac crash logger & updater missing Info.plist.
+        Suggested by Aimee Trescothick (Aimee Walton).
+        * linden/indra/mac_updater/CMakeLists.txt: 
+        Ditto.
 2008-11-02  Jacek Antonelli  <jacek.antonelli@gmail.com>
        * linden/scripts/build_version.py: 
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
new file mode 100644
index 0000000..9f39144
--- /dev/null
+++ b/RELEASE_NOTES.txt
@@ -0,0 +1,294 @@
+  Release Notes for the Imprudence Viewer
+  http://imprudenceviewer.org
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  =-                         1.0.0                          -=
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+   KNOWN ISSUES
+     * Still no sound or voice yet.
+     * Login screen misleadingly displays the last grid you had
+       selected even if you use the --loginuri command line option
+       (IMP-29).
+     * The menus for non-English languages still say "Second Life" in
+       some places where they should say "Imprudence" (IMP-27).
+   CHANGES
+     This version of Imprudence includes the following changes (as
+     compared to Imprudence 1.0.0 RC2):
+     * Rendering: Windows version ships with OpenJPEG 1.3. This fixes
+       the issue of skirts and some uploaded images appearing
+       half-transparent. Thanks to McCabe and everyone who helped us
+       identify and test that!
+     * UI: Added support for displaying a test version identifier
+       (e.g. RC2) at the login screen and About Imprudence, to help
+       people tell the test versions apart. (Note: you won't see it in
+       this release, because this isn't a test version!) Thanks to
+       McCabe for adding that!
+     * UI: Rebranded the Help menu at the login screen to match the
+       main Help menu (IMP-23). Thanks to Balp Allen for reporting
+       that, and McCabe for fixing it!
+     * UI: The "Release Notes" link in About Imprudence now takes you
+       to the release notes on the Imprudence wiki, instead of to a
+       bogus page on the Second Life wiki. Thanks to McCabe and Jacek
+       for doing that!
+     * UI: Grid selector at the login screen no longer has a duplicate
+       entry (IMP-24). Thanks to Balp Allen for fixing that!
+     * Misc.: Fixed the viewer stupidly creating a 'url_history.xml'
+       file in 'C:\' on Windows, and perhaps in '/' (root) on Mac
+       (VWR-5808). Thanks to McCabe for fixing that!
+     * Code: Patched two small memory leaks when uploading scripts
+       (VWR-9400). Thanks to Carjay McGinnis and Henri Beauchamp for
+       making those patches!
+     * Code: Patched two minor code cleanliness issues (VWR-10759,
+       VWR-10837). Thanks to Aleric Inglewood for making those
+       patches!
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  =-                       1.0.0 RC2                        -=
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+   KNOWN ISSUES
+     * Some users have reported that system skirts (not attachments)
+       and some uploaded images with alpha channels appear
+       partially transparent all over, instead of being opaque
+       in some places and transparent in others. You can fix this by
+       upgrading to OpenJPEG 1.3. Future Imprudence releases will
+       have the new OpenJPEG included in the regular download.
+     * The grid selection list on the login screen displays a
+       duplicate entry (e.g. two "SL Main Grid" entries). This is
+       harmless, and a PITA to fix.
+     * Still no sound or voice yet.
+   CHANGES
+     This version of Imprudence includes the following changes (as
+     compared to Imprudence 1.0.0 RC1):
+     * Rendering: Applied a likely fix for VWR-8920 (disappearing
+       attachments when zoomed in). Please let us know in the forums
+       whether this fixes the issue for you. Thanks to an unknown
+       Linden for the fix, and to Strife Onizuka for pointing to it!
+     * Rendering: Applied a likely fix for VWR-9358 (problems with
+       palletized textures). Please
+       [http://imprudenceviewer.org/forums/viewtopic.php?f=6&t=66 let
+       us know in the forums] whether this fixes the issue for you.
+       Thanks to Angus Boyd for suggesting the fix!
+     * Misc UI.: Grid selection list on the login page has been
+       embraced and cleaned up. It now lists 3 options: SL Main Grid,
+       SL Beta Grid, and Local OpenSim (if you run OpenSim on your
+       computer). It will be made customizable in a future version.
+       Thanks to Jacek for sprucing that up!
+     * Misc: Fixed the debug console window always showing up. Thanks
+       to McCabe for fixing it, and to an unknown Linden's testing
+       code for causing it in the first place!
+     * Misc: Fixed the Windows viewer crashing when clicking on
+       certain links in embedded web pages (VWR-4828). Thanks
+       to Nyx Linden for pointing to the updated LLMozLib!
+     * Misc: Fixed the Windows installer giving an error when
+       launching the viewer after installation. Thanks to McCabe for
+       fixing that!
+     * Misc: Imprudence now uses a separate directory from Second Life
+       for storing the cache, settings, and chat logs. This fixes the
+       viewer clearing the cache the first time it's run. On Linux,
+       it's the '.imprudence' directory in your home directory, and on
+       Mac and Windows it's the 'Imprudence' directory in your
+       Application Data directory. Thanks to Jacek for doing this!
+     * Misc: Fixed the Search window clearing itself out when closed
+       and re-opened. Thanks to Samantha Poindexter for reporting the
+       problem, to McCabe for fixing it, and to an unknown Linden's
+       testing code for causing it in the first place!
+     * Building: Fixed the Silver skin's Build floater not matching
+       the one from the Classic skin. Thanks to Damien Fate for
+       reporting the problem, and to Jacek for fixing it!
+     * Code: Fixed several bits of sloppy Linden code that blocked
+       compiling with gcc 4.3. Thanks to Alissa Sabre for suggesting
+       the fix to VWR-9507, and Stephen Zenith for patches
+       IMP-11 and IMP-12!
+     * Misc UI.: Changed Group UI to use "Resident" or "Member"
+       instead of "Person", for consistency (VWR-9007).
+       Thanks to McCabe for sprucing that up!
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  =-                       1.0.0 RC1                        -=
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+   WHAT TO EXPECT
+    * Many small usability improvements.
+      The goal of Imprudence is to make significant usability
+      improvements over the standard SL viewer, but for this first
+      release our focus has simply been to get the project
+      established. You'll find many small improvements scattered
+      throughout the viewer, almost all of them programmed by SL
+      Residents and submitted as patches to JIRA, but which LL has not
+      (at least yet) accepted. Future versions of Imprudence will
+      feature more significant improvements made specifically for this
+      project.
+    * New fonts.
+      Imprudence uses different fonts than regular SL, because SL's
+      fonts are proprietary and very expensive to license. The new
+      fonts might make things seem "not quite right" at first, since
+      your eye expects the old font you normally see in SL. We do
+      think you'll enjoy the new fonts once you get used to them. (For
+      the curious, the fonts used are Liberation Sans for the UI, and
+      Bitstream Vera Mono for the script editor.)
+    * No sound or voice.
+      This release of Imprudence doesn't have any sound or voice
+      support, because the software libraries SL uses for those things
+      are proprietary and can't be used with open-source viewers. We
+      hope to add back sound support using OpenAL for the next version
+      of Imprudence. We're not sure yet when we'll be able to add
+      voice back in.
+    * Slightly slower texture loading.
+      Textures may load slightly slower than they do in regular SL.
+      Once again, this is because the texture software library SL uses
+      by default (Kakadu / KDU) is proprietary, so we're using
+      OpenJPEG, which is open source but not quite as speedy. The
+      difference shouldn't be a major issue.
+  CHANGES
+    This version of Imprudence includes the following changes (as
+    compared to Second Life viewer 1.21.6):
+    * Building: You can now "Slice" (aka. Dimple / Profile Cut) the
+      Box, Cylinder, and Prism prim types directly, without needing to
+      switch to Sphere and back. (VWR-7827; thanks McCabe Maxsted!)
+    * Stability: Several patches by Nicholaz Beresford to fix memory
+      leaks and improve stability. (VWR-2003, VWR-2683, VWR-2685,
+      VWR-3877, and VWR-3878; thanks Nicholaz!)
+    * Misc.: The "Advanced" menu is now written in XUI, so you can
+      edit shortcuts in that menu by editing the XML file, instead of
+      needing to recompile the viewer from source. (Note: The file to
+      edit is skins/default/xui/en-us/menu_viewer.xml) (VWR-2896;
+      thanks Jacek Antonelli!)
+    * Social: Added "Invite..." button to the Groups section of the
+      Communicate panel, to make it easier to invite people to the
+      selected group. (VWR-8024; thanks McCabe Maxsted!)
+    * Building: Up and down arrows change Path Cut / Profile Cut by
+      increments of 0.025 instead of 0.05, to make it easier to
+      path-cut boxes in half, etc. (VWR-7877; thanks McCabe Maxsted!)
+    * Misc. UI: Added "Return Object" to the Tools menu, to make it
+      easier to return objects that are hard to right-click on.
+      (VWR-1363; thanks McCabe Maxsted!)
+    * Social: Added "Offer Teleport" button to the IM window.
+      (VWR-2072; thanks Paul Churchill!)
+    * Building: Added "Tools > Set permissions on selected task
+      inventory" menu item, to set perms on multiple in-world objects
+      and/or their contents. This will have a nicer UI later.
+      (VWR-5082; thanks Michelle2 Zenovka!)
+    * Misc. UI: Several usability and UI layout improvements to the
+      land tools floater. (VWR-8430; thanks Aimee Trescothick!)
+    * Misc. UI: Added "Flycam" button that appears when you are in
+      flycam mode (using a joystick or SpaceNavigator); click it to
+      cancel flycam mode. (VWR-8341; thanks Aimee Trescothick!)
+    * Building: Rephrased "Select Texture" to the more accurate and
+      descriptive phrase "Select Faces to Texture". (Inspired by
+      VWR-5962; thanks McCabe Maxsted and Jacek Antonelli!)
+    * Building: Increased maximum settable transparency from 90% to
+      100% in the Textures tab. (Thanks Jacek Antonelli!)
+    * Social: "Offer Teleport" buttons throughough the UI are now
+      always clickable, even for avatars who are not on your friends
+      list or who appear offline. (Thanks Jacek Antonelli!)
+    * Misc.: Changed the application name, logo, login page, etc. to
+      Imprudence.
+    * Misc.: Imprudence has its own version numbers, starting at
+      1.0.0. Use "Help > About Imprudence" to check the SL source
+      version it's based on.
+    * Misc.: Disabled FMOD, KDU, and Vivox (SLVoice) proprietary
+      software.
+    * Misc.: Changed fonts to Liberation Sans and Bitstream Vera Mono.
+   KNOWN ISSUES
+    * Windows: At the end of the installer, if you leave the "Launch
+      Imprudence Viewer" checkbox enabled and press "Finish", you will
+      receive an error message and it will not automatically start the
+      viewer. But this does not harm anything, and starting the viewer
+      yourself (e.g. from the desktop shortcut) should work fine.
+    * Windows: When the viewer is started, a text console window will
+      appear displaying debug information, and then be covered by the
+      main viewer window. This will be disabled in future releases.
+      You can disable it manually by opening "Advanced > Debug
+      Settings" and changing "ShowConsoleWindow" to false, then
+      restarting the viewer.
+    * Windows: The viewer may crash when clicking links in embedded
+      web pages, including certain sections of the Search window and
+      the "Web" section of avatar profiles. We hope to fix this in the
+      future. To work around it for now, just avoid clicking on links
+      in embedded web pages in the viewer.
+    * All Platforms: The viewer may be (very) slow to start the first
+      time, as it clears the cache.
+    * All Platforms: When using the Silver skin, the Tools (aka Build)
+      floater doesn't have the new features (e.g. transparency up to
+      100%, smaller path cut increment), and improperly displays the
+      land tools brush size combo box on every build tab.
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/indra/linux_crash_logger/llcrashloggerlinux.cpp b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
index 6ac9831..c4294d6 100644
--- a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
+++ b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
@@ -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 bc42359..4032c5b 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -43,7 +43,8 @@ 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 = 0;
+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 b9a182c..af30136 100755
--- a/linden/indra/llcrashlogger/llcrashlogger.cpp
+++ b/linden/indra/llcrashlogger/llcrashlogger.cpp
@@ -327,9 +327,9 @@ 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)
+        // 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 "
@@ -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/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;
+                                std::vector<char> fileBuffer(fileSize);
-                                fileBuffer = new char [fileSize];
+                                fstream.read(&fileBuffer[0], fileSize);
-                                fstream.read(fileBuffer, fileSize);
+                                ostream.write(&fileBuffer[0], fileSize);
-                                ostream.write(fileBuffer, 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;
+                        std::vector<U8> fileBuffer(fileSize);
-                        fileBuffer = new U8 [fileSize];
+                        vfile.read(&fileBuffer[0], fileSize);
-            vfile.read(fileBuffer, fileSize);
+                        ostream.write((char*)&fileBuffer[0], fileSize);
-            ostream.write((char*)fileBuffer, 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 c088dd8..f0acee5 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -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/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 1d2da46..1f0f240 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -664,12 +664,12 @@
        <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>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 5fd5575..14214b5 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -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,11 +602,12 @@ bool LLAppViewer::init()
    writeSystemInfo();
        // Build a string representing the current version number.
-    gCurrentVersion = llformat("%s %d.%d.%d / %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_PATCH,
+                IMP_VERSION_TEST,
        LL_VIEWER_NAME,
        LL_VERSION_MAJOR, 
        LL_VERSION_MINOR, 
@@ -1604,11 +1605,6 @@ bool LLAppViewer::initConfiguration()
        gSavedSettings.setString("VersionChannelName", IMP_VIEWER_NAME);
-#ifndef LL_RELEASE_FOR_DOWNLOAD
-        gSavedSettings.setBOOL("ShowConsoleWindow", TRUE);
-        gSavedSettings.setBOOL("AllowMultipleViewers", TRUE);
-#endif
 #if !LL_DYNAMIC_FONT_DISCOVERY
        // static font discovery - user settings can override.
        gSavedSettings.setString("FontSansSerifFallback",
@@ -2252,6 +2248,7 @@ void LLAppViewer::writeSystemInfo()
        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;
@@ -2335,6 +2332,7 @@ void LLAppViewer::handleViewerCrash()
        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;
@@ -2688,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);
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/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 4704c5b..af436c5 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -110,9 +110,9 @@ LLFloaterAbout::LLFloaterAbout()
        // Version string
        std::string version = llformat(
-          "%s %d.%d.%d / %s %d.%d.%d (%d), %s %s\n",
+          "%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_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__);
@@ -262,17 +262,16 @@ void LLFloaterAbout::show(void*)
 static std::string get_viewer_release_notes_url()
 {
        std::ostringstream version;
-        version << LL_VERSION_MAJOR << "."
+        version << IMP_VERSION_MAJOR << "."
-                << LL_VERSION_MINOR << "."
+                << IMP_VERSION_MINOR << "."
-                << LL_VERSION_PATCH << "."
+                << IMP_VERSION_PATCH;
-                << LL_VERSION_BUILD;
-        LLSD query;
+        // Append the test version if it's not empty
-        query["channel"] = gSavedSettings.getString("VersionChannelName");
+        if( strcmp(IMP_VERSION_TEST, "") != 0 )
-        query["version"] = version.str();
+                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/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/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 61bf215..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)
        {
@@ -420,10 +360,11 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
        // childSetAction("quit_btn", onClickQuit, this);
        std::string imp_channel = gSavedSettings.getString("VersionChannelName");
-        std::string imp_version = llformat("%d.%d.%d",
+        std::string imp_version = llformat("%d.%d.%d %s",
                IMP_VERSION_MAJOR,
                IMP_VERSION_MINOR,
-                IMP_VERSION_PATCH );
+                IMP_VERSION_PATCH,
+                IMP_VERSION_TEST );
        std::string ll_channel = LL_VIEWER_NAME;
        std::string ll_version = llformat("%d.%d.%d (%d)",
@@ -771,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)
@@ -849,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
 }
@@ -937,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/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;
+        LL_INFOS("AppInit") << "getGridChoice is " << LLViewerLogin::getInstance()->getGridChoice() << LL_ENDL;
-        LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel(), LLViewerLogin::getInstance()->getGridChoice());
        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/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();
+        std::string temp_str = gDirUtilp->getLindenUserDir();
-        llofstream out((temp_str + filename));
+        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/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", "", "", ""},
+        { "None", "", "", "", "" },
-        { "Aditi", 
+        { "SL Main Grid",
-          "util.aditi.lindenlab.com", 
+          "Agni",
-          "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
-          "http://aditi-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Agni", 
          "util.agni.lindenlab.com", 
          "https://login.agni.lindenlab.com/cgi-bin/login.cgi",
          "https://secondlife.com/helpers/" },
-        { "Aruna",
+        { "SL Beta Grid",
-          "util.aruna.lindenlab.com",
+          "Aditi",
-          "https://login.aruna.lindenlab.com/cgi-bin/login.cgi",
+          "util.aditi.lindenlab.com",
-          "http://aruna-secondlife.webdev.lindenlab.com/helpers/" },
+          "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
-        { "Damballah",
+          "http://aditi-secondlife.webdev.lindenlab.com/helpers/" },
-          "util.damballah.lindenlab.com",
+        { "Local OpenSim",
-          "https://login.damballah.lindenlab.com/cgi-bin/login.cgi",
+          "",
-          "http://damballah-secondlife.webdev.lindenlab.com/helpers/" },
+          "localhost",
-        { "Durga",
+          "http://127.0.0.1:9000",
-          "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",
          "" },
-        { "Other", 
+        { "Other", "", "", "", "" }
-          "", 
-          "https://login.dmz.lindenlab.com/cgi-bin/login.cgi",
-          "" }
 };
 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())
+        if(!grid_name.empty())
-    {
+        {
-        // find the grid choice from the user setting.
+                // find the grid choice from the user setting.
-        int grid_index = GRID_INFO_NONE; 
+                int grid_index = GRID_INFO_NONE; 
-        for(;grid_index < GRID_INFO_OTHER; ++grid_index)
+                for(;grid_index < GRID_INFO_OTHER; ++grid_index)
-        {
+                {
-            if(0 == LLStringUtil::compareInsensitive(gGridInfo[grid_index].mLabel, grid_name))
+                        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)
+                if(GRID_INFO_OTHER == grid_index)
-        {
+                {
-            // *FIX:MEP Can and should we validate that this is an IP address?
+                        // *FIX:MEP Can and should we validate that this is an IP address?
-            mGridChoice = GRID_INFO_OTHER;
+                        mGridChoice = GRID_INFO_OTHER;
-            mGridName = grid_name;
+                        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_ADITI,
-        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_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/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/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/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index a3e8d62..ff3d53e 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -1,148 +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 -->
+<TitleBarFocusColor value="255, 255, 255, 30" />        <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
-<FloaterFocusBorderColor value="0, 0, 0, 80" />
+<FloaterFocusBorderColor value="0, 0, 0, 80" />         <!-- Focused window border color -->
-<FloaterUnfocusBorderColor value="0, 0, 0, 80" />
+<FloaterUnfocusBorderColor value="0, 0, 0, 80" />       <!-- Unfocused window border color -->
-<FocusBackgroundColor value="62, 62, 62, 255" />        <!-- Background color of focused floaters -->
+<FocusBackgroundColor value="62, 62, 62, 255" />        <!-- Background color of focused windows -->
-<DefaultBackgroundColor value="62, 62, 62, 140" />      <!-- Background color for unfocused floaters -->
+<DefaultBackgroundColor value="62, 62, 62, 140" />      <!-- Background color for unfocused windows -->
-<ColorDropShadow value="0, 0, 0, 200" />                <!-- The drop shadow behind windows and menus -->
+<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" />
+<DefaultHighlightLight value="115, 132, 155, 255" />    <!-- Unfocused border, bottom portion -->
-<DefaultShadowDark value="26, 26, 26, 255" />
+<DefaultShadowDark value="26, 26, 26, 255" />           <!-- Unfocused border, top portion -->
-<DefaultShadowLight value="0, 0, 0, 255" />
+<DefaultShadowLight value="0, 0, 0, 255" />             <!-- Tab area border for IMs -->
+ 
-<!-- LABELS -->
+<!-- WINDOW LABELS -->
-<LabelDisabledColor value="147, 169, 213, 77" />
+<LabelDisabledColor value="147, 169, 213, 77" />            <!-- Color for unfocused window titles -->
-<LabelSelectedColor value="255, 255, 255, 255" />
+<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" />
+<LoginProgressBarBgColor value="255, 255, 255, 255" />      <!-- Login progress bar background -->
-<LoginProgressBarFgColor value="255, 255, 255, 255" />
+<LoginProgressBarFgColor value="255, 255, 255, 255" />      <!-- Login progress bar -->
-<LoginProgressBoxBorderColor value="0, 30, 60, 0" />
+<LoginProgressBoxBorderColor value="0, 30, 60, 0" />        <!-- Login progress box border -->
-<LoginProgressBoxCenterColor value="0, 0, 0, 200" />
+<LoginProgressBoxCenterColor value="0, 0, 0, 200" />        <!-- Login progress box background -->
-<LoginProgressBoxShadowColor value="0, 0, 0, 200" />
+<LoginProgressBoxShadowColor value="0, 0, 0, 200" />        <!-- Login progress box shadow -->
-<LoginProgressBoxTextColor value="255, 255, 255, 255"/>
+<LoginProgressBoxTextColor value="255, 255, 255, 255"/>     <!-- Login progress text -->
+ 
 <!-- BUTTONS -->
-<ButtonLabelColor value="220, 220, 220, 255" />         <!-- Text labels for buttons, like the "OK" text -->
+<ButtonLabelColor value="220, 220, 220, 255" />                 <!-- Label text color for buttons, like the "OK" text -->
-<ButtonLabelSelectedColor value="220, 220, 220, 255" />
+<ButtonLabelSelectedColor value="220, 220, 220, 255" />         <!-- Label text color when button selected -->
-<ButtonLabelDisabledColor value="147, 169, 213, 200" />
+<ButtonLabelDisabledColor value="147, 169, 213, 200" />         <!-- Label text color when button disabled -->
-<ButtonLabelSelectedDisabledColor value="164, 190, 237, 200" />
+<ButtonLabelSelectedDisabledColor value="164, 190, 237, 200" /> <!-- Label text color when button disabled but selected -->
-<ButtonSelectedBgColor value="62, 62, 62, 255" />
+<ButtonSelectedBgColor value="62, 62, 62, 255" />           <!-- Not used -->
-<ButtonSelectedColor value="255, 255, 255, 255" />
+<ButtonSelectedColor value="255, 255, 255, 255" />          <!-- Not used -->
-<ButtonUnselectedBgColor value="62, 62, 62, 255" />
+<ButtonUnselectedBgColor value="62, 62, 62, 255" />         <!-- Not used -->
-<ButtonUnselectedFgColor value="255, 255, 255, 255" />
+<ButtonUnselectedFgColor value="255, 255, 255, 255" />      <!-- Not used -->
-<ButtonBorderColor value="239, 156, 0, 255" />
+<ButtonBorderColor value="239, 156, 0, 255" />              <!-- Not used -->
-<ButtonFlashBgColor value="255, 190, 62, 127" />
+<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 -->
+<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 -->
+<ButtonImageColor value="255, 255, 255, 255" />             <!-- Button color override (also checkboxes and scroll arrows).
+                                                                 Blended with button art, usually left as opaque white -->
-<!-- SLIDERS -->
+ 
-<SliderDisabledThumbColor value="0, 0, 0, 255" />
+<!-- SLIDERS, single line -->
-<SliderThumbCenterColor value="200, 200, 200, 255" />
+<SliderDisabledThumbColor value="0, 0, 0, 255" />           <!-- Not used -->
-<SliderThumbOutlineColor value="255, 255, 255, 255" />
+<SliderThumbCenterColor value="200, 200, 200, 255" />       <!-- Unfocused slider thumb color -->
-<SliderTrackColor value="255, 255, 255, 255" />
+<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) -->
+<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 -->
+<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) -->
+<TextBgWriteableColor value="200, 209, 204, 230" />         <!-- Text field background when not receiving input (unfocused) -->
-<TextCursorColor value="0, 0, 0, 255" />
+<TextCursorColor value="0, 0, 0, 255" />                    <!-- Cursor color in notecards and scripts only -->
-<TextFgColor value="0, 0, 0, 255" />
+<TextFgColor value="0, 0, 0, 255" />                         <!-- Text color for all text entry fields; cursor color for line editors -->
-<TextFgReadOnlyColor value="255, 255, 255, 200" />
+<TextFgReadOnlyColor value="255, 255, 255, 200" />          <!-- Text color in read-only fields -->
-<TextFgTentativeColor value="0, 0, 0, 128" />
+<TextFgTentativeColor value="0, 0, 0, 128" />               <!-- Initial entry in text entry fields, e.g. "Click here to chat." -->
-<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" />     <!-- i.e. About Land name that you don't own -->
+<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- Text of read-only items embedded in notecards -->
-<TextEmbeddedItemColor value="0, 0, 128, 255" />
+<TextEmbeddedItemColor value="0, 0, 128, 255" />            <!-- Text of items embedded in notecards -->
-<TextDefaultColor value="0, 20, 0, 255"/>
+<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" />
+<ScrollBgReadOnlyColor value="200, 209, 204, 255" />    <!-- Background of read only lists -->
-<ScrollBgWriteableColor value="200, 209, 204, 255" />
+<ScrollBgWriteableColor value="200, 209, 204, 255" />   <!-- Background of editable lists, e.g. groups-->
-<ScrollBGStripeColor value="100, 100, 100, 40" />
+<ScrollBGStripeColor value="100, 100, 100, 40" />       <!-- Background stripes in sortable lists, e.g. Events Search -->
-<ScrollDisabledColor value="128, 128, 128, 204" />
+<ScrollDisabledColor value="128, 128, 128, 204" />      
-<ScrollSelectedBGColor value="100, 100, 188, 150" />
+<ScrollSelectedBGColor value="100, 100, 188, 150" />    <!-- Selected item in a list highlight -->
-<ScrollSelectedFGColor value="0, 0, 0, 204" />              <!-- Text color -->
+<ScrollSelectedFGColor value="0, 0, 0, 204" />          <!-- Text color -->
-<ScrollUnselectedColor value="0, 0, 0, 204" />              <!-- Text color -->
+<ScrollUnselectedColor value="0, 0, 0, 204" />          <!-- Text color -->
-<ScrollHighlightedColor value="183, 184, 188, 128" />       <!-- Hover color -->
+<ScrollHighlightedColor value="183, 184, 188, 128" />   <!-- Hover color -->
-<ScrollbarThumbColor value="60, 76, 124, 255" />            <!-- Scroll bar-->
+<ScrollbarThumbColor value="60, 76, 124, 255" />        <!-- Scroll bar -->
-<ScrollbarTrackColor value="153, 154, 158, 255" />          <!-- Scroll bar background-->
+<ScrollbarTrackColor value="153, 154, 158, 255" />      <!-- Scroll bar background -->
+ 
 <!-- MENUS -->
-<MenuBarBgColor value="62, 62, 62, 255" />
+<MenuBarBgColor value="62, 62, 62, 255" />                  <!-- Menu bar background -->
-<MenuBarGodBgColor value="62, 128, 62, 255" />
+<MenuBarGodBgColor value="62, 128, 62, 255" />              <!-- Menu bar background with God Mode enabled -->
-<MenuNonProductionGodBgColor value="0, 128, 0, 255" />
+<MenuNonProductionGodBgColor value="0, 128, 0, 255" />      <!-- Beta viewer menu bar background -->
-<MenuNonProductionBgColor value="128, 0, 0, 255" />
+<MenuNonProductionBgColor value="128, 0, 0, 255" />         <!-- Beta viewer menu bar background with God Mode enabled -->
-<MenuDefaultBgColor value="0, 0, 0, 255" />
+<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" />
+<MenuItemHighlightBgColor value="183, 184, 188, 100" />     <!-- Highlighted menu item background color -->
-<MenuItemHighlightFgColor value="255, 255, 255, 255" />     <!-- Highlighted menu text color; also treeview node selection highlight -->
+<MenuItemHighlightFgColor value="255, 255, 255, 255" />     <!-- Highlighted menu item text color; also treeview node selection highlight -->
-<MenuPopupBgColor value="0, 0, 0, 255" />
+<MenuPopupBgColor value="0, 0, 0, 255" />                   <!-- Right-click menu background -->
+ 
 <!--  PIE MENUS -->
-<PieMenuBgColor value="62, 62, 62, 150" />
+<PieMenuBgColor value="62, 62, 62, 150" />              <!-- Color of pie menu -->
-<PieMenuLineColor value="0, 0, 0, 128" />
+<PieMenuLineColor value="0, 0, 0, 128" />               <!-- Color of pie menu slice separators -->
-<PieMenuSelectedColor value="183, 184, 188, 77" />
+<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" />
+<ToolTipBgColor value="183, 184, 188, 200" />           <!-- Tool tips, i.e. "Hover Tips" -->
-<ToolTipBorderColor value="171, 212, 245, 255" />
+<ToolTipBorderColor value="171, 212, 245, 255" />       <!-- Not used -->
-<ToolTipTextColor value="0, 0, 0, 255" />
+<ToolTipTextColor value="0, 0, 0, 255" />               <!-- Tool tips text color -->
+ 
 <!-- NOTIFICATION POP-UPS -->
-<NotifyBoxColor value="70, 170, 255, 255" />
+<NotifyBoxColor value="70, 170, 255, 255" />            <!-- Notification background, i.e. tp requests -->
-<NotifyTextColor value="0, 0, 0, 255" />
+<NotifyTextColor value="0, 0, 0, 255" />                <!-- Notification text -->
-<NotifyCautionBoxColor value="254, 209, 118, 255" />    <!-- the background color of caution permissions prompts -->
+<NotifyCautionBoxColor value="254, 209, 118, 255" />    <!-- Background color of caution permissions prompts -->
-<NotifyCautionWarnColor value="0, 0, 0, 255" />         <!-- the foreground color of the special title text in 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" />
+<GroupNotifyBoxColor value="70, 170, 255, 255" />       <!-- Group notices background -->
-<GroupNotifyTextColor value="0, 30, 60, 255" />
+<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" />
+<ChatHistoryBgColor value="0, 0, 0, 0" />               <!-- Local Chat background -->
-<ChatHistoryTextColor value="255, 255, 255, 255" />
+<ChatHistoryTextColor value="255, 255, 255, 255" />     <!-- Local Chat text -->
-<IMHistoryBgColor value="0, 30, 80, 200" />
+<IMHistoryBgColor value="0, 30, 80, 200" />             <!-- Instant Message background -->
-<IMHistoryTextColor value="255, 255, 255, 255" />
+<IMHistoryTextColor value="255, 255, 255, 255" />       <!-- Instant Message text -->
+ 
 <!-- IN-WORLD SELECTION -->
-<SilhouetteParentColor value="255, 255, 0, 255" />
+<SilhouetteParentColor value="255, 255, 0, 255" />      <!-- Root prim selection outline -->
-<SilhouetteChildColor value="32, 106, 196, 255" />
+<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" />
+<GridFocusPointColor value="255, 255, 255, 128" />      <!-- Not used -->
-<GridlineColor value="255, 255, 255, 255" />
+<GridlineColor value="255, 255, 255, 255" />            <!-- Grid color -->
-<GridlineBGColor value="235, 235, 255, 200" />
+<GridlineBGColor value="235, 235, 255, 200" />          <!-- Grid background color -->
-<GridlineShadowColor value="0, 0, 0, 80" />
+<GridlineShadowColor value="0, 0, 0, 80" />             <!-- Grid drop shadow -->
+ 
 <!-- PROPERTY LINES -->
-<PropertyColorAvail value="0, 0, 0, 0" />
+<PropertyColorAvail value="0, 0, 0, 0" />               
-<PropertyColorGroup value="0, 184, 184, 102" />
+<PropertyColorGroup value="0, 184, 184, 102" />         <!-- Property group owns -->
-<PropertyColorOther value="255, 0, 0, 102" />
+<PropertyColorOther value="255, 0, 0, 102" />           <!-- Property others own -->
-<PropertyColorSelf value="0, 255, 0, 102" />
+<PropertyColorSelf value="0, 255, 0, 102" />            <!-- Property you own -->
-<PropertyColorForSale value="255, 128, 0, 102" />
+<PropertyColorForSale value="255, 128, 0, 102" />       <!-- Property for sale -->
-<PropertyColorAuction value="128, 0, 255, 102" />       <!-- Match the color on the world map -->
+<PropertyColorAuction value="128, 0, 255, 102" />       <!-- Match the color on the world map -->
+ 
-<!-- Icon Enable/Disable -->
+<!-- MEDIA ICONS -->
-<IconEnabledColor value="255, 255, 255, 255"/>
+<IconEnabledColor value="255, 255, 255, 255"/>          <!-- Media/music icon enabled -->
-<IconDisabledColor value="147, 169, 213, 200"/>
+<IconDisabledColor value="147, 169, 213, 200"/>         <!-- Media/music icon disabled -->
+ 
 <!-- MINI-MAP -->
-<NetMapBackgroundColor value="0, 0, 0, 77" />
+<NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
-<NetMapYouOwnAboveWater value="0, 255, 255, 255" />
+<NetMapYouOwnAboveWater value="0, 255, 255, 255" />     <!-- Objects owned by you above water -->
-<NetMapYouOwnBelowWater value="0, 200, 200, 255" />
+<NetMapYouOwnBelowWater value="0, 200, 200, 255" />     <!-- Objects owned by you below water -->
-<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />
+<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />   <!-- Group owned objects above water -->
-<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />
+<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />   <!-- Group owned objects below water -->
-<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />
+<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />    <!-- Objects owned by others above water -->
-<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />
+<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" />
@@ -152,40 +184,13 @@
 <HelpScrollShadowColor value="0, 0, 0, 255" />
 <!-- MISC -->
-<AvatarNameColor value="251, 175, 93, 255" />           <!-- Text color of avatar nametags -->
+<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 -->
+<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. -->
+<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 -->
+<ButtonCautionImageColor value="255, 255, 255, 255" />  <!-- Match the caution dialog buttons to the default -->
-<HealthTextColor value="255, 255, 255, 255" />
 <MapAutopilotColor value="255, 128, 0, 255" />
-<ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
+<ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
-<ScriptBgReadOnlyColor value="100, 100, 100, 255" />
+<GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->
-<ParcelTextColor value="144, 165, 208, 255" />          <!-- Parcel name on menu bar, normal state -->
+<ConsoleBackground value="0, 0, 0, 255" />              <!-- Background for inworld chat -->
-<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"/>
 </settings>
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/menu_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
index d7ff80b..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
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
+<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
-     height="18" left="0" mouse_opaque="true" name="Login Menu" opaque="true"
+     height="18" left="0" mouse_opaque="true" name="Login Menu" opaque="true"
-     tear_off="false" width="802">
+     tear_off="false" width="802">
-        <menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
+        <menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
-             height="263" label="File" left="0" mouse_opaque="false" name="File"
+             height="263" label="File" left="0" mouse_opaque="false" name="File"
-             opaque="true" tear_off="false" width="243">
+             opaque="true" tear_off="false" width="243">
-                <menu_item_call bottom="-29" enabled="true" height="19" label="Quit" left="0"
+                <menu_item_call bottom="-29" enabled="true" height="19" label="Quit" left="0"
-                     mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
+                     mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
-                        <on_click function="File.Quit" userdata="" />
+                        <on_click function="File.Quit" userdata="" />
-                </menu_item_call>
+                </menu_item_call>
-        </menu>
+        </menu>
-        <menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
+        <menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
-             height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"
+             height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"
-             opaque="true" tear_off="false" width="153">
+             opaque="true" tear_off="false" width="153">
-                <menu_item_call bottom="-29" enabled="true" height="19" label="Preferences..." left="0"
+                <menu_item_call bottom="-29" enabled="true" height="19" label="Preferences..." left="0"
-                     mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">
+                     mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">
-                        <on_click function="ShowFloater" userdata="preferences" />
+                        <on_click function="ShowFloater" userdata="preferences" />
-                </menu_item_call>
+                </menu_item_call>
-        </menu>
+        </menu>
-        <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
+        <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
-             height="317" label="Help" left="80" mouse_opaque="false" name="Help"
+             height="317" label="Help" left="80" mouse_opaque="false" name="Help"
-             opaque="true" tear_off="false" width="166">
+             opaque="true" tear_off="false" width="166">
-                <menu_item_call bottom="-29" enabled="true" height="19" label="Second Life Help" left="0"
+                <menu_item_call bottom="-29" enabled="true" height="19" label="Viewer Help" left="0"
-                     mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
+                     mouse_opaque="true" name="Viewer Help" shortcut="F1" width="166">
-                        <on_click function="ShowFloater" userdata="help f1" />
+                        <on_click function="ShowFloater" userdata="help f1" />
-                </menu_item_call>
+                </menu_item_call>
-                <menu_item_call bottom="-48" enabled="true" height="19" label="About Second Life..." left="0"
+                <menu_item_call bottom="-48" enabled="true" height="19" label="About Imprudence..." left="0"
-                     mouse_opaque="true" name="About Second Life..." width="166">
+                     mouse_opaque="true" name="About Imprudence..." width="166">
-                        <on_click function="ShowFloater" userdata="about" />
+                        <on_click function="ShowFloater" userdata="about" />
-                </menu_item_call>
+                </menu_item_call>
-        </menu>
+        </menu>
-</menu_bar>
+</menu_bar>
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 71044a0..a4f367c 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
@@ -360,9 +360,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">
+    <menu_item_check name="Beacons Always On" label="Show Beacons">
-      <on_click function="ToggleControl" userdata="BeaconAlwaysOn" />
+      <on_click function="ToggleControl" userdata="BeaconsEnabled" />
-      <on_check control="BeaconAlwaysOn" />
+      <on_check control="BeaconsEnabled" />
    </menu_item_check>
    <menu name="Beacons" create_jump_keys="true" label="Beacons"
          opaque="true" tear_off="true">
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 fb46a3f..623b800 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -1,148 +1,180 @@
 <?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 -->
+<TitleBarFocusColor value="50, 115, 185, 120" />        <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
-<FloaterFocusBorderColor value="50, 115, 185, 75" />
+<FloaterFocusBorderColor value="50, 115, 185, 75" />    <!-- Focused window border color -->
-<FloaterUnfocusBorderColor value="110, 110, 110, 60" />
+<FloaterUnfocusBorderColor value="110, 110, 110, 60" /> <!-- Unfocused window border color -->
-<FocusBackgroundColor value="165, 180, 200, 245" />     <!-- Background color of focused floaters -->
+<FocusBackgroundColor value="165, 180, 200, 245" />     <!-- Background color of focused windows -->
-<DefaultBackgroundColor value="165, 180, 200, 128" />   <!-- Background color for unfocused floaters -->
+<DefaultBackgroundColor value="165, 180, 200, 128" />   <!-- Background color for unfocused windows -->
-<ColorDropShadow value="0, 0, 0, 200" />                <!-- The drop shadow behind windows and menus -->
+<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" />
+<DefaultHighlightLight value="50, 115, 185, 255" />     <!-- Unfocused border, bottom portion -->
-<DefaultShadowDark value="50, 115, 185, 255" />
+<DefaultShadowDark value="50, 115, 185, 255" />         <!-- Unfocused border, top portion -->
-<DefaultShadowLight value="50, 115, 185, 255" />
+<DefaultShadowLight value="50, 115, 185, 255" />        <!-- Tab area border for IMs -->
+ 
-<!-- LABELS -->
+<!-- WINDOW LABELS -->
-<LabelDisabledColor value="0, 30, 60, 128" />
+<LabelDisabledColor value="0, 30, 60, 128" />               <!-- Color for unfocused window titles -->
-<LabelSelectedColor value="255, 255, 255, 255" />
+<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" />
+<LoginProgressBarBgColor value="255, 255, 255, 255" />      <!-- Login progress bar background -->
-<LoginProgressBarFgColor value="255, 255, 255, 255" />
+<LoginProgressBarFgColor value="255, 255, 255, 255" />      <!-- Login progress bar -->
-<LoginProgressBoxBorderColor value="0, 30, 60, 0" />
+<LoginProgressBoxBorderColor value="0, 30, 60, 0" />        <!-- Login progress box border -->
-<LoginProgressBoxCenterColor value="0, 0, 0, 200" />
+<LoginProgressBoxCenterColor value="0, 0, 0, 200" />        <!-- Login progress box background -->
-<LoginProgressBoxShadowColor value="0, 0, 0, 200" />
+<LoginProgressBoxShadowColor value="0, 0, 0, 200" />        <!-- Login progress box shadow -->
-<LoginProgressBoxTextColor value="255, 255, 255, 255"/>
+<LoginProgressBoxTextColor value="255, 255, 255, 255"/>     <!-- Login progress text -->
+ 
 <!-- BUTTONS -->
-<ButtonLabelColor value="0, 30, 60, 255" />             <!-- Text labels for buttons, like the "OK" text -->
+<ButtonLabelColor value="0, 30, 60, 255" />                 <!-- Label text color for buttons, like the "OK" text -->
-<ButtonLabelSelectedColor value="255, 255, 255, 255" />
+<ButtonLabelSelectedColor value="255, 255, 255, 255" />     <!-- Label text color when button selected -->
-<ButtonLabelDisabledColor value="0, 30, 60, 128" />
+<ButtonLabelDisabledColor value="0, 30, 60, 128" />         <!-- Label text color when button disabled -->
-<ButtonLabelSelectedDisabledColor value="0, 30, 60, 128" />
+<ButtonLabelSelectedDisabledColor value="0, 30, 60, 128" /> <!-- Label text color when button disabled but selected -->
-<ButtonSelectedBgColor value="62, 62, 62, 255" />
+<ButtonSelectedBgColor value="62, 62, 62, 255" />           <!-- Not used -->
-<ButtonSelectedColor value="255, 255, 255, 255" />
+<ButtonSelectedColor value="255, 255, 255, 255" />          <!-- Not used -->
-<ButtonUnselectedBgColor value="62, 62, 62, 255" />
+<ButtonUnselectedBgColor value="62, 62, 62, 255" />         <!-- Not used -->
-<ButtonUnselectedFgColor value="255, 255, 255, 255" />
+<ButtonUnselectedFgColor value="255, 255, 255, 255" />      <!-- Not used -->
-<ButtonBorderColor value="239, 156, 0, 255" />
+<ButtonBorderColor value="239, 156, 0, 255" />              <!-- Not used -->
-<ButtonFlashBgColor value="255, 190, 62, 127" />
+<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 -->
+<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 -->
+<ButtonImageColor value="255, 255, 255, 255" />             <!-- Button color override (also checkboxes and scroll arrows).
+                                                                 Blended with button art, usually left as opaque white -->
-<!-- SLIDERS -->
+ 
-<SliderDisabledThumbColor value="0, 0, 0, 255" />
+<!-- SLIDERS, single line -->
-<SliderThumbCenterColor value="255, 255, 255, 255" />
+<SliderDisabledThumbColor value="0, 0, 0, 255" />           <!-- Not used -->
-<SliderThumbOutlineColor value="37, 64, 99, 255" />
+<SliderThumbCenterColor value="255, 255, 255, 255" />       <!-- Unfocused slider thumb color -->
-<SliderTrackColor value="37, 64, 99, 255" />
+<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) -->
+<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 -->
+<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) -->
+<TextBgWriteableColor value="255, 255, 255, 255" />         <!-- Text field background when not receiving input (unfocused) -->
-<TextCursorColor value="0, 0, 0, 255" />
+<TextCursorColor value="0, 0, 0, 255" />                    <!-- Cursor color in notecards and scripts only -->
-<TextFgColor value="45, 48, 45, 255" />
+<TextFgColor value="48, 48, 45, 255" />                     <!-- Text color for all text entry fields; cursor color for line editors -->
-<TextFgReadOnlyColor value="0, 0, 0, 200" />
+<TextFgReadOnlyColor value="0, 0, 0, 200" />                <!-- Text color in read-only fields -->
-<TextFgTentativeColor value="0, 0, 0, 128" />
+<TextFgTentativeColor value="0, 0, 0, 128" />               <!-- Initial entry in text entry fields, e.g. "Click here to chat." -->
-<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" />     <!-- i.e. About Land name that you don't own -->
+<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- Text of read-only items embedded in notecards -->
-<TextEmbeddedItemColor value="0, 0, 128, 255" />
+<TextEmbeddedItemColor value="0, 0, 128, 255" />            <!-- Text of items embedded in notecards -->
-<TextDefaultColor value="0, 20, 0, 255"/>
+<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" />
+<ScrollBgReadOnlyColor value="255, 255, 255, 140" />    <!-- Background of read only lists -->
-<ScrollBgWriteableColor value="255, 255, 255, 140" />
+<ScrollBgWriteableColor value="255, 255, 255, 140" />   <!-- Background of editable lists, e.g. groups-->
-<ScrollBGStripeColor value="145, 180, 220, 60" />
+<ScrollBGStripeColor value="145, 180, 220, 60" />       <!-- Background stripes in sortable lists, e.g. Events Search -->
-<ScrollDisabledColor value="128, 128, 128, 204" />
+<ScrollDisabledColor value="128, 128, 128, 204" />      
-<ScrollSelectedBGColor value="50, 115, 185, 150" />
+<ScrollSelectedBGColor value="50, 115, 185, 150" />     <!-- Selected item in a list highlight -->
-<ScrollSelectedFGColor value="0, 30, 60, 255" />        <!-- Text color -->
+<ScrollSelectedFGColor value="0, 30, 60, 255" />        <!-- Text color -->
-<ScrollUnselectedColor value="0, 30, 60, 255" />        <!-- Text color -->
+<ScrollUnselectedColor value="0, 30, 60, 255" />        <!-- Text color -->
-<ScrollHighlightedColor value="145, 180, 220, 128" />   <!-- Hover color -->
+<ScrollHighlightedColor value="145, 180, 220, 128" />   <!-- Hover color -->
-<ScrollbarThumbColor value="120, 160, 200, 255" />
+<ScrollbarThumbColor value="120, 160, 200, 255" />      <!-- Scroll bar -->
-<ScrollbarTrackColor value="183, 202, 220, 255" />
+<ScrollbarTrackColor value="183, 202, 220, 255" />      <!-- Scroll bar background -->
+ 
 <!-- MENUS -->
-<MenuBarBgColor value="185, 200, 220, 230" />
+<MenuBarBgColor value="185, 200, 220, 230" />               <!-- Menu bar background -->
-<MenuBarGodBgColor value="100, 200, 130, 230" />
+<MenuBarGodBgColor value="100, 200, 130, 230" />            <!-- Menu bar background with God Mode enabled -->
-<MenuNonProductionGodBgColor value="100, 200, 130, 230" />
+<MenuNonProductionGodBgColor value="100, 200, 130, 230" />  <!-- Beta viewer menu bar background -->
-<MenuNonProductionBgColor value="230, 70, 70, 230" />
+<MenuNonProductionBgColor value="230, 70, 70, 230" />       <!-- Beta viewer menu bar background with God Mode enabled -->
-<MenuDefaultBgColor value="210, 220, 230, 245" />
+<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) -->
+<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) -->
+<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" />
+<MenuItemHighlightBgColor value="50, 115, 185, 100" />      <!-- Highlighted menu item background color -->
-<MenuItemHighlightFgColor value="0, 30, 60, 255" />     <!-- Highlighted menu text color; also treeview node selection highlight -->
+<MenuItemHighlightFgColor value="0, 30, 60, 255" />         <!-- Highlighted menu item text color; also treeview node selection highlight -->
-<MenuPopupBgColor value="197, 217, 234, 240" />
+<MenuPopupBgColor value="197, 217, 234, 240" />             <!-- Right-click menu background -->
+ 
 <!--  PIE MENUS -->
-<PieMenuBgColor value="118, 156, 201, 230" />
+<PieMenuBgColor value="118, 156, 201, 230" />           <!-- Color of pie menu -->
-<PieMenuLineColor value="255, 255, 255, 60" />
+<PieMenuLineColor value="255, 255, 255, 60" />          <!-- Color of pie menu slice separators -->
-<PieMenuSelectedColor value="185, 200, 220, 120" />
+<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" />
+<ToolTipBgColor value="250, 255, 225, 230" />           <!-- Tool tips, i.e. "Hover Tips" -->
-<ToolTipBorderColor value="171, 212, 245, 255" />
+<ToolTipBorderColor value="171, 212, 245, 255" />       <!-- Not used -->
-<ToolTipTextColor value="0, 0, 0, 255" />
+<ToolTipTextColor value="0, 0, 0, 255" />               <!-- Tool tips text color -->
+ 
 <!-- NOTIFICATION POP-UPS -->
-<NotifyBoxColor value="170, 210, 255, 240" />
+<NotifyBoxColor value="170, 210, 255, 240" />           <!-- Notification background, i.e. tp requests -->
-<NotifyTextColor value="0, 30, 60, 255" />
+<NotifyTextColor value="0, 30, 60, 255" />              <!-- Notification text -->
-<NotifyCautionBoxColor value="254, 209, 118, 255" />    <!-- the background color of caution permissions prompts -->
+<NotifyCautionBoxColor value="254, 209, 118, 255" />    <!-- Background color of caution permissions prompts -->
-<NotifyCautionWarnColor value="0, 0, 0, 255" />         <!-- the foreground color of the special title text in 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" />
+<GroupNotifyBoxColor value="170, 210, 255, 240" />      <!-- Group notices background -->
-<GroupNotifyTextColor value="0, 30, 60, 255" />
+<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" />
+<ChatHistoryBgColor value="0, 30, 80, 200" />           <!-- Local Chat background -->
-<ChatHistoryTextColor value="255, 255, 255, 255" />
+<ChatHistoryTextColor value="255, 255, 255, 255" />     <!-- Local Chat text -->
-<IMHistoryBgColor value="0, 30, 80, 200" />
+<IMHistoryBgColor value="0, 30, 80, 200" />             <!-- Instant Message background -->
-<IMHistoryTextColor value="255, 255, 255, 255" />
+<IMHistoryTextColor value="255, 255, 255, 255" />       <!-- Instant Message text -->
+ 
 <!-- IN-WORLD SELECTION -->
-<SilhouetteParentColor value="255, 255, 0, 255" />
+<SilhouetteParentColor value="255, 255, 0, 255" />      <!-- Root prim selection outline -->
-<SilhouetteChildColor value="32, 106, 196, 255" />
+<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" />
+<GridFocusPointColor value="255, 255, 255, 128" />      <!-- Not used -->
-<GridlineColor value="255, 255, 255, 255" />
+<GridlineColor value="255, 255, 255, 255" />            <!-- Grid color -->
-<GridlineBGColor value="235, 235, 255, 200" />
+<GridlineBGColor value="235, 235, 255, 200" />          <!-- Grid background color -->
-<GridlineShadowColor value="0, 0, 0, 80" />
+<GridlineShadowColor value="0, 0, 0, 80" />             <!-- Grid drop shadow -->
+ 
 <!-- PROPERTY LINES -->
-<PropertyColorAvail value="0, 0, 0, 0" />
+<PropertyColorAvail value="0, 0, 0, 0" />               
-<PropertyColorGroup value="0, 184, 184, 102" />
+<PropertyColorGroup value="0, 184, 184, 102" />         <!-- Property group owns -->
-<PropertyColorOther value="255, 0, 0, 102" />
+<PropertyColorOther value="255, 0, 0, 102" />           <!-- Property others own -->
-<PropertyColorSelf value="0, 255, 0, 102" />
+<PropertyColorSelf value="0, 255, 0, 102" />            <!-- Property you own -->
-<PropertyColorForSale value="255, 128, 0, 102" />
+<PropertyColorForSale value="255, 128, 0, 102" />       <!-- Property for sale -->
-<PropertyColorAuction value="128, 0, 255, 102" />       <!-- Match the color on the world map -->
+<PropertyColorAuction value="128, 0, 255, 102" />       <!-- Match the color on the world map -->
+ 
-<!-- Icon Enable/Disable -->
+<!-- MEDIA ICONS -->
-<IconEnabledColor value="255, 255, 255, 255"/>
+<IconEnabledColor value="255, 255, 255, 255"/>          <!-- Media/music icon enabled -->
-<IconDisabledColor value="147, 169, 213, 200"/>
+<IconDisabledColor value="147, 169, 213, 200"/>         <!-- Media/music icon disabled -->
+ 
 <!-- MINI-MAP -->
-<NetMapBackgroundColor value="0, 0, 0, 77" />
+<NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
-<NetMapYouOwnAboveWater value="0, 255, 255, 255" />
+<NetMapYouOwnAboveWater value="0, 255, 255, 255" />     <!-- Objects owned by you above water -->
-<NetMapYouOwnBelowWater value="0, 200, 200, 255" />
+<NetMapYouOwnBelowWater value="0, 200, 200, 255" />     <!-- Objects owned by you below water -->
-<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />
+<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />   <!-- Group owned objects above water -->
-<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />
+<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />   <!-- Group owned objects below water -->
-<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />
+<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />    <!-- Objects owned by others above water -->
-<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />
+<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..." -->
+ 
 <!-- HELP WINDOW -->
 <HelpBgColor value="200, 209, 204, 255" />
 <HelpFgColor value="0, 0, 0, 255" />
@@ -152,39 +184,13 @@
 <HelpScrollShadowColor value="0, 0, 0, 255" />
 <!-- MISC -->
-<AvatarNameColor value="251, 175, 93, 255" />           <!-- Text color of avatar nametags -->
+<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 -->
+<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. -->
+<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 -->
+<ButtonCautionImageColor value="255, 255,  255, 255" /> <!-- Match the caution dialog buttons to the default -->
-<HealthTextColor value="255, 255, 255, 255" />
 <MapAutopilotColor value="255, 128, 0, 255" />
-<ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
+<ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
-<ScriptBgReadOnlyColor value="180, 180, 180, 255" />
+<GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->
-<ParcelTextColor value="40, 40, 90, 255" />             <!-- Parcel name on menu bar, normal state -->
+<ConsoleBackground value="0, 0, 0, 255" />              <!-- Background for inworld chat -->
-<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 -->
-<!--  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 9b5d340..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 887dacd..62c9537 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -75,30 +75,60 @@ class ViewerManifest(LLManifest):
            self.path("*.txt")
            self.end_prefix("fonts")
-            # skins
+        # skins
-            if self.prefix(src="skins"):
+        if self.prefix(src="skins"):
-                    self.path("paths.xml")
+            self.path("paths.xml")
-                    # include the entire textures directory recursively
+            
-                    if self.prefix(src="*/textures"):
+            # include the entire textures directory recursively
-                            self.path("*.tga")
+            if self.prefix(src="*/textures"):
-                            self.path("*.j2c")
+                self.path("*.tga")
-                            self.path("*.jpg")
+                self.path("*.j2c")
-                            self.path("*.png")
+                self.path("*.jpg")
-                            self.path("textures.xml")
+                self.path("*.png")
-                            self.end_prefix("*/textures")
+                self.path("textures.xml")
-                    self.path("*/xui/*/*.xml")
+                self.end_prefix("*/textures")
-                    self.path("*/*.xml")
-                    
+            self.path("*/xui/*/*.xml")
-                    # Local HTML files (e.g. loading screen)
+            self.path("*/*.xml")
-                    if self.prefix(src="*/html"):
-                            self.path("*.png")
+            # Local HTML files (e.g. loading screen)
-                            self.path("*/*/*.html")
+            if self.prefix(src="*/html"):
-                            self.path("*/*/*.gif")
+                self.path("*.png")
-                            self.end_prefix("*/html")
+                self.path("*/*/*.html")
-                    self.end_prefix("skins")
+                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"""
@@ -161,7 +191,13 @@ class WindowsManifest(ViewerManifest):
                #'../llkdu/relwithdebinfo/llkdu.dll',
                #'../../libraries/i686-win32/lib/release/llkdu.dll'), 
                #  dst='llkdu.dll')
-        self.path(src="licenses-win32.txt", dst="licenses.txt")
+        self.gather_documents()
+        if self.prefix("../..", dst="doc"):
+            self.path("LICENSE-libraries-win32.txt")
+            self.end_prefix("../..")
        self.path("featuretable.txt")
@@ -386,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
+                self.path("secondlife.icns")
-                # 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")
                
                # Translations
                self.path("English.lproj")
@@ -530,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/imprudence_icon.png","imprudence_icon.png")
        if self.prefix("linux_tools", dst=""):
-            self.path("client-readme.txt","README-linux.txt")
+            #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')
diff --git a/linden/install.xml b/linden/install.xml
index 216c854..92f90f1 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>df51d460e5c9d091009b46460f79f7c5</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.zip</uri>
          </map>
        </map>
      </map>
diff --git a/linden/scripts/build_version.py b/linden/scripts/build_version.py
index 46587e8..3d66a65 100755
--- a/linden/scripts/build_version.py
+++ b/linden/scripts/build_version.py
@@ -26,8 +26,10 @@ def get_version(filename):
    vals['minor'] = m.group(1)
    m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', data)
    vals['patch'] = 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" % vals
+    return "%(major)s.%(minor)s.%(patch)s-%(test)s" % vals
 if __name__ == '__main__':
    import sys